`make distcheck' cleanups - Hey, it really works, guys !

9 files changed, 83 insertions, 176 deletions

diff --git a/Makefile.am b/Makefile.am
index a532aa23..03689bdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 ## Process this file with automake to produce Makefile.in.
 
+if EXAMPLES
 examples_SUBDIRS = examples
+else
+examples_SUBDIRS =
+endif
 
 if GUILE
 guile_SUBDIRS = guile
@@ -12,11 +16,13 @@ endif
 SUBDIRS = po intl support macros include sysdeps lib src \
 	  $(examples_SUBDIRS)
 
-DIST_SUBDIRS = po intl macros include sysdeps src lib guile examples
+DIST_SUBDIRS = po intl support macros include sysdeps src lib guile examples
 
 include_HEADERS = glibtop.h
 
-EXTRA_DIST = autogen.sh libgtop.spec copyright.txt libgtopConf.sh.in
+EXTRA_DIST = autogen.sh libgtop.spec copyright.txt libgtopConf.sh.in \
+	LIBGTOP-VERSION features.def perl/Makefile.PL.in perl/perl.awk \
+	perl/MANIFEST perl/Changes
 
 release:
 	$(MAKE) dist distdir=$(PACKAGE)$(VERSION)
diff --git a/configure.in b/configure.in
index 114b8b97..8c816a8d 100644
--- a/configure.in
+++ b/configure.in
@@ -278,7 +278,6 @@ sysdeps/linux/Makefile
 sysdeps/kernel/Makefile
 sysdeps/freebsd/Makefile
 src/Makefile
-src/server/Makefile
 src/daemon/Makefile
 lib/Makefile
 guile/Makefile
diff --git a/glibtop.h b/glibtop.h
index e57d08a1..6a32ae69 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -71,8 +71,8 @@ extern const unsigned long glibtop_server_features;
 
 #define glibtop_close()	glibtop_close_r(glibtop_global_server);
 
-extern glibtop *glibtop_init_r __P((glibtop **, const unsigned long, const unsigned));
-extern glibtop *glibtop_init_s __P((glibtop **, const unsigned long, const unsigned));
+extern glibtop *glibtop_init_r __P((glibtop **, unsigned long, unsigned));
+extern glibtop *glibtop_init_s __P((glibtop **, unsigned long, unsigned));
 
 #ifdef GLIBTOP_GUILE
 
diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index d56603a8..482444e9 100644
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -5,5 +5,5 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
 			  procmem.h procuid.h swap.h write.h error.h open.h \
 			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
-			  procsignal.h read_data.h union.h types.h \
-			  parameter.h mountlist.h fsusage.h procmap.h
+			  procsignal.h read_data.h union.h types.h gnuserv.h \
+			  parameter.h mountlist.h fsusage.h procmap.h signal.h
diff --git a/lib/init.c b/lib/init.c
index 6f391360..c5d3b6d6 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -109,7 +109,8 @@ _init_server (glibtop *server, const unsigned features)
 					
 			/* Override default. */
 			if (server->server_host)
-				glibtop_free_r (server, server->server_host);
+				glibtop_free_r (server,
+						(char *) server->server_host);
 
 			server->server_host = glibtop_strdup_r
 				(server, temp+1);
@@ -152,8 +153,7 @@ _init_server (glibtop *server, const unsigned features)
 }
 
 glibtop *
-glibtop_init_r (glibtop **server_ptr, const unsigned long features,
-		const unsigned flags)
+glibtop_init_r (glibtop **server_ptr, unsigned long features, unsigned flags)
 {
 	glibtop *server;
 
@@ -216,8 +216,7 @@ glibtop_init_r (glibtop **server_ptr, const unsigned long features,
 }
 
 glibtop *
-glibtop_init_s (glibtop **server_ptr, const unsigned long features,
-		const unsigned flags)
+glibtop_init_s (glibtop **server_ptr, unsigned long features, unsigned flags)
 {
 	glibtop *server;
 	glibtop_init_func_t *init_fkt;
diff --git a/libgtop.spec b/libgtop.spec
index ad9bc4c1..d0eec505 100644
--- a/libgtop.spec
+++ b/libgtop.spec
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      0.01
+%define ver      0.25
 %define rel      SNAP
 %define prefix   /usr
 
@@ -9,24 +9,25 @@ Version: %ver
 Release: %rel
 Copyright: LGPL
 Group: X11/Libraries
-Source: ftp://ftp.gnome.org/pub/libgtop-%{ver}.tar.gz
+Source: ftp://ftp.home-of-linux.org/pub/libgtop-%{ver}.tar.gz
 BuildRoot: /tmp/libgtop-root
-Packager: Michael Fulbright <msf@redhat.com>
-URL: http://www.gnome.org
+Packager: Martin Baulig <martin@home-of-linux.org>
+URL: http://www.home-of-linux.org/gnome/libgtop/
 Prereq: /sbin/install-info
 Docdir: %{prefix}/doc
 
 %description
 
-A library that fetches 
-information about the running system such as cpu and memory usage,
-active processes etc. On Linux systems, these information are taken
-directly from the /proc filesystem. 
+A library that fetches information about the running system such as
+cpu and memory usage, active processes etc.
 
+On Linux systems, these information are taken directly from the /proc
+filesystem while on other systems a server is used to read those
+information from /dev/kmem or whatever. 
 
 %changelog
 
-* Tue Jun  2 1998 Michael Fulbright <msf@redhat.com>
+* Sun Aug 16 1998 Martin Baulig <martin@home-of-linux.org>
 
 - first version of the RPM
 
@@ -36,9 +37,9 @@ directly from the /proc filesystem.
 %build
 # Needed for snapshot releases.
 if [ ! -f configure ]; then
-  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --disable-libgtop-examples
+  CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table
 else
-  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --disable-libgtop-examples
+  CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table
 fi
 
 if [ "$SMP" != "" ]; then
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5cda12d9..1f81a9d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,28 +1,39 @@
-lib/command.c
-lib/close.c
-lib/init.c
-lib/sysdeps.c
-lib/open.c
-lib/read.c
-lib/read_data.c
-lib/parameter.c
-lib/write.c
-examples/mountlist.c
-examples/first.c
-examples/second.c
-examples/third.c
+sysdeps/names/cpu.c
+sysdeps/names/fsusage.c
+sysdeps/names/loadavg.c
+sysdeps/names/mem.c
+sysdeps/names/mountlist.c
+sysdeps/names/msg_limits.c
+sysdeps/names/prockernel.c
+sysdeps/names/proclist.c
+sysdeps/names/procmap.c
+sysdeps/names/procmem.c
+sysdeps/names/procsegment.c
+sysdeps/names/procsignal.c
+sysdeps/names/procstate.c
+sysdeps/names/proctime.c
+sysdeps/names/procuid.c
+sysdeps/names/sem_limits.c
+sysdeps/names/shm_limits.c
+sysdeps/names/swap.c
+sysdeps/names/sysdeps.c
+sysdeps/names/uptime.c
 include/glibtop/close.h
-include/glibtop/signal.h
 include/glibtop/command.h
 include/glibtop/cpu.h
-include/glibtop/global.h
 include/glibtop/error.h
+include/glibtop/fsusage.h
+include/glibtop/global.h
+include/glibtop/gnuserv.h
 include/glibtop/loadavg.h
 include/glibtop/mem.h
+include/glibtop/mountlist.h
 include/glibtop/msg_limits.h
 include/glibtop/open.h
+include/glibtop/parameter.h
 include/glibtop/prockernel.h
 include/glibtop/proclist.h
+include/glibtop/procmap.h
 include/glibtop/procmem.h
 include/glibtop/procsegment.h
 include/glibtop/procsignal.h
@@ -33,6 +44,7 @@ include/glibtop/read.h
 include/glibtop/read_data.h
 include/glibtop/sem_limits.h
 include/glibtop/shm_limits.h
+include/glibtop/signal.h
 include/glibtop/swap.h
 include/glibtop/sysdeps.h
 include/glibtop/types.h
@@ -40,165 +52,51 @@ include/glibtop/union.h
 include/glibtop/uptime.h
 include/glibtop/version.h
 include/glibtop/write.h
-include/glibtop/parameter.h
-include/glibtop/gnuserv.h
-include/glibtop/mountlist.h
 include/glibtop/xmalloc.h
-src/daemon/main.c
-src/daemon/slave.c
-src/daemon/io.c
-src/daemon/server_config.h
-src/daemon/daemon.h
-src/daemon/gnuserv.c
-sysdeps/common/gnuslib.c
-sysdeps/common/fsusage.c
-sysdeps/common/fsusage.h
-sysdeps/common/mountlist.c
-sysdeps/common/mountlist.h
-sysdeps/linux/loadavg.c
-sysdeps/linux/close.c
-sysdeps/linux/cpu.c
-sysdeps/linux/msg_limits.c
-sysdeps/linux/mem.c
-sysdeps/linux/procdata.c
-sysdeps/linux/open.c
-sysdeps/linux/prockernel.c
-sysdeps/linux/proclist.c
-sysdeps/linux/procmem.c
-sysdeps/linux/procsegment.c
-sysdeps/linux/procsignal.c
-sysdeps/linux/procstate.c
-sysdeps/linux/proctime.c
-sysdeps/linux/procuid.c
-sysdeps/linux/sem_limits.c
-sysdeps/linux/siglist.c
-sysdeps/linux/glibtop_server.h
-sysdeps/linux/swap.c
-sysdeps/linux/uptime.c
-sysdeps/linux/glibtop_machine.h
-sysdeps/linux/shm_limits.c
-sysdeps/names/loadavg.c
-sysdeps/names/cpu.c
-sysdeps/names/msg_limits.c
-sysdeps/names/mem.c
-sysdeps/names/prockernel.c
-sysdeps/names/proclist.c
-sysdeps/names/procmem.c
-sysdeps/names/procsegment.c
-sysdeps/names/procsignal.c
-sysdeps/names/procstate.c
-sysdeps/names/proctime.c
-sysdeps/names/procuid.c
-sysdeps/names/sem_limits.c
-sysdeps/names/shm_limits.c
-sysdeps/names/swap.c
-sysdeps/names/uptime.c
-sysdeps/names/sysdeps.c
-sysdeps/osf1/close.c
-sysdeps/osf1/glibtop_machine.h
-sysdeps/osf1/loadavg.c
-sysdeps/osf1/cpu.c
-sysdeps/osf1/msg_limits.c
-sysdeps/osf1/mem.c
-sysdeps/osf1/procdata.c
-sysdeps/osf1/open.c
-sysdeps/osf1/sem_limits.c
-sysdeps/osf1/shm_limits.c
-sysdeps/osf1/glibtop_server.h
-sysdeps/osf1/siglist.c
-sysdeps/osf1/swap.c
-sysdeps/osf1/uptime.c
-sysdeps/stub/loadavg.c
-sysdeps/stub/close.c
-sysdeps/stub/cpu.c
-sysdeps/stub/msg_limits.c
-sysdeps/stub/mem.c
-sysdeps/stub/prockernel.c
-sysdeps/stub/open.c
-sysdeps/stub/proclist.c
-sysdeps/stub/procmem.c
-sysdeps/stub/procsegment.c
-sysdeps/stub/procsignal.c
-sysdeps/stub/procstate.c
-sysdeps/stub/proctime.c
-sysdeps/stub/procuid.c
-sysdeps/stub/sem_limits.c
-sysdeps/stub/swap.c
-sysdeps/stub/glibtop_server.h
-sysdeps/stub/shm_limits.c
-sysdeps/stub/siglist.c
-sysdeps/stub/uptime.c
-sysdeps/kernel/loadavg.c
-sysdeps/kernel/close.c
-sysdeps/kernel/cpu.c
-sysdeps/kernel/msg_limits.c
-sysdeps/kernel/mem.c
-sysdeps/kernel/procdata.c
-sysdeps/kernel/open.c
-sysdeps/kernel/prockernel.c
-sysdeps/kernel/proclist.c
-sysdeps/kernel/procmem.c
-sysdeps/kernel/procsegment.c
-sysdeps/kernel/procsignal.c
-sysdeps/kernel/procstate.c
-sysdeps/kernel/proctime.c
-sysdeps/kernel/procuid.c
-sysdeps/kernel/sem_limits.c
-sysdeps/kernel/kernel.h
-sysdeps/kernel/glibtop_server.h
-sysdeps/kernel/swap.c
-sysdeps/kernel/uptime.c
-sysdeps/kernel/shm_limits.c
-sysdeps/kernel/siglist.c
-intl/bindtextdom.c
-intl/cat-compat.c
-intl/dcgettext.c
-intl/dgettext.c
-intl/explodename.c
-intl/gettext.h
-intl/gettextP.h
-intl/hash-string.h
-intl/finddomain.c
-intl/gettext.c
-intl/libgettext.h
-intl/loadinfo.h
-intl/intl-compat.c
-intl/l10nflist.c
-intl/loadmsgcat.c
-intl/localealias.c
-intl/textdomain.c
+lib/close.c
+lib/command.c
+lib/init.c
+lib/open.c
+lib/parameter.c
+lib/read.c
+lib/read_data.c
+lib/sysdeps.c
+lib/write.c
 support/argp-ba.c
 support/argp-eexst.c
 support/argp-fmtstream.c
-support/argp-fmtstream.h
 support/argp-fs-xinl.c
 support/argp-help.c
-support/argp-namefrob.h
 support/argp-parse.c
 support/argp-pv.c
 support/argp-pvh.c
 support/argp-test.c
 support/argp-xinl.c
-support/argp.h
 support/easy-vsnprintf.c
+support/error.c
 support/getopt.c
-support/getopt.h
 support/getopt1.c
 support/gnome-argp.c
-support/gnome-argp.h
 support/long-options.c
-support/long-options.h
+support/memmove.c
+support/mkstemp.c
 support/scandir.c
 support/strcasecmp.c
 support/strerror.c
 support/strndup.c
 support/strnlen.c
-support/strtok_r.c
-support/vasprintf.c
-support/vsnprintf.c
 support/strtod.c
-support/memmove.c
-support/mkstemp.c
+support/strtok_r.c
 support/strtol.c
 support/strtoul.c
-glibtop.h
+support/vasprintf.c
+support/vsnprintf.c
+support/argp-fmtstream.h
+support/argp-namefrob.h
+support/argp.h
+support/error.h
+support/getopt.h
+support/gnome-argp.h
+support/gnomesupport-fake.h
+support/gnomesupport.h
+support/long-options.h
diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am
index f95a71b2..de9c1366 100644
--- a/sysdeps/osf1/Makefile.am
+++ b/sysdeps/osf1/Makefile.am
@@ -13,3 +13,5 @@ libgtop_sysdeps_suid_la_SOURCES	= open_suid.c close_suid.c proclist.c \
 				  procstate.c procuid.c proctime.c procmem.c \
 				  procsignal.c prockernel.c procsegment.c
 libgtop_sysdeps_suid_la_LIBADD	= -lmach
+
+include_HEADERS			= glibtop_server.h glibtop_machine.h
diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am
index 4d93f62d..26785311 100644
--- a/sysdeps/sun4/Makefile.am
+++ b/sysdeps/sun4/Makefile.am
@@ -13,3 +13,5 @@ libgtop_sysdeps_suid_la_SOURCES	= open.c close.c cpu.c mem.c swap.c \
 				  proctime.c procmem.c procsignal.c prockernel.c \
 				  procsegment.c
 libgtop_sysdeps_suid_la_LIBADD	= -lkvm
+
+include_HEADERS			= glibtop_server.h glibtop_machine.h