Initialize INCLUDES to `@INCLUDES@' to make it clear that it is set in

1999-02-16  Martin Baulig  <martin@home-of-linux.org>

	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
	  sysdeps/common/Makefile.am, sysdeps/guile/Makefile.am,
	  sysdeps/guile/names/Makefile.am, sysdeps/kernel/Makefile.am,
	  sysdeps/linux/Makefile.am, sysdeps/names/Makefile.am,
	  sysdeps/osf1/Makefile.am, sysdeps/stub/Makefile.am,
	  sysdeps/stub_suid/Makefile.am, sysdeps/sun4/Makefile.am:
	Initialize INCLUDES to `@INCLUDES@' to make it clear that it is
	set in configure.in. It is ok to add things there, but you must
	not remove the `@INCLUDES@'.

16 files changed, 41 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0f4eb581..7127c7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-02-16  Martin Baulig  <martin@home-of-linux.org>
+
+	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
+	  sysdeps/common/Makefile.am, sysdeps/guile/Makefile.am,
+	  sysdeps/guile/names/Makefile.am, sysdeps/kernel/Makefile.am,
+	  sysdeps/linux/Makefile.am, sysdeps/names/Makefile.am,
+	  sysdeps/osf1/Makefile.am, sysdeps/stub/Makefile.am,
+	  sysdeps/stub_suid/Makefile.am, sysdeps/sun4/Makefile.am:
+	Initialize INCLUDES to `@INCLUDES@' to make it clear that it is
+	set in configure.in. It is ok to add things there, but you must
+	not remove the `@INCLUDES@'.
+
 1999-02-15  Jeff Garzik  <jgarzik@pobox.com>
 
 	* examples/Makefile.am, lib/Makefile.am, src/daemon/Makefile.am,
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 81044e7e..5b5344b4 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,6 +2,8 @@
 
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES		= @INCLUDES@
+
 DEFS			= @DEFS@
 
 # We install it in `libexec' since this will make it more easy
diff --git a/lib/Makefile.am b/lib/Makefile.am
index de458e6b..1ab3f33c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop.la
 
 libgtop_la_SOURCES		= init.c open.c close.c command.c read.c \
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index a3edaa35..36686440 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -14,7 +14,7 @@
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-CFLAGS				= @CFLAGS@ -D_BSD
+INCLUDES			= @INCLUDES@ -D_BSD
 
 if NEED_LIBGTOP
 suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
diff --git a/src/inodedb/Makefile.am b/src/inodedb/Makefile.am
index e9d60dd5..c7447218 100644
--- a/src/inodedb/Makefile.am
+++ b/src/inodedb/Makefile.am
@@ -1,5 +1,7 @@
 bin_PROGRAMS		= mkinodedb file_by_inode
 
+INCLUDES		= @INCLUDES@
+
 mkinodedb_LDADD		= $(top_builddir)/lib/libgtop.la \
 			  $(top_builddir)/sysdeps/common/libgtop_common.la \
 			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index a0fc75a9..8ba26000 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 if INODEDB
 inodedb_SRCLIST			= inodedb.c
 inodedb_DEFS			= -DSYSTEM_INODEDB=\"$(prefix)/var/libgtop/inodedb.db\"
diff --git a/sysdeps/freebsd/Makefile.am b/sysdeps/freebsd/Makefile.am
index d4097701..c37d3b66 100644
--- a/sysdeps/freebsd/Makefile.am
+++ b/sysdeps/freebsd/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
 
 libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
diff --git a/sysdeps/guile/Makefile.am b/sysdeps/guile/Makefile.am
index 207fa357..fff3f0e6 100644
--- a/sysdeps/guile/Makefile.am
+++ b/sysdeps/guile/Makefile.am
@@ -2,6 +2,8 @@ SUBDIRS				= names
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 BUILT_SOURCES			= guile.c guile.x
 
 lib_LTLIBRARIES			= libgtop_guile.la
diff --git a/sysdeps/guile/names/Makefile.am b/sysdeps/guile/names/Makefile.am
index 20cd9e39..3d10c066 100644
--- a/sysdeps/guile/names/Makefile.am
+++ b/sysdeps/guile/names/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_guile_names.la
 
 BUILT_SOURCES			= guile-names.c guile-names.x
diff --git a/sysdeps/kernel/Makefile.am b/sysdeps/kernel/Makefile.am
index 7233bfc9..0bf368c5 100644
--- a/sysdeps/kernel/Makefile.am
+++ b/sysdeps/kernel/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la
 
 libgtop_sysdeps_la_SOURCES	= open.c close.c kernel.s cpu.c mem.c swap.c \
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index c814beb4..9f53f63a 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la
 
 libgtop_sysdeps_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
diff --git a/sysdeps/names/Makefile.am b/sysdeps/names/Makefile.am
index 47776eb8..b8b04ed6 100644
--- a/sysdeps/names/Makefile.am
+++ b/sysdeps/names/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_names.la
 
 libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am
index 3a783cd3..bea3800c 100644
--- a/sysdeps/osf1/Makefile.am
+++ b/sysdeps/osf1/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
 
 libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am
index 40658586..35b8ea65 100644
--- a/sysdeps/stub/Makefile.am
+++ b/sysdeps/stub/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la
 
 libgtop_sysdeps_la_SOURCES	= open.c close.c siglist.c cpu.c mem.c swap.c \
diff --git a/sysdeps/stub_suid/Makefile.am b/sysdeps/stub_suid/Makefile.am
index 65d10f65..43245598 100644
--- a/sysdeps/stub_suid/Makefile.am
+++ b/sysdeps/stub_suid/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
 
 libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c
diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am
index fd27164f..ba4d6837 100644
--- a/sysdeps/sun4/Makefile.am
+++ b/sysdeps/sun4/Makefile.am
@@ -1,5 +1,7 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
+INCLUDES			= @INCLUDES@
+
 lib_LTLIBRARIES			= libgtop_sysdeps.la libgtop_sysdeps_suid.la
 
 libgtop_sysdeps_la_SOURCES	= nosuid.c siglist.c