summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Baulig <martin@src.gnome.org>1999-02-15 23:04:07 +0000
committerMartin Baulig <martin@src.gnome.org>1999-02-15 23:04:07 +0000
commit4fbfde4d1cbd828f66111c983b0669bc4a2c2a64 (patch)
treea53d9ddde417f95521ba7a6fa92e49ce560ad474
parentcd7cd234035e7b394809a951f6786ecb20bfb9c8 (diff)
downloadlibgtop-4fbfde4d1cbd828f66111c983b0669bc4a2c2a64.tar.gz
Fix a really bad thing from Jeff Garzik; don't override INCLUDES in
any Makefile.am, but it configure.in.
-rw-r--r--examples/Makefile.am2
-rw-r--r--src/daemon/Makefile.am2
-rw-r--r--sysdeps/common/Makefile.am2
3 files changed, 1 insertions, 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