From 4fbfde4d1cbd828f66111c983b0669bc4a2c2a64 Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin@src.gnome.org>
Date: Mon, 15 Feb 1999 23:04:07 +0000
Subject: [PATCH] Fix a really bad thing from Jeff Garzik; don't override
 INCLUDES in any Makefile.am, but it configure.in.

---
 examples/Makefile.am       | 2 --
 src/daemon/Makefile.am     | 2 --
 sysdeps/common/Makefile.am | 2 +-
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index a2829417..81044e7e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,8 +2,6 @@
 
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES		= -O0
-
 DEFS			= @DEFS@
 
 # We install it in `libexec' since this will make it more easy
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index fda3b4b7..a4f113cb 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -14,8 +14,6 @@
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= -D_BSD
-
 if NEED_LIBGTOP
 suid_sysdeps			= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
 suid_common			= $(top_builddir)/sysdeps/common/libgtop_suid_common.la
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index 9ffceb9a..a0fc75a9 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -8,7 +8,7 @@ inodedb_SRCLIST			=
 inodedb_DEFS			=
 endif
 
-INCLUDES			= $(inodedb_DEFS)
+CFLAGS				= @CFLAGS@ $(inodedb_DEFS)
 
 lib_LTLIBRARIES			= libgtop_common.la libgtop_suid_common.la