summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>1999-02-15 21:23:07 +0000
committerJeff Garzik <jgarzik@src.gnome.org>1999-02-15 21:23:07 +0000
commitcd7cd234035e7b394809a951f6786ecb20bfb9c8 (patch)
treeeabc4b71c90e212d62e99cdb739eab10b57c32f3
parent48e5a134958d8557ac59b0f690339dac018c1b31 (diff)
downloadlibgtop-cd7cd234035e7b394809a951f6786ecb20bfb9c8.tar.gz
Removed hardcoded gcc arguments. Converted remaining CFLAGS settings to
1999-02-15 Jeff Garzik <jgarzik@pobox.com> * 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: Removed hardcoded gcc arguments. Converted remaining CFLAGS settings to use correct INCLUDES. * include/glibtop/error.h: Added FIXME comment about varargs macros breaking Sun cc compilation.
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--examples/Makefile.am2
-rw-r--r--include/glibtop/error.h5
-rw-r--r--lib/Makefile.am2
-rw-r--r--src/daemon/Makefile.am2
-rw-r--r--sysdeps/common/Makefile.am2
-rw-r--r--sysdeps/guile/Makefile.am2
-rw-r--r--sysdeps/guile/names/Makefile.am2
-rw-r--r--sysdeps/kernel/Makefile.am2
-rw-r--r--sysdeps/linux/Makefile.am2
-rw-r--r--sysdeps/names/Makefile.am2
-rw-r--r--sysdeps/osf1/Makefile.am2
-rw-r--r--sysdeps/stub/Makefile.am2
-rw-r--r--sysdeps/stub_suid/Makefile.am2
-rw-r--r--sysdeps/sun4/Makefile.am2
15 files changed, 23 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eb5b33d..9beec8cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-02-15 Jeff Garzik <jgarzik@pobox.com>
+
+ * 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:
+ Removed hardcoded gcc arguments.
+ Converted remaining CFLAGS settings to use correct INCLUDES.
+
+ * include/glibtop/error.h:
+ Added FIXME comment about varargs macros breaking Sun cc
+ compilation.
+
1999-02-12 Martin Baulig <martin@home-of-linux.org>
Thanks to Frederic Devernay for pointing out that we need to define
diff --git a/examples/Makefile.am b/examples/Makefile.am
index daeb557b..a2829417 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@ -O0
+INCLUDES = -O0
DEFS = @DEFS@
diff --git a/include/glibtop/error.h b/include/glibtop/error.h
index 915554c9..8305430a 100644
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -26,6 +26,11 @@
__BEGIN_DECLS
+/*
+ * FIXME: varargs macros only supported on gcc.
+ * Breaks Sun CC, maybe others.
+ */
+
#define glibtop_error(p1, args...) glibtop_error_r(glibtop_global_server , p1 , ## args)
#define glibtop_warn(p1, args...) glibtop_warn_r(glibtop_global_server , p1 , ## args)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f6eef6cc..de458e6b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 d67aec10..fda3b4b7 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -14,7 +14,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@ -D_BSD
+INCLUDES = -D_BSD
if NEED_LIBGTOP
suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index 4a39f518..9ffceb9a 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -8,7 +8,7 @@ inodedb_SRCLIST =
inodedb_DEFS =
endif
-CFLAGS = -Wall -W @CFLAGS@ $(inodedb_DEFS)
+INCLUDES = $(inodedb_DEFS)
lib_LTLIBRARIES = libgtop_common.la libgtop_suid_common.la
diff --git a/sysdeps/guile/Makefile.am b/sysdeps/guile/Makefile.am
index 389903cb..207fa357 100644
--- a/sysdeps/guile/Makefile.am
+++ b/sysdeps/guile/Makefile.am
@@ -2,8 +2,6 @@ SUBDIRS = names
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 00b6870e..20cd9e39 100644
--- a/sysdeps/guile/names/Makefile.am
+++ b/sysdeps/guile/names/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 8df01c18..7233bfc9 100644
--- a/sysdeps/kernel/Makefile.am
+++ b/sysdeps/kernel/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 04b2c36d..c814beb4 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 2039573d..47776eb8 100644
--- a/sysdeps/names/Makefile.am
+++ b/sysdeps/names/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 ea8947b3..3a783cd3 100644
--- a/sysdeps/osf1/Makefile.am
+++ b/sysdeps/osf1/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 2f82cd78..40658586 100644
--- a/sysdeps/stub/Makefile.am
+++ b/sysdeps/stub/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 3c33b6c1..65d10f65 100644
--- a/sysdeps/stub_suid/Makefile.am
+++ b/sysdeps/stub_suid/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
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 275c7ad5..fd27164f 100644
--- a/sysdeps/sun4/Makefile.am
+++ b/sysdeps/sun4/Makefile.am
@@ -1,7 +1,5 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
-CFLAGS = -Wall -W @CFLAGS@
-
lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la
libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c
View Lorry Controller Status