List of features for `guile-names.awk'.

1998-06-13  Martin Baulig  <martin@home-of-linux.org>

	* features.def: List of features for `guile-names.awk'.

	* sysdeps/guile/names/guile-names.awk: New file.
	Creates `guile-names.c' depending upon `features.def'.

	* sysdeps/guile/names/*.c: Removed.

24 files changed, 156 insertions, 1767 deletions

diff --git a/ChangeLog b/ChangeLog
index 31c702e6..d1c63f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 1998-06-13  Martin Baulig  <martin@home-of-linux.org>
 
+	* features.def: List of features for `guile-names.awk'.
+
+	* sysdeps/guile/names/guile-names.awk: New file.
+	Creates `guile-names.c' depending upon `features.def'.
+
+	* sysdeps/guile/names/*.c: Removed.
+
 	* kernel: New directory. Contains some kernel code to
 	implement a new system call table () to fetch information
 	directly from the Linux kernel.
diff --git a/features.def b/features.def
new file mode 100644
index 00000000..dc17abb0
--- /dev/null
+++ b/features.def
@@ -0,0 +1,17 @@
+cpu
+mem
+swap
+uptime
+loadavg
+shm_limits
+msg_limits
+sem_limits
+proclist
+proc_state
+proc_uid
+proc_mem
+proc_time
+proc_signal
+proc_kernel
+proc_segment
+sysdeps
diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h
index 661e9032..cadbb423 100644
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -79,7 +79,7 @@ extern SCM glibtop_guile_descriptions_loadavg __P((void));
 /* You need to link with -lgtop_names to get this stuff here. */
 
 extern const char *glibtop_names_loadavg [];
-extern const char *glibtop_types_loadavg [];
+extern unsigned glibtop_types_loadavg [];
 extern const char *glibtop_labels_loadavg [];
 extern const char *glibtop_descriptions_loadavg [];
 
diff --git a/sysdeps/guile/names/Makefile.am b/sysdeps/guile/names/Makefile.am
index 80f4fb88..07c4bba4 100644
--- a/sysdeps/guile/names/Makefile.am
+++ b/sysdeps/guile/names/Makefile.am
@@ -8,9 +8,13 @@ CFLAGS				= -Wall -W @CFLAGS@
 
 lib_LTLIBRARIES			= libgtop_guile_names.la
 
-libgtop_guile_names_la_SOURCES	= boot.c sysdeps.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 \
-				  proctime.c procmem.c procsignal.c prockernel.c \
-				  procsegment.c
+libgtop_guile_names_la_SOURCES	= guile-names.c
+
+BUILT_SOURCES			= guile-names.c
+
+guile-names.c: guile-names.awk $(top_builddir)/config.h $(top_builddir)/features.def
+	$(AWK) -f $(srcdir)/guile-names.awk < $(top_builddir)/features.def > gnc-t
+	mv gnc-t guile-names.c
+
+EXTRA_DIST			= guile-names.awk
 
diff --git a/sysdeps/guile/names/boot.c b/sysdeps/guile/names/boot.c
deleted file mode 100644
index 01ceb255..00000000
--- a/sysdeps/guile/names/boot.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/sysdeps.h>
-
-#include <guile/gh.h>
-
-void
-glibtop_boot_guile_names (void)
-{
-	gh_new_procedure0_0
-		("glibtop-names-cpu", glibtop_guile_names_cpu);
-	gh_new_procedure0_0
-		("glibtop-names-mem", glibtop_guile_names_mem);
-	gh_new_procedure0_0
-		("glibtop-names-swap", glibtop_guile_names_swap);
-	gh_new_procedure0_0
-		("glibtop-names-uptime", glibtop_guile_names_uptime);
-	gh_new_procedure0_0
-		("glibtop-names-loadavg", glibtop_guile_names_loadavg);
-	gh_new_procedure0_0
-		("glibtop-names-shm_limits", glibtop_guile_names_shm_limits);
-	gh_new_procedure0_0
-		("glibtop-names-msg_limits", glibtop_guile_names_msg_limits);
-	gh_new_procedure0_0
-		("glibtop-names-sem_limits", glibtop_guile_names_sem_limits);
-	gh_new_procedure0_0
-		("glibtop-names-sysdeps", glibtop_guile_names_sysdeps);
-	gh_new_procedure0_0
-		("glibtop-names-proclist", glibtop_guile_names_proclist);
-
-	gh_new_procedure0_0
-		("glibtop-names-proc_state", glibtop_guile_names_proc_state);
-	gh_new_procedure0_0
-		("glibtop-names-proc_uid", glibtop_guile_names_proc_uid);
-	gh_new_procedure0_0
-		("glibtop-names-proc_mem", glibtop_guile_names_proc_mem);
-	gh_new_procedure0_0
-		("glibtop-names-proc_time", glibtop_guile_names_proc_time);
-	gh_new_procedure0_0
-		("glibtop-names-proc_signal", glibtop_guile_names_proc_signal);
-	gh_new_procedure0_0
-		("glibtop-names-proc_kernel", glibtop_guile_names_proc_kernel);
-	gh_new_procedure0_0
-		("glibtop-names-proc_segment", glibtop_guile_names_proc_segment);
-
-	gh_new_procedure0_0
-		("glibtop-types-cpu", glibtop_guile_types_cpu);
-	gh_new_procedure0_0
-		("glibtop-types-mem", glibtop_guile_types_mem);
-	gh_new_procedure0_0
-		("glibtop-types-swap", glibtop_guile_types_swap);
-	gh_new_procedure0_0
-		("glibtop-types-uptime", glibtop_guile_types_uptime);
-	gh_new_procedure0_0
-		("glibtop-types-loadavg", glibtop_guile_types_loadavg);
-	gh_new_procedure0_0
-		("glibtop-types-shm_limits", glibtop_guile_types_shm_limits);
-	gh_new_procedure0_0
-		("glibtop-types-msg_limits", glibtop_guile_types_msg_limits);
-	gh_new_procedure0_0
-		("glibtop-types-sem_limits", glibtop_guile_types_sem_limits);
-	gh_new_procedure0_0
-		("glibtop-types-sysdeps", glibtop_guile_types_sysdeps);
-	gh_new_procedure0_0
-		("glibtop-types-proclist", glibtop_guile_types_proclist);
-
-	gh_new_procedure0_0
-		("glibtop-types-proc_state", glibtop_guile_types_proc_state);
-	gh_new_procedure0_0
-		("glibtop-types-proc_uid", glibtop_guile_types_proc_uid);
-	gh_new_procedure0_0
-		("glibtop-types-proc_mem", glibtop_guile_types_proc_mem);
-	gh_new_procedure0_0
-		("glibtop-types-proc_time", glibtop_guile_types_proc_time);
-	gh_new_procedure0_0
-		("glibtop-types-proc_signal", glibtop_guile_types_proc_signal);
-	gh_new_procedure0_0
-		("glibtop-types-proc_kernel", glibtop_guile_types_proc_kernel);
-	gh_new_procedure0_0
-		("glibtop-types-proc_segment", glibtop_guile_types_proc_segment);
-
-
-	gh_new_procedure0_0
-		("glibtop-labels-cpu", glibtop_guile_labels_cpu);
-	gh_new_procedure0_0
-		("glibtop-labels-mem", glibtop_guile_labels_mem);
-	gh_new_procedure0_0
-		("glibtop-labels-swap", glibtop_guile_labels_swap);
-	gh_new_procedure0_0
-		("glibtop-labels-uptime", glibtop_guile_labels_uptime);
-	gh_new_procedure0_0
-		("glibtop-labels-loadavg", glibtop_guile_labels_loadavg);
-	gh_new_procedure0_0
-		("glibtop-labels-shm_limits", glibtop_guile_labels_shm_limits);
-	gh_new_procedure0_0
-		("glibtop-labels-msg_limits", glibtop_guile_labels_msg_limits);
-	gh_new_procedure0_0
-		("glibtop-labels-sem_limits", glibtop_guile_labels_sem_limits);
-	gh_new_procedure0_0
-		("glibtop-labels-sysdeps", glibtop_guile_labels_sysdeps);
-	gh_new_procedure0_0
-		("glibtop-labels-proclist", glibtop_guile_labels_proclist);
-
-	gh_new_procedure0_0
-		("glibtop-labels-proc_state", glibtop_guile_labels_proc_state);
-	gh_new_procedure0_0
-		("glibtop-labels-proc_uid", glibtop_guile_labels_proc_uid);
-	gh_new_procedure0_0
-		("glibtop-labels-proc_mem", glibtop_guile_labels_proc_mem);
-	gh_new_procedure0_0
-		("glibtop-labels-proc_time", glibtop_guile_labels_proc_time);
-	gh_new_procedure0_0
-		("glibtop-labels-proc_signal", glibtop_guile_labels_proc_signal);
-	gh_new_procedure0_0
-		("glibtop-labels-proc_kernel", glibtop_guile_labels_proc_kernel);
-	gh_new_procedure0_0
-		("glibtop-labels-proc_segment", glibtop_guile_labels_proc_segment);
-
-	gh_new_procedure0_0
-		("glibtop-descriptions-cpu", glibtop_guile_descriptions_cpu);
-	gh_new_procedure0_0
-		("glibtop-descriptions-mem", glibtop_guile_descriptions_mem);
-	gh_new_procedure0_0
-		("glibtop-descriptions-swap", glibtop_guile_descriptions_swap);
-	gh_new_procedure0_0
-		("glibtop-descriptions-uptime", glibtop_guile_descriptions_uptime);
-	gh_new_procedure0_0
-		("glibtop-descriptions-loadavg", glibtop_guile_descriptions_loadavg);
-	gh_new_procedure0_0
-		("glibtop-descriptions-shm_limits", glibtop_guile_descriptions_shm_limits);
-	gh_new_procedure0_0
-		("glibtop-descriptions-msg_limits", glibtop_guile_descriptions_msg_limits);
-	gh_new_procedure0_0
-		("glibtop-descriptions-sem_limits", glibtop_guile_descriptions_sem_limits);
-	gh_new_procedure0_0
-		("glibtop-descriptions-sysdeps", glibtop_guile_descriptions_sysdeps);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proclist", glibtop_guile_descriptions_proclist);
-
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_state", glibtop_guile_descriptions_proc_state);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_uid", glibtop_guile_descriptions_proc_uid);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_mem", glibtop_guile_descriptions_proc_mem);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_time", glibtop_guile_descriptions_proc_time);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_signal", glibtop_guile_descriptions_proc_signal);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_kernel", glibtop_guile_descriptions_proc_kernel);
-	gh_new_procedure0_0
-		("glibtop-descriptions-proc_segment", glibtop_guile_descriptions_proc_segment);
-}
diff --git a/sysdeps/guile/names/cpu.c b/sysdeps/guile/names/cpu.c
deleted file mode 100644
index eed68f17..00000000
--- a/sysdeps/guile/names/cpu.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/cpu.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_cpu (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_cpu [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_cpu (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_cpu [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_cpu (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_cpu [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_cpu (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_CPU; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_cpu [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/guile-names.awk b/sysdeps/guile/names/guile-names.awk
new file mode 100644
index 00000000..54ecb6e8
--- /dev/null
+++ b/sysdeps/guile/names/guile-names.awk
@@ -0,0 +1,121 @@
+BEGIN {
+  print "/* guile_names.c */";
+  print "/* This is a generated file.  Please modify `guile-names.awk' */";
+  print "";
+
+  print "#include <glibtop.h>";
+  print "#include <glibtop/sysdeps.h>";
+  print "";
+  print "#include <guile/gh.h>";
+
+  print "";
+
+}
+
+output ($feature) {
+  print "SCM";
+  print "glibtop_guile_names_"$feature" (void)";
+  print "{";
+  print "\tint i;";
+  print "\tSCM list;";
+  print "";
+  print "\tlist = gh_list (SCM_UNDEFINED);";
+  print "";
+  print "\tfor (i = 0; i < GLIBTOP_MAX_"toupper($feature)"; i++)";
+  print "\t\tlist = gh_append";
+  print "\t\t\t(gh_list (list,";
+  print "\t\t\t\t  gh_list (gh_str02scm ((char *) glibtop_names_"$feature" [i])),";
+  print "\t\t\t\t  SCM_UNDEFINED));";
+  print "";
+  print "\treturn list;";
+  print "}";
+  
+  print "";
+  
+  print "SCM";
+  print "glibtop_guile_types_"$feature" (void)";
+  print "{";
+  print "\tint i;";
+  print "\tSCM list;";
+  print "";
+  print "\tlist = gh_list (SCM_UNDEFINED);";
+  print "";
+  print "\tfor (i = 0; i < GLIBTOP_MAX_"toupper($feature)"; i++)";
+  print "\t\tlist = gh_append";
+  print "\t\t\t(gh_list (list,";
+  print "\t\t\t\t  gh_list (gh_ulong2scm (glibtop_types_"$feature" [i])),";
+  print "\t\t\t\t  SCM_UNDEFINED));";
+  print "";
+  print "\treturn list;";
+  print "}";
+  
+  print "";
+  
+  print "SCM";
+  print "glibtop_guile_labels_"$feature" (void)";
+  print "{";
+  print "\tint i;";
+  print "\tSCM list;";
+  print "";
+  print "\tlist = gh_list (SCM_UNDEFINED);";
+  print "";
+  print "\tfor (i = 0; i < GLIBTOP_MAX_"toupper($feature)"; i++)";
+  print "\t\tlist = gh_append";
+  print "\t\t\t(gh_list (list,";
+  print "\t\t\t\t  gh_list (gh_str02scm (gettext";
+  print "\t\t\t\t\t\t\t(glibtop_labels_"$feature" [i]))),";
+  print "\t\t\t\t  SCM_UNDEFINED));";
+  print "";
+  print "\treturn list;";
+  print "}";
+  
+  print "";
+  
+  print "SCM";
+  print "glibtop_guile_descriptions_"$feature" (void)";
+  print "{";
+  print "\tint i;";
+  print "\tSCM list;";
+  print "";
+  print "\tlist = gh_list (SCM_UNDEFINED);";
+  print "";
+  print "\tfor (i = 0; i < GLIBTOP_MAX_"toupper($feature)"; i++)";
+  print "\t\tlist = gh_append";
+  print "\t\t\t(gh_list (list,";
+  print "\t\t\t\t  gh_list (gh_str02scm (gettext";
+  print "\t\t\t\t\t\t\t(glibtop_descriptions_"$feature" [i]))),";
+  print "\t\t\t\t  SCM_UNDEFINED));";
+  print "";
+  print "\treturn list;";
+  print "}";
+
+  print "";
+}
+
+/^(\w+)/	{ features[$1] = $1 }
+
+END {
+  for (feature in features) {
+    output (feature);
+  }
+
+  print "void";
+  print "glibtop_boot_guile_names (void)";
+  print "{";
+
+  for (feature in features) {
+    print "\tgh_new_procedure0_0";
+    print "\t\t(\"glibtop-names-"feature"\", glibtop_guile_names_"feature");";
+    print "";
+    print "\tgh_new_procedure0_0";
+    print "\t\t(\"glibtop-types-"feature"\", glibtop_guile_types_"feature");";
+    print "";
+    print "\tgh_new_procedure0_0";
+    print "\t\t(\"glibtop-labels-"feature"\", glibtop_guile_labels_"feature");";
+    print "";
+    print "\tgh_new_procedure0_0";
+    print "\t\t(\"glibtop-descriptions-"feature"\", glibtop_guile_descriptions_"feature");";
+  }
+  print "}";
+}
+
diff --git a/sysdeps/guile/names/loadavg.c b/sysdeps/guile/names/loadavg.c
deleted file mode 100644
index c6e37127..00000000
--- a/sysdeps/guile/names/loadavg.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/loadavg.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_loadavg (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_loadavg [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_loadavg (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_loadavg [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_loadavg (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_loadavg [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_loadavg (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_LOADAVG; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_loadavg [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/mem.c b/sysdeps/guile/names/mem.c
deleted file mode 100644
index 06160766..00000000
--- a/sysdeps/guile/names/mem.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/mem.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_mem [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_mem [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_mem [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_mem [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/msg_limits.c b/sysdeps/guile/names/msg_limits.c
deleted file mode 100644
index 9225c9af..00000000
--- a/sysdeps/guile/names/msg_limits.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/msg_limits.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_msg_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_msg_limits [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_msg_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_msg_limits [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_msg_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_msg_limits [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_msg_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_MSG_LIMITS; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_msg_limits [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/prockernel.c b/sysdeps/guile/names/prockernel.c
deleted file mode 100644
index 1fbd0e95..00000000
--- a/sysdeps/guile/names/prockernel.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/prockernel.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_kernel (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_kernel [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_kernel (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_kernel [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_kernel (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_kernel [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_kernel (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_KERNEL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_kernel [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/proclist.c b/sysdeps/guile/names/proclist.c
deleted file mode 100644
index 2dc568cc..00000000
--- a/sysdeps/guile/names/proclist.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/xmalloc.h>
-#include <glibtop/proclist.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proclist (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proclist [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proclist (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proclist [i])),
-				  SCM_UNDEFINED));
-			 
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proclist (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proclist [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proclist (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROCLIST; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proclist [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/procmem.c b/sysdeps/guile/names/procmem.c
deleted file mode 100644
index a114a530..00000000
--- a/sysdeps/guile/names/procmem.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/procmem.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_mem [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_mem [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_mem [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_mem (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_MEM; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_mem [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/procsegment.c b/sysdeps/guile/names/procsegment.c
deleted file mode 100644
index 926ae65f..00000000
--- a/sysdeps/guile/names/procsegment.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/procsegment.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_segment (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_segment [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_segment (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_segment [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_segment (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_segment [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_segment (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SEGMENT; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_segment [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/procsignal.c b/sysdeps/guile/names/procsignal.c
deleted file mode 100644
index e3c8da87..00000000
--- a/sysdeps/guile/names/procsignal.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/procsignal.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_signal (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_signal [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_signal (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_signal [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_signal (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_signal [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_signal (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_SIGNAL; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_signal [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/procstate.c b/sysdeps/guile/names/procstate.c
deleted file mode 100644
index 8575fc69..00000000
--- a/sysdeps/guile/names/procstate.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/procstate.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_state (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_state [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_state (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_state [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_state (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_state [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_state (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_STATE; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_state [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/proctime.c b/sysdeps/guile/names/proctime.c
deleted file mode 100644
index 67cbd924..00000000
--- a/sysdeps/guile/names/proctime.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/proctime.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_time (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_time [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_time (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_time [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_time (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_time [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_time (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_TIME; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_time [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/procuid.c b/sysdeps/guile/names/procuid.c
deleted file mode 100644
index b47eb226..00000000
--- a/sysdeps/guile/names/procuid.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/procuid.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_proc_uid (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (glibtop_names_proc_uid [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_proc_uid (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_ulong2scm (glibtop_types_proc_uid [i])),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_proc_uid (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_labels_proc_uid [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_proc_uid (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_PROC_UID; i++)
-		list = gh_append
-			(gh_list (list,
-				  gh_list (gh_str02scm (gettext
-							(glibtop_descriptions_proc_uid [i]))),
-				  SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/sem_limits.c b/sysdeps/guile/names/sem_limits.c
deleted file mode 100644
index 6c88555c..00000000
--- a/sysdeps/guile/names/sem_limits.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/sem_limits.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_sem_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (glibtop_names_sem_limits [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_sem_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_ulong2scm (glibtop_types_sem_limits [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_sem_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_labels_sem_limits [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_sem_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SEM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_descriptions_sem_limits [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/shm_limits.c b/sysdeps/guile/names/shm_limits.c
deleted file mode 100644
index 50c7c0d8..00000000
--- a/sysdeps/guile/names/shm_limits.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/shm_limits.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_shm_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (glibtop_names_shm_limits [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_shm_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_ulong2scm (glibtop_types_shm_limits [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_shm_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_labels_shm_limits [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_shm_limits (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SHM_LIMITS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_descriptions_shm_limits [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/swap.c b/sysdeps/guile/names/swap.c
deleted file mode 100644
index 720d6371..00000000
--- a/sysdeps/guile/names/swap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/swap.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_swap (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (glibtop_names_swap [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_swap (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_ulong2scm (glibtop_types_swap [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_swap (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_labels_swap [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_swap (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SWAP; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_descriptions_swap [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/sysdeps.c b/sysdeps/guile/names/sysdeps.c
deleted file mode 100644
index d9ed5af5..00000000
--- a/sysdeps/guile/names/sysdeps.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/sysdeps.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_sysdeps (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (glibtop_names_sysdeps [i])),
-					   SCM_UNDEFINED));
-				   
-	return list;
-}
-
-SCM
-glibtop_guile_types_sysdeps (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_ulong2scm (glibtop_types_sysdeps [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_sysdeps (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_labels_sysdeps [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_sysdeps (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_SYSDEPS; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_descriptions_sysdeps [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/guile/names/uptime.c b/sysdeps/guile/names/uptime.c
deleted file mode 100644
index eb708aff..00000000
--- a/sysdeps/guile/names/uptime.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-   This file is part of the Gnome Top Library.
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   The Gnome Top Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Top Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <glibtop.h>
-#include <glibtop/uptime.h>
-
-#include <guile/gh.h>
-
-SCM
-glibtop_guile_names_uptime (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (glibtop_names_uptime [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_types_uptime (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_ulong2scm (glibtop_types_uptime [i])),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_labels_uptime (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_labels_uptime [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
-
-SCM
-glibtop_guile_descriptions_uptime (void)
-{
-	int i;
-	SCM list;
-	
-	list = gh_list (SCM_UNDEFINED);
-	
-	for (i = 0; i < GLIBTOP_MAX_UPTIME; i++)
-		list = gh_append (gh_list (list,
-					   gh_list (gh_str02scm (gettext (glibtop_descriptions_uptime [i]))),
-					   SCM_UNDEFINED));
-	
-	return list;
-}
diff --git a/sysdeps/names/loadavg.c b/sysdeps/names/loadavg.c
index 351f3675..fc6ce7c2 100644
--- a/sysdeps/names/loadavg.c
+++ b/sysdeps/names/loadavg.c
@@ -26,7 +26,7 @@ const char *glibtop_names_loadavg [GLIBTOP_MAX_LOADAVG] =
 	"loadavg"
 };
 
-const char *glibtop_types_loadavg [GLIBTOP_MAX_LOADAVG] =
+const unsigned glibtop_types_loadavg [GLIBTOP_MAX_LOADAVG] =
 {
 	GLIBTOP_TYPE_DOUBLE
 };