aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReuben Thomas <rrt@sc3d.org>2007-12-14 00:06:45 +0000
committerReuben Thomas <rrt@sc3d.org>2007-12-14 00:06:45 +0000
commite0679bb50a67fb96f6f0b43778e893971e1139f9 (patch)
tree20c14ab453fc4edaf6b50514c41f3bfcaa35f349
parentb310b88c869ac1818eb4720574fee94a99841963 (diff)
downloadplptools-e0679bb50a67fb96f6f0b43778e893971e1139f9.tar.gz
plptools-e0679bb50a67fb96f6f0b43778e893971e1139f9.tar.bz2
plptools-e0679bb50a67fb96f6f0b43778e893971e1139f9.zip
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.
-rw-r--r--.cvsignore4
-rw-r--r--configure.ac2
-rw-r--r--include/.cvsignore6
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/plp_inttypes.h (renamed from include/plp_inttypes.h)0
-rw-r--r--ncpd/Makefile.am2
-rw-r--r--plpftp/Makefile.am2
-rw-r--r--plpfuse/Makefile.am2
-rw-r--r--plpprint/Makefile.am2
-rw-r--r--sisinstall/Makefile.am2
10 files changed, 5 insertions, 19 deletions
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/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/include/plp_inttypes.h b/lib/plp_inttypes.h
index acfa7b8..acfa7b8 100644
--- a/include/plp_inttypes.h
+++ b/lib/plp_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