INCLUDES no longer uses @GTOP_INCS@ which now points to where the

stuff gets installed and now longer to the build directories.

Added '-D_GNU_SOURCE' to INCLUDES.

11 files changed, 33 insertions, 16 deletions

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5200b328..88bbc5ae 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,9 @@
 
 LINK			= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES		= @GTOP_INCS@
+INCLUDES		= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+			  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+			  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS			= -Wall -W @CFLAGS@
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5477b586..4c115f50 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,8 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@ -DGTOP_SERVER=\""@GTOP_SERVER@"\"
 
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 6fe258f4..3c2ad0e0 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,6 +1,8 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am
index 3fd5e649..b7d1c017 100644
--- a/sysdeps/common/Makefile.am
+++ b/sysdeps/common/Makefile.am
@@ -1,6 +1,8 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
diff --git a/sysdeps/guile/Makefile.am b/sysdeps/guile/Makefile.am
index 8c2696bb..62143a93 100644
--- a/sysdeps/guile/Makefile.am
+++ b/sysdeps/guile/Makefile.am
@@ -4,7 +4,9 @@ endif
 
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
diff --git a/sysdeps/guile/names/Makefile.am b/sysdeps/guile/names/Makefile.am
index 440bb955..24387126 100644
--- a/sysdeps/guile/names/Makefile.am
+++ b/sysdeps/guile/names/Makefile.am
@@ -1,11 +1,11 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
-DEFS				= -DGLIBTOP_GUILE_NAMES @DEFS@
-
 lib_LTLIBRARIES			= libgtop_guile_names.la
 
 libgtop_guile_names_la_SOURCES	= boot.c sysdeps.c cpu.c mem.c swap.c uptime.c \
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index 10a1d6f4..0c17dbea 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -1,6 +1,8 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
diff --git a/sysdeps/names/Makefile.am b/sysdeps/names/Makefile.am
index 3cdc9dab..96e43037 100644
--- a/sysdeps/names/Makefile.am
+++ b/sysdeps/names/Makefile.am
@@ -1,11 +1,11 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
-DEFS				= -DGLIBTOP_NAMES @DEFS@
-
 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 30765601..7903bcab 100644
--- a/sysdeps/osf1/Makefile.am
+++ b/sysdeps/osf1/Makefile.am
@@ -1,12 +1,13 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
 lib_LTLIBRARIES			= libgtop_sysdeps.la
 
-
 libgtop_sysdeps_la_SOURCES	= init.c open.c close.c cpu.c mem.c swap.c \
 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
 				  sem_limits.c proclist.c procstate.c procuid.c \
diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am
index a1aac013..9c188950 100644
--- a/sysdeps/stub/Makefile.am
+++ b/sysdeps/stub/Makefile.am
@@ -1,6 +1,8 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@
 
diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am
index 60b581f1..65d5a793 100644
--- a/sysdeps/sun4/Makefile.am
+++ b/sysdeps/sun4/Makefile.am
@@ -1,6 +1,8 @@
 LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-INCLUDES			= @GTOP_INCS@
+INCLUDES			= -I$(includedir) -I$(top_builddir) -I$(top_srcdir) @machine_incs@ \
+				  -I$(top_srcdir)/include -I$(top_srcdir)/intl @GUILE_INCS@ \
+				  -DGTOPLOCALEDIR=\"$(datadir)/locale\" -D_GNU_SOURCE
 
 CFLAGS				= -Wall -W @CFLAGS@