From e0679bb50a67fb96f6f0b43778e893971e1139f9 Mon Sep 17 00:00:00 2001 From: Reuben Thomas Date: Fri, 14 Dec 2007 00:06:45 +0000 Subject: Move last header plp_inttypes.h out of include and into lib. Remove RCS Ids from Makefile.am's so that checking in a Makefile.am doesn't cause automake to be run. --- .cvsignore | 4 ++++ configure.ac | 2 +- include/.cvsignore | 6 ------ include/plp_inttypes.h | 26 -------------------------- lib/Makefile.am | 2 -- lib/plp_inttypes.h | 26 ++++++++++++++++++++++++++ ncpd/Makefile.am | 2 -- plpftp/Makefile.am | 2 -- plpfuse/Makefile.am | 2 -- plpprint/Makefile.am | 2 -- sisinstall/Makefile.am | 2 -- 11 files changed, 31 insertions(+), 45 deletions(-) delete mode 100644 include/.cvsignore delete mode 100644 include/plp_inttypes.h create mode 100644 lib/plp_inttypes.h diff --git a/.cvsignore b/.cvsignore index 738905c..ba1f142 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,6 +10,10 @@ config.status config.cache config.log config.rpath +config.h +config.h.in +stamp-h.in +stamp-h1 plptools-*.tar.gz intl m4 diff --git a/configure.ac b/configure.ac index 7a7a763..8bb689e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE dnl Basic settings AC_GNU_SOURCE -AM_CONFIG_HEADER(include/config.h) +AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL dnl Set library version diff --git a/include/.cvsignore b/include/.cvsignore deleted file mode 100644 index 1f40294..0000000 --- a/include/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -stamp-h.in -stamp-h -stamp-h1 -config.h -config.h.in -defs.h diff --git a/include/plp_inttypes.h b/include/plp_inttypes.h deleted file mode 100644 index acfa7b8..0000000 --- a/include/plp_inttypes.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef _INTTYPES_H_ -#define _INTTYPES_H_ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -#ifdef HAVE_STDINT_H -#include -#endif - -#ifdef HAVE_SYS_INT_TYPES_H -#include -#endif - -#ifndef GNU_INTTYPES -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; -typedef uint64_t u_int64_t; -typedef int64_t s_int64_t; -#endif // GNU_INTTYPES - -#endif // _INTTYPES_H_ diff --git a/lib/Makefile.am b/lib/Makefile.am index af857cd..35cbb46 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ -# INCLUDES = -I$(top_srcdir)/intl AM_CFLAGS = $(THREADED_CFLAGS) AM_CXXFLAGS = $(THREADED_CXXFLAGS) diff --git a/lib/plp_inttypes.h b/lib/plp_inttypes.h new file mode 100644 index 0000000..acfa7b8 --- /dev/null +++ b/lib/plp_inttypes.h @@ -0,0 +1,26 @@ +#ifndef _INTTYPES_H_ +#define _INTTYPES_H_ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#ifdef HAVE_STDINT_H +#include +#endif + +#ifdef HAVE_SYS_INT_TYPES_H +#include +#endif + +#ifndef GNU_INTTYPES +typedef uint8_t u_int8_t; +typedef uint16_t u_int16_t; +typedef uint32_t u_int32_t; +typedef uint64_t u_int64_t; +typedef int64_t s_int64_t; +#endif // GNU_INTTYPES + +#endif // _INTTYPES_H_ diff --git a/ncpd/Makefile.am b/ncpd/Makefile.am index d200f6e..055785c 100644 --- a/ncpd/Makefile.am +++ b/ncpd/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ -# INCLUDES=-I$(top_srcdir)/lib AM_CFLAGS = $(THREADED_CFLAGS) AM_CXXFLAGS = $(THREADED_CXXFLAGS) diff --git a/plpftp/Makefile.am b/plpftp/Makefile.am index 36f5705..9e62577 100644 --- a/plpftp/Makefile.am +++ b/plpftp/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ -# INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/intl bin_PROGRAMS = plpftp diff --git a/plpfuse/Makefile.am b/plpfuse/Makefile.am index 467baaf..19c7db0 100644 --- a/plpfuse/Makefile.am +++ b/plpfuse/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ -# INCLUDES=-I$(top_srcdir)/lib sbin_PROGRAMS = plpfuse diff --git a/plpprint/Makefile.am b/plpprint/Makefile.am index fd85438..7cceb98 100644 --- a/plpprint/Makefile.am +++ b/plpprint/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ -# INCLUDES=-I$(top_srcdir)/lib sbin_PROGRAMS = plpprintd diff --git a/sisinstall/Makefile.am b/sisinstall/Makefile.am index 11b729a..72404dc 100644 --- a/sisinstall/Makefile.am +++ b/sisinstall/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ -# INCLUDES=-I$(top_srcdir)/lib bin_PROGRAMS = sisinstall -- cgit v1.2.3