Made gtk-doc happy in order to dist.

2006-12-03 Benoît Dejean <benoit@placenet.org> * doc/reference/libgtop-docs.xml: * glibtop.h: * include/glibtop/sysinfo.h: Made gtk-doc happy in order to dist.
Released 2.14.5.
2006-12-03 18:21:01 +00:00 · 2006-12-03 15:53:19 +00:00 · 2006-12-02 13:42:48 +00:00 · 2006-12-01 18:48:22 +00:00 · 2006-12-01 11:06:47 +00:00 · 2006-11-27 19:32:57 +00:00
390 changed files with 9095 additions and 48686 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -40,3 +40,9 @@ install-sh
 missing
 mkinstalldirs
 libgtopconfig.h
+intltool-extract.in
+intltool-extract
+intltool-merge.in
+intltool-merge
+intltool-update.in
+intltool-update
--- a/411
+++ b/411
@@ -1,3 +1,414 @@
+2006-12-03  Benoît Dejean  <benoit@placenet.org>
+
+	* doc/reference/libgtop-docs.xml:
+	* glibtop.h:
+	* include/glibtop/sysinfo.h:
+	
+	Made gtk-doc happy in order to dist.
+
+2006-12-03  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	
+	Released 2.14.5.
+
+2006-12-02  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am:
+	* configure.in:
+	* doc/Makefile.am:
+	* doc/reference/Makefile.am:
+	* doc/reference/libgtop-docs.xml:
+	* doc/reference/libgtop-sections.txt:
+	* doc/reference/version.xml.in:
+	* gtk-doc.make:
+	* sysdeps/common/default.c:
+
+	Converted to gtk-doc.
+	Patch by Germán Poó-Caamaño <gpoo@ubiobio.cl>.
+
+2006-12-01  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* configure.in:
+	* libgtop-sysdeps.m4:
+
+	Use the AS_HELP_STRING macro to format help messages.
+	Fixes bug #337068.
+
+2006-11-27  Benoît Dejean  <benoit@placenet.org>
+
+	* libgtop-sysdeps.m4:
+	
+	Added kfreebsd support.
+	Patch by Petr Salinger <Petr.Salinger@seznam.cz>.
+
+2006-11-27  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bumped version number.
+
+2006-09-16  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+	
+	Released 2.14.4.
+
+2006-09-10  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* include/glibtop/procstate.h:
+	
+	Removed wrong inline documentation.
+	Closes #355286.
+
+2006-09-05  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	
+	Released 2.14.3.
+
+2006-08-14  Benoît Dejean  <benoit@placenet.org>
+
+	* src/inodedb/Makefile.am:
+
+	Fixed inodedb build with --as-needed to please people
+	who want to compile and optimize broken, deprecated and
+	never-used feature.
+	Patch by Daniel Gryniewicz <dang@gentoo.org>
+	Closes #341041.
+
+2006-08-10  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bumped version number.
+	
+	* glibtop.h:
+	* include/glibtop/init_hooks.h:
+
+	Added missing G_(BEGIN|END)_DECLS.
+
+2006-07-27  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+
+	Released 2.14.2.
+
+2006-07-27  Benoît Dejean  <benoit@placenet.org>
+
+	* include/glibtop/netload.h:
+	
+	Tiny interface addition to handle wireless interfaces.
+
+2006-06-26  Benoît Dejean  <benoit@placenet.org>
+
+	* po/Makefile.in.in.in:
+	
+	Dropped dead file.
+
+2006-06-25  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am: 
+	
+	Fixed build.
+	Closes #341779.
+
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am:
+
+	Build examples only when needed.
+	Patch by dmacks@netspace.org.
+	Closes #342863.
+
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* libgtop-sysdeps.m4:
+	* sysdeps/solaris/glibtop_machine.h:
+	
+	Updated the GLIBTOP_SOLARIS_RELEASE
+	
+	Patch by hua.zhang@sun.com.
+	Closes #345821.
+
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Don't use kvm on newer solaris.
+	Patch by hua.zhang@sun.com.
+	Closes #345811.
+
+2006-06-04  Benoît Dejean  <benoit@placenet.org>
+
+	* libgtop-sysdeps.m4:
+	
+	Removed undefined LIBGTOP_HACKER_TESTS.
+	Closes #342890.
+
+2006-06-03  Benoît Dejean  <benoit@placenet.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* configure.in:
+	* po/LINGUAS:
+	
+	Use po/LINGUAS.
+	Closes #337902.
+
+2006-04-18  German Poo-Caaman~o  <gpoo@ubiobio.cl>
+
+	* /include/glibtop/cpu.h:
+	* /include/glibtop/fsusage.h:
+	* /include/glibtop/loadavg.h:
+	* /include/glibtop/mem.h:
+	* /include/glibtop/mountlist.h:
+	* /include/glibtop/msg_limits.h:
+	* /include/glibtop/netload.h:
+	* /include/glibtop/ppp.h:
+	* /include/glibtop/procargs.h:
+	* /include/glibtop/prockernel.h:
+	* /include/glibtop/proclist.h:
+	* /include/glibtop/procmap.h:
+	* /include/glibtop/procmem.h:
+	* /include/glibtop/procopenfiles.h:
+	* /include/glibtop/procsegment.h:
+	* /include/glibtop/procsignal.h:
+	* /include/glibtop/procstate.h:
+	* /include/glibtop/proctime.h:
+	* /include/glibtop/procuid.h:
+	* /include/glibtop/sem_limits.h:
+	* /include/glibtop/shm_limits.h:
+	* /include/glibtop/swap.h:
+	* /include/glibtop/sysdeps.h:
+	* /include/glibtop/uptime.h:
+
+	Changed struct's definitions to be one type-one member.  To
+	avoid problems with any further gtk-doc's implementation.
+
+2006-04-18  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* configure.in: Remove obsolete entry for no_NO
+	* po/no.po: And the translation.
+
+2006-04-10  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+
+	Released 2.14.1.
+
+2006-04-10  Benoît Dejean  <benoit@placenet.org>
+
+	* lib/open.c: (glibtop_open_l):
+	* lib/read.c: (glibtop_read_l):
+	* lib/write.c: (glibtop_write_l):
+
+	Fixed a bunch of signedness warnings.
+
+2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* libgtop-sysdeps.m4:
+	* sysdeps/freebsd/msg_limits.c:
+
+	Use configure checks to detect whether we need to define either
+	KERNEL or _KERNEL to get the definition of 'struct msginfo' in a
+	BSD system.  This replaces the previous checks in the code that
+	relied on __FreeBSD__ and similar macros.
+	
+	Before this change, the explicit definition of _KERNEL in the
+	msg_limits.c file broke the build in NetBSD because it made the
+	system headers pull in stuff unavailable to userland.
+
+	Fixes bug #337207.
+
+2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* libgtop-sysdeps.m4:
+	* sysdeps/freebsd/Makefile.am:
+
+	Check for the kvm library and use it to link the suid freebsd
+	sysdeps code (only if available).  This library provides all the
+	kvm_* functions used in it and is needed, at least, under NetBSD.
+
+	Fixes bug #337247.
+
+2006-04-04  Julio M. Merino Vidal  <jmmv@NetBSD.org>
+
+	* sysdeps/aix/glibtop_server.h:
+	* sysdeps/freebsd/glibtop_server.h:
+	* sysdeps/osf1/glibtop_server.h:
+	* sysdeps/stub/glibtop_server.h:
+	* sysdeps/stub_suid/glibtop_server.h:
+
+	Synch the list of GLIBTOP_SUID_* constants with those expected by
+	the lib/sysdeps.c file.  Fixes the build under, at least, NetBSD
+	and FreeBSD.
+
+	Fixes bug #337246.
+
+2006-04-02  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bumped version to 2.14.1.
+	Removed no longer needed gcc flag.
+
+2006-04-02  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* src/daemon/daemon.h:
+	* src/daemon/gnuserv.c: (main):
+	
+	Reverted. See #336837
+
+2006-03-18  Vladimer Sichinava  <vlsichinava@gmail.com>
+
+        * configure.in: Added "ka" (Georgian) to ALL_LINGUAS
+
+2006-03-13  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+
+	Released 2.14.0.
+
+2006-02-27  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+
+	Released 2.13.92.
+
+2006-02-20  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	
+	Bump version to 2.13.4.
+	Reordered libs. Closes #329153.
+
+2006-01-23  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* NEW:
+	
+	Released 2.13.3.
+
+2006-01-02  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+
+	Released 2.13.2.
+
+2006-01-02  James Henstridge  <james@jamesh.id.au>
+
+	* configure.in (LT_VERSION_INFO): add quotes around symbol definition.
+
+2005-12-15  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* NEWS:
+	
+	Released 2.13.1.
+
+2005-12-13  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+
+	Released 2.13.0.
+
+2005-12-12  James Henstridge  <james@jamesh.id.au>
+
+	* doc/auto-macros.texi.in: remove unused file.
+
+	* doc/libgtop2.texi: don't include auto-macros.texi.
+
+	* doc/Makefile.am: don't build auto-macros.texi, since none of its
+	macros are used in the documentation any more.
+
+	* include/glibtop/global.h: don't include <config.h> from headers.
+
+	* .../*.c: make sure <config.h> is the first thing included.
+
+	* acinclude.m4: m4_include() libgtop-sysdeps.m4 rather than
+	inlining it.
+
+	* acinclude.m4, libgtop-sysdeps.m4: use third argument to
+	AC_DEFINE() to set the comment.
+
+	* configure.in: modernise a bit.
+
+	* acconfig.h: remove file, since it is deprecated
+
+	* autogen.sh: require automake 1.9 instead of 1.4.
+
+2005-12-09  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* glibtop.h:
+	* include/glibtop/cpu.h:
+	* include/glibtop/procmap.h:
+
+	Increased GLIBTOP_NCPU to 32.
+	Added real_ncpu to struct glibtop.
+	Added smaps members to glibtop_map_entry.
+
+	Bumped version number to 2.13.0
+	Broke ABI again. Sorry.
+
+2005-12-08  Benoît Dejean  <benoit@placenet.org>
+
+	* doc/reference.texi:
+	* include/glibtop/limits.h:
+
+	Dropped unused file and updated documentation.
+
+2005-12-07  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+
+	Bumped version number.
+
+2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* configure.in: Added 'th' (Thai) to ALL_LINGUAS.
+
+2005-11-29  Benoît Dejean  <benoit@placenet.org>
+
+	* NEWS:
+	* configure.in:
+
+	Released 2.12.2.
+	No 2.12.1.
+
+2005-11-17  Timur Jamakeev  <timurj@cvs.gnome.org>
+
+	* configure.in: Added 'ky' (Kirghiz) to ALL_LINGUAS.
+
+2005-10-30  Benoît Dejean  <benoit@placenet.org>
+
+	* configure.in:
+	* include/glibtop/glibtop-backend-info.h:
+	* include/glibtop/glibtop-backend.h:
+	* include/glibtop/glibtop-client.h:
+	* lib/glibtop-backend-info.c:
+	* lib/glibtop-backend.c:
+	* lib/glibtop-client-private.h:
+	* lib/glibtop-client.c:
+	* lib/test-backends.c:
+	* sysdeps/common/backend.c:
+	* sysdeps/common/libgtop-common.backend:
+
+	Dropped many dead files.
+	Bumped release number.
+	I guess this closes #320250.
+
+2005-10-28  Erdal Ronahi  <erdal.ronahi@gmail.com>
+
+	* configure.in: Added ku (Kurdish) to ALL_LINGUAS
+
 2005-09-04  Benoît Dejean  <benoit@placenet.org>

 	* NEWS:
--- a/2
+++ b/2
@@ -1,3 +1,3 @@
 Email: martin@home-of-linux.org
 Email: dave@srce.hr
-Benoît Dejean (tazforever@dlfp.org)
+Current maintainer : Benoît Dejean (benoit@placenet.org)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,11 @@

-SUBDIRS = po misc include sysdeps lib src examples doc
+if EXAMPLES
+EXAMPLES_DIR = examples
+else
+EXAMPLES_DIR = 
+endif
+
+SUBDIRS = po misc include sysdeps lib src $(EXAMPLES_DIR) doc

 libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
 libgtopincludedir = $(includedir)/libgtop-2.0
@@ -7,7 +13,15 @@ libgtopincludedir = $(includedir)/libgtop-2.0
 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
 	 features.def libgtopconfig.h.in \
 	libgtop-sysdeps.m4 README \
-	 libgtop-2.0.pc.in acinclude.m4
+	 libgtop-2.0.pc.in acinclude.m4 \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in
+
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-merge \
+	intltool-update

 dist-hook:
 	cp libgtop.spec $(distdir)
@@ -18,3 +32,4 @@ pkgconfig_DATA = libgtop-2.0.pc
 libgtop-features.def: features.def
 	@LN_S@ $< $@

+DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
--- a/65
+++ b/65
@@ -1,3 +1,68 @@
+December 3, 2006: Overview of changes in 2.14.5
+===============================================
+* Added kfreebsd support (Petr Salinger <Petr.Salinger@seznam.cz>).
+* Added solaris glibtop_get_proc_open_files (Henry Zhang <hua.zhang@sun.com>).
+* Migrated to gtk-doc (Germán Poó-Caamaño <gpoo@ubiobio.cl>).
+* glibtop_get_mountlist can now ignore nsfd FS. 
+
+September 16, 2006: Overview of changes in 2.14.4
+=================================================
+* Fixed linux maps/smaps parsing on 64bit kernel.
+
+September 5, 2006: Overview of changes in 2.14.3
+================================================
+* Fixed build with --as-needed.
+* Added missing G_BEGIN_DECLS/G_END_DECLS.
+
+July 27, 2006: Overview of changes in 2.14.2
+============================================
+* Updated solaris support (hua.zhang@sun.com)
+* Small linux updates and improvments.
+
+April 10, 2006: Overview of changes in 2.14.1
+=============================================
+* Updated translations.
+* Fixed NetBSD port (Julio M. Merino Vidal  <jmmv@NetBSD.org>).
+* Fixed some warnings.
+
+Mars 13, 2006: Overview of changes in 2.14.0
+============================================
+* Updated translations.
+
+February 27, 2006: Overview of changes in 2.13.92
+=================================================
+* Fixed proc_state documentation.
+* Updated mountlist ignore list.
+
+January 23, 2006: Overview of changes in 2.13.3
+===============================================
+* linux:
+	- fixe get_procmap for linux < 2.6.14.
+
+January 2, 2006: Overview of changes in 2.13.2
+==============================================
+* Fixed libtool versioning (James Henstridge)
+
+December 15, 2005: Overview of changes in 2.13.1
+================================================
+* linux:
+    - fixed proclist
+    - implemented server->real_ncpu
+
+December 13, 2005: Overview of changes in 2.13.0
+================================================
+* Requires automake-1.9 (James Henstridge)
+* Supports up to 32 CPU
+* Supports Linux smaps
+* linux: fixed SMP detection
+
+This release is not ABI compatible with previous releases. Sorry.
+
+November 29, 2005: Overview of changes from 2.12.0 to 2.12.1
+============================================================
+* Dropped dead files
+* linux: 1-line cleanup.
+
 September 4, 2005: Overview of changes from 2.11.92 to 2.12.0
 =============================================================
 * Updated translations.
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,168 +0,0 @@
-
-/* Define if gethostname () must be declared. */
-#undef NEED_DECLARATION_GETHOSTNAME
-
-/* Define if setreuid () must be declared. */
-#undef NEED_DECLARATION_SETREUID
-
-/* Define if setregid () must be declared. */
-#undef NEED_DECLARATION_SETREGID
-
-/* Define if getpagesize () must be declared. */
-#undef NEED_DECLARATION_GETPAGESIZE
-
-/* Define if program_invocation_name must be declared. */
-#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME
-
-@TOP@
-
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef GETTEXT_PACKAGE
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_STRUCT_OSOCKADDR
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_LIBSM
-#undef HAVE_LIBINTL_H
-#undef HAVE_GTK_SIGNAL_HANDLER_PENDING
-
-/* Do not remove this comments and the empty lines; they are needed */
-#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
-/* Define if you have the Andrew File System.  */
-#undef AFS
-
-/* Define one of the following to indicate how a program can
-   get a list of mounted filesystems.  */
-
-/* Define if there is no specific function for reading the list of
-   mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]  */
-#undef MOUNTED_FREAD
-
-/* Define if (like SVR2) there is no specific function for reading the
-   list of mounted filesystems, and your system has these header files:
-   <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]  */
-#undef MOUNTED_FREAD_FSTYP
-
-/* Define if there is a function named getfsstat for reading the list
-   of mounted filesystems.  [DEC Alpha running OSF/1]  */
-#undef MOUNTED_GETFSSTAT
-
-/* Define if there is a function named getmnt for reading the list of
-   mounted filesystems.  [Ultrix]  */
-#undef MOUNTED_GETMNT
-
-/* Define if there is a function named getmntent for reading the list
-   of mounted filesystems, and that function takes a single argument.
-   [4.3BSD, SunOS, HP-UX, Dynix, Irix]  */
-#undef MOUNTED_GETMNTENT1
-
-/* Define if there is a function named getmntent for reading the list of
-   mounted filesystems, and that function takes two arguments.  [SVR4]  */
-#undef MOUNTED_GETMNTENT2
-
-/* Define if there is a function named getmntinfo for reading the list
-   of mounted filesystems.  [4.4BSD]  */
-#undef MOUNTED_GETMNTINFO
-
-/* Define if there is a function named listmntent that can be used to
-   list all mounted filesystems. [UNICOS] */
-#undef MOUNTED_LISTMNTENT
-
-/* Define if there is a function named mntctl that can be used to read
-   the list of mounted filesystems, and there is a system header file
-   that declares `struct vmount.'  [AIX]  */
-#undef MOUNTED_VMOUNT
-
-/* Define one of the following to indicate how a program can obtain
-   filesystems usage information.  */
-
-/*  Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]  */
-#undef STAT_STATFS3_OSF1
-
-/* Define if there is no specific function for reading filesystems usage
-   information and you have the <sys/filsys.h> header file.  [SVR2]  */
-#undef STAT_READ_FILSYS
-
-/* Define if statfs takes 2 args and struct statfs has a field named f_bsize.
-   [4.3BSD, SunOS 4, HP-UX, AIX PS/2]  */
-#undef STAT_STATFS2_BSIZE
-
-/* Define if statfs takes 2 args and struct statfs has a field named f_fsize.
-   [4.4BSD, NetBSD]  */
-#undef STAT_STATFS2_FSIZE
-
-/* Define if statfs takes 2 args and the second argument has
-   type struct fs_data.  [Ultrix]  */
-#undef STAT_STATFS2_FS_DATA
-
-/* Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]  */
-#undef STAT_STATFS4
-
-/* Define if there is a function named statvfs.  [SVR4]  */
-#undef STAT_STATVFS
-
-/* Define if the block counts reported by statfs may be truncated to 2GB
-   and the correct values may be stored in the f_spare array.
-   [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
-   SunOS 4.1.1 seems not to be affected.]  */
-#undef STATFS_TRUNCATES_BLOCK_COUNTS
-
-
-/* to fix a bug in autoheader on DEC OSF1. */
-#undef HAVE_PROGRAM_INVOCATION_NAME
-
-#undef HAVE_SOCKETS
-#undef HAVE_SOCKADDR_SUN_LEN
-
-#undef HAVE_LIBJPEG
-#undef HAVE_LIBGIF
-#undef HAVE_LIBTIFF
-#undef HAVE_LIBZ
-#undef HAVE_LIBPNG
-#undef HAVE_GMP2_INCLUDE_DIR
-#undef HAVE_GUILE
-
-#undef ssize_t
-#undef guint64
-#undef int64_t
-
-#undef HAVE_GLIBTOP_MACHINE_H
-
-#undef GLIBTOP_GUILE
-#undef GLIBTOP_GUILE_NAMES
-#undef GLIBTOP_EXAMPLES
-#undef GLIBTOP_INODEDB
-
-#undef NEED_LIBGTOP
-
-#undef HAVE_LIBGTOP_SMP
-
-#undef HAVE_XAUTH
-
-/* Define if your have the I4B package. */
-#undef HAVE_I4B
-#undef HAVE_I4B_ACCT
-
-/* Define to enable debugging. */
-#undef LIBGTOP_ENABLE_DEBUG
-#undef LIBGTOP_FATAL_WARNINGS
-
-/* Same as LINUX_VERSION_CODE either from <linux/version.h> or from
- * the running kernel (if we don't have configured kernel sources).
- */
-#undef GLIBTOP_LINUX_VERSION_CODE
-
-/* Solaris release code (eg. 251 for Solaris 2.5.1). */
-#undef GLIBTOP_SOLARIS_RELEASE
-
-/* Define if you want to use LibGTop without GNOME. */
-#undef WITHOUT_GNOME
-
-/* Define if you have the <procfs.h> header file */
-#undef HAVE_PROCFS_H
-
-/* Define if you have the <sys/procfs.h> header file */
-#undef HAVE_SYS_PROCFS_H
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -30,7 +30,7 @@ changequote([,]), [#include <sys/types.h>
 ], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
 AC_MSG_RESULT($ac_cv_type_$1)
 if test $ac_cv_type_$1 = no; then
-  AC_DEFINE($1, $2)
+  AC_DEFINE($1, $2, [Define to $2 if <sys/types.h> does not define.])
 fi
 ])

@@ -72,7 +72,7 @@ if eval "test \"`echo '$gcc_cv_decl_needed_'$1`\" = yes"; then
  AC_MSG_RESULT(yes)
  gcc_need_declarations="$gcc_need_declarations $1"
  gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  AC_DEFINE_UNQUOTED($gcc_tr_decl)
+  AC_DEFINE_UNQUOTED($gcc_tr_decl, 1, [Define if $1 () must be declared.])
 else
  AC_MSG_RESULT(no)
 fi
@@ -157,7 +157,8 @@ yes
 AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
 if test $fu_cv_sys_mounted_cray_listmntent = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT)
+AC_DEFINE(MOUNTED_LISTMNTENT, 1,
+          [Define if there is a function named listmntent that can be used to list all mounted filesystems. [UNICOS]])
 fi
 fi

@@ -176,7 +177,8 @@ AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
 if test $fu_cv_sys_mounted_getmntent1 = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1)
+AC_DEFINE(MOUNTED_GETMNTENT1, 1,
+          [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes a single argument. [4.3BSD, SunOS, HP-UX, Dynix, Irix]])
 fi
 fi

@@ -190,7 +192,8 @@ fu_cv_sys_mounted_getmntent2=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
 if test $fu_cv_sys_mounted_getmntent2 = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2)
+AC_DEFINE(MOUNTED_GETMNTENT2, 1,
+          [Define if there is a function named getmntent for reading the list of mounted filesystems, and that function takes two arguments.  [SVR4]])
 fi
 fi

@@ -215,7 +218,8 @@ fu_cv_sys_mounted_getsstat=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
 if test $fu_cv_sys_mounted_getsstat = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT)
+AC_DEFINE(MOUNTED_GETFSSTAT, 1,
+          [Define if there is a function named getfsstat for reading the list of mounted filesystems.  [DEC Alpha running OSF/1]])
 fi
 fi

@@ -229,7 +233,8 @@ fu_cv_sys_mounted_vmount=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
 if test $fu_cv_sys_mounted_vmount = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT)
+AC_DEFINE(MOUNTED_VMOUNT, 1,
+          [Define if there is a function named mntctl that can be used to read the list of mounted filesystems, and there is a system header file that declares `struct vmount.'  [AIX]])
 fi
 fi

@@ -246,7 +251,8 @@ fu_cv_sys_mounted_fread_fstyp=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
 if test $fu_cv_sys_mounted_fread_fstyp = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP)
+AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
+          [Define if (like SVR2) there is no specific function for reading the list of mounted filesystems, and your system has these header files: <sys/fstyp.h> and <sys/statfs.h>.  [SVR3]])
 fi
 fi

@@ -267,7 +273,8 @@ test -n "$ok" \
 AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
 if test $fu_cv_sys_mounted_getmntinfo = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO)
+AC_DEFINE(MOUNTED_GETMNTINFO, 1,
+          [Define if there is a function named getmntinfo for reading the list of mounted filesystems.  [4.4BSD]])
 fi
 fi

@@ -285,7 +292,8 @@ fu_cv_sys_mounted_getmnt=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
 if test $fu_cv_sys_mounted_getmnt = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT)
+AC_DEFINE(MOUNTED_GETMNT, 1,
+          [Define if there is a function named getmnt for reading the list of mounted filesystems.  [Ultrix]])
 fi
 fi

@@ -299,7 +307,8 @@ fu_cv_sys_mounted_fread=no)])
 AC_MSG_RESULT($fu_cv_sys_mounted_fread)
 if test $fu_cv_sys_mounted_fread = yes; then
 list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD)
+AC_DEFINE(MOUNTED_FREAD, 1,
+          [Define if there is no specific function for reading the list of mounted filesystems.  fread will be used to read /etc/mnttab.  [SVR2]])
 fi
 fi

@@ -328,7 +337,8 @@ fu_cv_sys_stat_statvfs=yes,
 fu_cv_sys_stat_statvfs=no)])
 if test $fu_cv_sys_stat_statvfs = yes; then
 space=yes
-AC_DEFINE(STAT_STATVFS)
+AC_DEFINE(STAT_STATVFS, 1,
+          [Define if there is a function named statvfs.  [SVR4]])
 fi
 fi

@@ -352,7 +362,8 @@ fu_cv_sys_stat_statfs3_osf1=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
 if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS3_OSF1)
+AC_DEFINE(STAT_STATFS3_OSF1, 1,
+          [Define if  statfs takes 3 args.  [DEC Alpha running OSF/1]])
 fi
 fi

@@ -383,7 +394,8 @@ fu_cv_sys_stat_statfs2_bsize=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
 if test $fu_cv_sys_stat_statfs2_bsize = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE)
+AC_DEFINE(STAT_STATFS2_BSIZE, 1,
+          [Define if statfs takes 2 args and struct statfs has a field named f_bsize. [4.3BSD, SunOS 4, HP-UX, AIX PS/2]])
 fi
 fi

@@ -404,7 +416,8 @@ fu_cv_sys_stat_statfs4=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
 if test $fu_cv_sys_stat_statfs4 = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS4)
+AC_DEFINE(STAT_STATFS4, 1,
+          [Define if statfs takes 4 args.  [SVR3, Dynix, Irix, Dolphin]])
 fi
 fi

@@ -432,7 +445,8 @@ fu_cv_sys_stat_statfs2_fsize=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
 if test $fu_cv_sys_stat_statfs2_fsize = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE)
+AC_DEFINE(STAT_STATFS2_FSIZE, 1,
+          [Define if statfs takes 2 args and struct statfs has a field named f_fsize. [4.4BSD, NetBSD]])
 fi
 fi

@@ -463,14 +477,17 @@ fu_cv_sys_stat_fs_data=no)])
 AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
 if test $fu_cv_sys_stat_fs_data = yes; then
 space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA)
+AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
+          [Define if statfs takes 2 args and the second argument has type struct fs_data.  [Ultrix]])
 fi
 fi

 if test $space = no; then
 # SVR2
 AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS) space=yes)
+AC_DEFINE(STAT_READ_FILSYS, 1,
+          [Define if there is no specific function for reading filesystems usage information and you have the <sys/filsys.h> header file.  [SVR2]])
+space=yes)
 fi

 if test -n "$list_mounted_fs" && test $space != no; then
@@ -495,260 +512,14 @@ fu_cv_sys_truncating_statfs=yes,
 fu_cv_sys_truncating_statfs=no,
 )])
 if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
+          [Define if the block counts reported by statfs may be truncated to 2GB and the correct values may be stored in the f_spare array. [SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. SunOS 4.1.1 seems not to be affected.]])
 fi
 AC_MSG_RESULT($fu_cv_sys_truncating_statfs)

 AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS)
+test -d /afs && AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.])
 ])


-dnl This file is intended for use both internally in libgtop and in every program
-dnl that wants to use it.
-dnl
-dnl It defines the following variables:
-dnl
-dnl * 'libgtop_sysdeps_dir'    - sysdeps dir for libgtop.
-dnl * 'libgtop_use_machine_h'  - some of system dependend parts of libgtop provide
-dnl                              their own header file. In this case we need to
-dnl                              define 'HAVE_GLIBTOP_MACHINE_H'.
-dnl * 'libgtop_need_server'    - is the server really needed? Defines 'NEED_LIBGTOP'
-dnl                              if true; defines conditional 'NEED_LIBGTOP'.
-
-AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
-	AC_REQUIRE([AC_CANONICAL_HOST])
-
-	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_use_machine_h)
-	AC_SUBST(libgtop_need_server)
-
-	AC_ARG_WITH(libgtop-examples,
-	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
-	build_examples="$withval"], [build_examples=no])
-
-	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)
-
-	AC_ARG_ENABLE(hacker-mode,
-	[  --enable-hacker-mode    Enable building of unstable sysdeps],
-	[hacker_mode="$enableval"], [hacker_mode=no])
-
-	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
-
-	if test x$hacker_mode = xyes ; then
-	  LIBGTOP_HACKER_TESTS
-	fi
-
-	AC_ARG_WITH(libgtop-smp,
-	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
-	libgtop_smp="$withval"],[libgtop_smp=auto])
-
-	if test $libgtop_smp = auto ; then
-	  AC_MSG_CHECKING(whether to enable SMP support)
-	  case "$host_os" in
-	  linux*)
-	    libgtop_smp=yes
-	    ;;
-	  aix*)
-	    libgtop_smp=yes
-	    ;;
-	  *)
-	    libgtop_smp=no
-	    ;;
-	  esac
-	  AC_MSG_RESULT($libgtop_smp)
-	fi
-
-	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP)
-	fi
-
-	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
-
-	AC_MSG_CHECKING(for libgtop sysdeps directory)
-
-	case "$host_os" in
-	linux*)
-	  libgtop_sysdeps_dir=linux
-	  libgtop_use_machine_h=no
-	  libgtop_have_sysinfo=yes
-	  libgtop_need_server=no
-	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
-	  libgtop_sysdeps_dir=freebsd
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-	solaris*)
-	  libgtop_sysdeps_dir=solaris
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server'
-	  ;;
-        aix*)
-	  libgtop_sysdeps_dir=aix
-	  libgtop_use_machine_h=yes
-	  libgtop_need_server=yes
-	  libgtop_have_sysinfo=yes
-	  libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2'
-          ;;
-	*)
-	  if test x$hacker_mode = xyes ; then
-	    case "$host_os" in
-	    sunos4*)
-	      #Please note that this port is obsolete and not working at
-	      #all. It is only useful for people who want to fix it ... :-)
-	      libgtop_sysdeps_dir=sun4
-	      libgtop_use_machine_h=yes
-	      libgtop_need_server=yes
-	      ;;
-	    osf*)
-	      libgtop_sysdeps_dir=osf1
-	      libgtop_use_machine_h=yes
-	      libgtop_need_server=yes
-	      ;;
-	    *)
-	      libgtop_sysdeps_dir=stub
-	      libgtop_use_machine_h=no
-	      libgtop_need_server=no
-	      ;;
-	    esac
-	  else
-	    libgtop_sysdeps_dir=stub
-	    libgtop_use_machine_h=no
-	    libgtop_need_server=no
-	  fi
-	  ;;
-	esac
-
-	test -z "$libgtop_postinstall" && libgtop_postinstall=:
-
-	AC_MSG_RESULT($libgtop_sysdeps_dir)
-
-	AC_SUBST(libgtop_sysdeps_dir)
-	AC_SUBST(libgtop_postinstall)
-	AC_SUBST(libgtop_have_sysinfo)
-
-	case "$host_os" in
-	*bsd*)
-	  AC_CHECK_HEADERS(net/if_var.h)
-	  AC_MSG_CHECKING([for I4B])
-	  AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <net/if_sppp.h>
-#else
-#include <i4b/sppp/if_sppp.h>
-#endif
-],[
-	size_t size = sizeof (struct sppp);
-], have_i4b=yes, have_i4b=no)
-	  AC_MSG_RESULT($have_i4b)
-	  if test x$have_i4b = xyes; then
-	    AC_DEFINE(HAVE_I4B)
-	    AC_MSG_CHECKING([for I4B accounting])
-	    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-
-#ifdef HAVE_NET_IF_VAR_H
-#include <net/if_var.h>
-#endif
-
-#include <net/netisr.h>
-#include <net/route.h>
-
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <net/if_sppp.h>
-#else
-#include <i4b/sppp/if_sppp.h>
-#endif
-
-#include <machine/i4b_acct.h>
-],[
-	size_t size = sizeof (struct i4bisppp_softc);
-], have_i4b_acct=yes, have_i4b_acct=no)
-	    AC_MSG_RESULT($have_i4b_acct)
-	    if test x$have_i4b_acct = xyes ; then
-	      AC_DEFINE(HAVE_I4B_ACCT)
-	    else
-	      AC_WARN([
-*** I4B accounting disabled - you won't get any PPP statistics.
-*** Read "misc/i4b_acct.txt" in the LibGTop source directory
-*** to see how to enable it.])
-	    fi
-	  fi
-	  ;;
-	linux*)
-	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
-	    sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-	  os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q"
-
-	  AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes,
-	    have_linux_version_h=no)
-
-	  if test x$have_linux_version_h = xyes ; then
-	    version_code=`cat /usr/include/linux/version.h | \
-	      grep \#define | grep LINUX_VERSION_CODE`
-	    os_version_code=`echo $version_code | \
-	      sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'`
-	  else
-	    os_version_code=`echo "$os_version_expr" | dc`
-	  fi
-
-	  AC_MSG_CHECKING(for Linux kernel version code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
-	solaris*)
-	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
-	  test -z "$os_micro_version" && os_micro_version=0
-	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
-	  os_version_code=`echo "$os_version_expr" | dc`
-
-	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
-	  AC_MSG_RESULT($os_version_code)
-	  ;;
-	esac
-
-	AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir)
-	AC_MSG_RESULT($libgtop_use_machine_h)
-
-	AC_MSG_CHECKING(whether we need libgtop)
-	AC_MSG_RESULT($libgtop_need_server)
-
-	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP)
-	fi
-
-	if test x$libgtop_use_machine_h = xyes ; then
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
-	fi
-
-	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
-])
-
-  
+m4_include([libgtop-sysdeps.m4])
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,4 +18,5 @@ which gnome-autogen.sh || {
    echo "You need to install gnome-common from the GNOME CVS"
    exit 1
 }
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9
+. gnome-autogen.sh
--- a/configure.in
+++ b/configure.in
@@ -2,59 +2,50 @@ dnl
 dnl Configure script for the Gnome library
 dnl

-AC_INIT(copyright.txt)
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_SYSTEM
-
-LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=12
-LIBGTOP_MICRO_VERSION=0
-LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
-AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
+m4_define([libgtop_major_version], [2])
+m4_define([libgtop_minor_version], [14])
+m4_define([libgtop_micro_version], [5])
+m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])

 dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=6
+m4_define([libgtop_current], [7])

 dnl  increment any time the source changes; set to
 dnl  0 if you increment CURRENT
-LIBGTOP_REVISION=0
+m4_define([libgtop_revision], [0])

 dnl  increment if any interfaces have been added; set to 0
 dnl  if any interfaces have been removed. removal has
 dnl  precedence over adding, so set to 0 if both happened.
-LIBGTOP_AGE=1
-
-# you can set this to `-snap' for instance to create
-# a `libgtop-1.x.y-snap.tar.gz' tarball.
-LIBGTOP_VERSION_SUFFIX=
+m4_define([libgtop_age], [0])

 # Increase each time you change the client/server protocol.
-LIBGTOP_SERVER_VERSION=5
+m4_define([libgtop_server_version], [5])

 # Version code calculation
-LIBGTOP_VERSION_CODE=`expr $LIBGTOP_MAJOR_VERSION \* 1000000 + $LIBGTOP_MINOR_VERSION \* 1000 + $LIBGTOP_MICRO_VERSION`
+m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)])

-AC_SUBST(LIBGTOP_MAJOR_VERSION)
-AC_SUBST(LIBGTOP_MINOR_VERSION)
-AC_SUBST(LIBGTOP_MICRO_VERSION)
-AC_SUBST(LIBGTOP_INTERFACE_AGE)
-AC_SUBST(LIBGTOP_BINARY_AGE)
-AC_SUBST(LIBGTOP_SERVER_VERSION)
-AC_SUBST(LIBGTOP_VERSION)
-AC_SUBST(LIBGTOP_VERSION_CODE)
-AC_SUBST(LIBGTOP_VERSION_SUFFIX)
+AC_PREREQ(2.59)
+AC_INIT([libgtop], [libgtop_version],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop])
+AC_CONFIG_SRCDIR(copyright.txt)
+AC_CONFIG_HEADERS(config.h)
+
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE
+AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}])
+
+AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version])
+AC_SUBST(LIBGTOP_MINOR_VERSION, [libgtop_minor_version])
+AC_SUBST(LIBGTOP_MICRO_VERSION, [libgtop_micro_version])
+AC_SUBST(LIBGTOP_SERVER_VERSION, [libgtop_server_version])
+AC_SUBST(LIBGTOP_VERSION, [libgtop_version])
+AC_SUBST(LIBGTOP_VERSION_CODE, [libgtop_version_code])

 # libtool versioning
-LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
-LT_CURRENT=$LIBGTOP_CURRENT
-LT_REVISION=$LIBGTOP_REVISION
-LT_AGE=$LIBGTOP_AGE
-LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
-AC_SUBST(LT_VERSION_INFO)
-AC_SUBST(LT_RELEASE)
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-AC_SUBST(LT_AGE)
+AC_SUBST(LT_VERSION_INFO,
+         ["-version-info libgtop_current:libgtop_revision:libgtop_age"])

 ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ."

@@ -97,8 +88,10 @@ GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES

 AC_ARG_WITH(libgtop-inodedb,
-[  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
-[build_inodedb="$withval"], [build_inodedb=no])
+            AS_HELP_STRING([--with-libgtop-inodedb],
+                           [Build the inodedb stuff @<:@default=no@:>@]),
+            [build_inodedb="$withval"],
+            [build_inodedb=no])

 LIBGTOP_EXTRA_LIBS=

@@ -109,7 +102,8 @@ fi
 AM_CONDITIONAL(INODEDB, test x$build_inodedb = xyes)

 if test x$build_inodedb = xyes ; then
-  AC_DEFINE(GLIBTOP_INODEDB)
+  AC_DEFINE(GLIBTOP_INODEDB, 1,
+            [Define if the libgtop inodedb should be built])
 fi

 GLIB_REQUIRED=2.6.0
@@ -170,8 +164,9 @@ if test x$HAVE_ISDN_H = xyes ; then
 fi

 dnl AIX
-AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
-AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))
+AC_CHECK_LIB(perfstat, vmgetinfo,
+    AC_DEFINE(HAVE_VMGETINFO, 1,
+        [Define to 1 if you have the 'vmgetinfo' function in libperfstat]))

 dnl Solaris
 case "$host_os" in
@@ -182,6 +177,8 @@ case "$host_os" in


    dnl Some versions of Solaris require -lelf for -lkvm
+    case $host_os in
+    solaris[[8-9]] | solaris2.[[0-9]].*)
    AC_CHECK_LIB(kvm, kvm_open,[
      LIBS="-lkvm $LIBS"
    ],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf)
@@ -200,6 +197,8 @@ case "$host_os" in
       fi
    ])
     ;;
+     esac
+     ;;
 esac

 dnl For DEC OSF1
@@ -220,7 +219,7 @@ CFLAGS=$saved_CFLAGS
 AC_CHECK_FUNC(socket,
 [AC_CHECK_HEADER(netinet/in.h,
   [AC_CHECK_HEADER(arpa/inet.h, [
-  AC_DEFINE(HAVE_SOCKETS)
+  AC_DEFINE(HAVE_SOCKETS, 1, [Define if BSD sockets are supported])
      AC_MSG_CHECKING("for sun_len member in struct sockaddr_un")
      AC_TRY_LINK([
 #include <sys/types.h>
@@ -228,7 +227,7 @@ AC_CHECK_FUNC(socket,
 #include <sys/un.h>
      ],
      [static struct sockaddr_un x; x.sun_len = 1;],
-      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN)],
+      [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SOCKADDR_SUN_LEN, 1, [Define if struct sockaddr_un has a sun_len member])],
      [AC_MSG_RESULT(no)])])])])

 dnl Checks for library functions.
@@ -238,13 +237,15 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mi mk ml mn ms nb ne nl nn no or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tr uk vi xh zh_CN zh_TW"
+IT_PROG_INTLTOOL([0.35.0])

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+                   [Define to the gettext package used by the library])

 AM_GLIB_GNU_GETTEXT
+GLIB_DEFINE_LOCALEDIR([GTOPLOCALEDIR])

 AC_PATH_XTRA

@@ -271,7 +272,7 @@ test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no)
 test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no, $X_LIBS) }
 test -z "$with_xauth" && with_xauth=yes
 if test "$with_xauth" = "yes"; then
-  AC_DEFINE(HAVE_XAUTH)
+  AC_DEFINE(HAVE_XAUTH, 1, [Define if Xauth is supported])
  XE_SPACE(libs_xauth, $X_LIBS -lXau)
 fi
 CPPFLAGS="$saved_CPPFLAGS"
@@ -281,8 +282,15 @@ dnl For diskusage stuff
 GNOME_FILEUTILS_CHECKS

 dnl Debugging
-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
-AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)
+AC_ARG_ENABLE(debug,
+              AS_HELP_STRING([--enable-debug],
+                             [Turn on debugging @<:@default=no@:>@]),
+              AC_DEFINE(LIBGTOP_ENABLE_DEBUG, 1, [Define to enable debugging]))
+AC_ARG_ENABLE(fatal-warnings,
+              AS_HELP_STRING([--enable-fatal-warnings],
+                             [Make all warnings fatal @<:@debug=no@:>@]),
+              AC_DEFINE(LIBGTOP_FATAL_WARNINGS, 1,
+                        [Define to enable fatal warnings]))

 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
@@ -306,8 +314,14 @@ fi

 LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"

-LIBGTOP_BINDIR='$(bindir)'
-LIBGTOP_SERVER='$(bindir)/libgtop_server2'
+libgtop_save_prefix="$prefix"
+libgtop_save_exec_prefix="$exec_prefix"
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+LIBGTOP_BINDIR=`eval echo "${bindir}"`
+LIBGTOP_SERVER=`eval echo "${bindir}/libgtop_server2"`
+prefix="$libgtop_save_prefix"
+exec_prefix="$libgtop_save_exec_prefix"

 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)
@@ -318,7 +332,7 @@ else
  LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $libs_xauth"
 fi

-LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
+LIBGTOP_EXTRA_LIBS="$GLIB_LIBS $LIBGTOP_EXTRA_LIBS"

 LIBGTOP_LIBS="$LIBGTOP_LIBS"

@@ -336,11 +350,27 @@ if test "$GCC" = "yes" ; then
 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 	-Wnested-externs -Wpointer-arith \
 	-Wcast-align -Wsign-compare \
-	-fno-strict-aliasing \
 	$CFLAGS"
 fi

-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $X_CFLAGS"
+
+# Add various defines to the config.h file ...
+AH_VERBATIM([_GNU_SOURCE],
+[/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif])
+AC_DEFINE([_IN_LIBGTOP], 1,
+          [Note that we are building libgtop rather than using it])
+AC_DEFINE([LIBGTOP_VERSION], ["libgtop_version"],
+          [The libgtop version number])
+AC_DEFINE([LIBGTOP_SERVER_VERSION], ["libgtop_server_version"],
+          [The libgtop server version])
+AC_DEFINE([LIBGTOP_VERSION_CODE], [libgtop_version_code],
+          [The libgtop version number as an integer])
+AC_DEFINE_UNQUOTED([LIBGTOP_SERVER], ["$LIBGTOP_SERVER"],
+                   [The path to the libgtop server])

 AC_SUBST(INCLUDES)

@@ -361,7 +391,9 @@ fi
 AC_SUBST(sysdeps_suid_lib)
 AC_SUBST(server_programs)

-AC_OUTPUT([
+GTK_DOC_CHECK(1.4)
+
+AC_CONFIG_FILES([
 Makefile
 libgtop.spec
 po/Makefile.in
@@ -384,6 +416,10 @@ src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
+doc/reference/Makefile
+doc/reference/version.xml
 libgtop-2.0.pc
 libgtopconfig.h
 ])
+
+AC_OUTPUT
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-21  Benoît Dejean  <benoit@placenet.org>
+
+	* reference.texi: Fixed glibtop_get_proc_state doc.
+	Patch by Emil Nowak <emil5@go2.pl>.
+
 2005-01-03  Benoît Dejean  <TazForEver@dlfp.org>

 	* reference.texi: Updated.
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,38 +1,8 @@
+SUBDIRS = reference
+
 info_TEXINFOS		= libgtop2.texi

 libgtop2_TEXINFOS	= libgtop2.texi about.texi reference.texi \
-			  auto-macros.texi version.texi main.texi \
-			  white-paper.texi
+			  version.texi main.texi white-paper.texi

-MAKEINFO		= @MAKEINFO@ -I @libgtop_top_builddir@/doc
-
-EXTRA_DIST		= auto-macros.texi.in
-
-auto-macros.texi: auto-macros.texi.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \
-	  -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \
-	  -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \
-	  -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \
-	  -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \
-	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
-	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
-	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
-	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \
-	  -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \
-	  -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \
-	  -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \
-	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
-	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
-	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
-	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
-	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
-	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
-	if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \
-	  echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \
-	else \
-	  echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \
-	fi
-	mv auto-macros.tmp auto-macros.texi
+AM_MAKEINFOFLAGS	= -I $(libgtop_top_builddir)/doc
--- a/doc/auto-macros.texi.in
+++ b/doc/auto-macros.texi.in
@@ -1,12 +0,0 @@
-@c LibGTop major, minor and micro version.
-@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION%
-@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION%
-@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION%
-
-@c LibGTop version and numerical version code ("1.234.567" -> 1234567).
-@set LIBGTOP_VERSION "%LIBGTOP_VERSION%"
-@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE%
-
-@c LibGTop server version, increased each time the protocol changes.
-@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION%
-
--- a/doc/libgtop2.texi
+++ b/doc/libgtop2.texi
@@ -5,7 +5,6 @@
@setchapternewpage odd
@c %**end of header

-@include auto-macros.texi
@include version.texi

@ifinfo
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -111,7 +111,7 @@ The @samp{xcpu_} values are for SMP systems - they are the same than
@code{total}, @code{user}, @code{nice}, @code{sys}, @code{idle},
@code{iowait}, @code{irq} and @code{softirq}
 except that they are arrays of @code{GLIBTOP_NCPU} (defined in
-@file{<glibtop/limits.h>}) elements and contain one value for each CPU
+@file{<glibtop/cpu.h>}) elements and contain one value for each CPU
 in the system.

@table @code
@@ -493,7 +493,7 @@ glibtop_get_proc_state_l (glibtop *server, glibtop_proc_state *buf,
@end cartouche
@end example

-Declaration of @code{glibtop_proc_state} in @file{<glibtop/proc_state.h>}:
+Declaration of @code{glibtop_proc_state} in @file{<glibtop/procstate.h>}:

@example
@cartouche
@@ -680,7 +680,7 @@ Standard unix nice level of process.
 Number of additional process groups.
@item groups
 Array of additional process groups@*
-(@code{GLIBTOP_MAX_GROUPS} is defined in @file{<glibtop/limits.h>}).
+(@code{GLIBTOP_MAX_GROUPS} is defined in @file{<glibtop/procuid.h>}).
@end table

@page
@@ -1484,13 +1484,7 @@ struct _glibtop_mountentry
@end cartouche
@end example

-@ifset LIBGTOP-1-1
-@code{GLIBTOP_MOUNTENTRY_LEN} is defined in @file{<glibtop/limits.h>}.
-@end ifset
-@ifclear LIBGTOP-1-1
-@code{GLIBTOP_MOUNTENTRY_LEN} is defined in @file{<glibtop.h>}
-(this was moved to @file{<glibtop/limits.h>} in LibGTop 1.1.0).
-@end ifclear
+@code{GLIBTOP_MOUNTENTRY_LEN} is defined in @file{<glibtop.h>}.

@table @code
@item devname
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -0,0 +1,59 @@
+AUTOMAKE_OPTIONS = 1.6
+## Process this file with automake to produce Makefile.in
+# The name of the module, e.g. 'glib'.
+DOC_MODULE=libgtop
+
+# The top-level SGML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
+
+# Extra options to pass to gtkdoc-scangobj. Not normally needed.
+# SCANGOBJ_OPTIONS=
+
+# Extra options to supply to gtkdoc-scan.
+# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
+SCAN_OPTIONS=
+
+# Extra options to supply to gtkdoc-mkdb.
+# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS=--sgml-mode --output-format=xml --source-dir=../../sysdeps/common
+
+# The directory containing the source code. Relative to $(srcdir).
+# gtk-doc will search all .c & .h files beneath here for inline comments
+# documenting the functions and macros.
+# e.g. DOC_SOURCE_DIR=../../../gtk
+DOC_SOURCE_DIR=../../include/glibtop
+
+# Used for dependencies. The docs will be rebuilt if any of these change.
+# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
+# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
+HFILE_GLOB=../../include/glibtop/*.h
+CFILE_GLOB=../../sysdeps/common/*.c
+
+# Header files to ignore when scanning.
+# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
+IGNORE_HFILES=error.h global.h gnuserv.h init_hooks.h write.h read.h read_data.h config.h libgtopconfig.h
+
+EXTRA_HFILES=../../glibtop.h
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
+# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
+content_files=version.xml
+
+# Images to copy into HTML directory.
+# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
+HTML_IMAGES=
+
+# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
+# Only needed if you are using gtkdoc-scangobj to dynamically query widget
+# signals and properties.
+# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
+# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
+INCLUDES=
+GTKDOC_LIBS=
+
+# This includes the standard gtk-doc make rules, copied by gtkdocize.
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+# e.g. EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in
--- a/doc/reference/libgtop-docs.xml
+++ b/doc/reference/libgtop-docs.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
+  <bookinfo>
+    <title>Libgtop Reference Manual</title>
+    <releaseinfo>for libgtop <xi:include href="version.xml"/></releaseinfo>
+    <authorgroup>
+      <author>
+	<firstname>Martin </firstname>
+	<surname>Baulig</surname>
+	<affiliation>
+	  <address>
+	    <email>martin@home-of-linux.org</email>
+	  </address>
+	</affiliation>
+      </author>
+      <author>
+	<firstname>Germ&#225;n</firstname>
+	<surname>Po&#243;-Caama&#241;o</surname>
+	<affiliation>
+	  <address>
+	    <email>gpoo@ubiobio.cl</email>
+	  </address>
+	</affiliation>
+      </author>
+    </authorgroup>
+
+    <legalnotice>
+      <para>Permission is granted to copy, distribute and/or modify
+      this document under the terms of the <citetitle>GNU Free
+      Documentation License</citetitle>, Version 1.1 or any later
+      version published by the Free Software Foundation with no
+      Invariant Sections, no Front-Cover Texts, and no Back-Cover
+      Texts. You may obtain a copy of the <citetitle>GNU Free
+      Documentation License</citetitle> from the Free Software
+      Foundation by visiting <ulink type="http"
+      url="http://www.fsf.org">their Web site</ulink> or by writing
+      to: Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.</para>
+
+      <para>Many of the names used by companies to distinguish their
+      products and services are claimed as trademarks. Where those
+      names appear in any GNOME documentation, and those trademarks
+      are made aware to the members of the GNOME Documentation
+      Project, the names have been printed in caps or initial
+      caps.</para>
+    </legalnotice>
+
+    <abstract>
+      <para>
+      LibGTop is a library to get system specific data such as CPU and 
+      Memory Usage and information about running Processes.</para>
+
+      <para>On Systems like Solaris or Digital Unix where you need special
+      privileges to get those data, it uses a setuid/setgid server to do 
+      so.</para>
+
+      <para>Even if LibGTop is a part of the GNOME desktop environment
+      (@uref{http://www.gnome.org}), the main interface of LibGTop is totally
+      independent from any particular desktop environment, so you can also
+      use it as a standalone library in any piece of GPLed software.</para>
+
+      <para>This manual documents the interfaces of the libgtop
+      library and has some short notes to help get you up to speed
+      with using the library.</para>
+    </abstract>
+  </bookinfo>
+
+  <!--FIXME: It is missing the rest of about.texi -->
+
+  <chapter id="libgtop-white-paper">
+    <title>White paper</title>
+
+    <sect1 id="libgtop-white-paper-introduction">
+      <title>Introduction</title>
+      <para>Many modern UNIX systems like Solaris, BSD or Digitial Unix 
+      only allow priviledged processes to read information like CPU and 
+      Memory Usage or information about running processes.</para>
+
+      <itemizedlist>
+      <listitem><para>
+      BSD, for instance, doesn't have any other way to get those data than reading
+      directly from @file{/dev/kmem} and you need to be in the @code{kmem} group to
+      be able to read this.</para></listitem>
+
+      <listitem><para>
+      Other systems, like Digital Unix, allow all users to get things like CPU and
+      Memory statistics, but only root may read information about any process other
+      than the current one (you may not even get information about your own processes
+      if you're not root).</para></listitem>
+
+      <listitem><para>
+      Linux has a very nice @file{/proc} filesystem, but reading and parsing
+      @file{/proc} is very slow and inefficient.</para></listitem>
+
+      <listitem><para>
+      Solaris is a bit better, but you still need to be in the @code{sys} group or
+      even root to get some data.</para></listitem>
+      </itemizedlist>
+
+      <para>
+      Because of this system utilities like @code{ps}, @code{uptime} or @code{top}
+      often are setgid kmem or setuid root. Usually, they're also very specific to
+      the system they're written for and not easily portable to other systems without
+      a lot of work.</para>
+
+      <para>
+      This, of cause, becomes a problem for graphical tools like @code{gtop} - making
+      a GTK+ program setgid or even setuid would be a security hole as big as you can
+      drive the entire X11 source code through. For the GNOME project, we also needed
+      some kind of library which provides all the required information in a portable
+      since there's more than just one single program that wants to use them - for
+      instance @code{gtop} and the @code{multiload}, @code{cpumemusage} and
+      @code{netload} panel applets.</para>
+
+    </sect1>
+
+    <sect1 id="libgtop-white-paper-overview">
+      <title>Overview</title>
+      <para>This section should give you a short overview on how LibGTop
+      was developed, which things needed to be considered and how it 
+      works.</para>
+
+      <sect2 id="libgtop-white-paper-overview-design">
+      <title>Interface Design: Things that need to be considered</title>
+      <para>
+At the very beginning, it was necessary to collect all the data the library part
+should provide and put them into some C structures. This was not that easiy as it
+might sound since LibGTop should be portable to any modern UNIX system with a common
+library part on all those systems, but the data that should be returned vary from
+system to system. For instance some systems support shared memory, but some others
+may not.</para>
+
+      <para>
+The header files where we define these C structures (which are system-independent) are
+shared between client and server. This way we can call the system dependent code
+directly where we do not need any special privileges to do so.</para>
+
+      <para>
+All of those structures contain a @code{flags} member which is interpreted as a bit
+mask and tells the caller of the library functions which of the fields in the returned
+structure are valid and which are not.</para>
+      </sect2>
+
+      <sect2 id="libgtop-white-paper-overview-server">
+      <title>Server Implementation: The LibGTop "server"</title>
+      <para>
+The LibGTop @dfn{server} is a setgid/setuid binary which contains all the system
+dependent code which needs special privileges. It is only build if it's required
+on the current system (for instance, the Linux kernel provides all the required
+data via its @file{/proc} filesystem so we do not need the server at all) and it
+only contains the @dfn{features} which need privileges.</para>
+
+      <para>
+Whenever we do not need any privileges to get all the data for some of the requested
+structures (here called @dfn{features}) the library calls the sysdeps code directly
+rather than using the server.</para>
+      </sect2>
+    </sect1>
+
+  </chapter>
+
+  <chapter id="libgtop-lib">
+    <title>Libgtop Library Reference</title>
+
+    <para>This section contains the API reference for libgtop.  All
+    the public interfaces are documented here.</para>
+
+    <xi:include href="xml/glibtop.xml"/>
+    <xi:include href="xml/close.xml"/>
+    <xi:include href="xml/command.xml"/>
+    <xi:include href="xml/glibtop-server.xml"/>
+    <xi:include href="xml/inodedb.xml"/>
+    <xi:include href="xml/netload.xml"/>
+    <xi:include href="xml/ppp.xml"/>
+    <xi:include href="xml/shm_limits.xml"/>
+    <xi:include href="xml/uptime.xml"/>
+    <xi:include href="xml/netlist.xml"/>
+    <xi:include href="xml/open.xml"/>
+    <xi:include href="xml/parameter.xml"/>
+    <xi:include href="xml/procargs.xml"/>
+    <xi:include href="xml/procmem.xml"/>
+    <xi:include href="xml/procopenfiles.xml"/>
+    <xi:include href="xml/procsegment.xml"/>
+    <xi:include href="xml/procsignal.xml"/>
+    <xi:include href="xml/sysdeps.xml"/>
+    <xi:include href="xml/procstate.xml"/>
+    <xi:include href="xml/procuid.xml"/>
+    <xi:include href="xml/proctime.xml"/>
+    <xi:include href="xml/signal.xml"/>
+    <xi:include href="xml/procmap.xml"/>
+    <xi:include href="xml/sysinfo.xml"/>
+    <xi:include href="xml/union.xml"/>
+    <xi:include href="xml/version.xml"/>
+    <xi:include href="xml/proclist.xml"/>
+    <xi:include href="xml/sem_limits.xml"/>
+    <xi:include href="xml/prockernel.xml"/>
+    <xi:include href="xml/fsusage.xml"/>
+    <xi:include href="xml/loadavg.xml"/>
+    <xi:include href="xml/mem.xml"/>
+    <xi:include href="xml/mountlist.xml"/>
+    <xi:include href="xml/msg_limits.xml"/>
+    <xi:include href="xml/cpu.xml"/>
+    <xi:include href="xml/swap.xml"/>
+  </chapter>
+</book>
--- a/doc/reference/libgtop-overrides.txt
+++ b/doc/reference/libgtop-overrides.txt
--- a/doc/reference/libgtop-sections.txt
+++ b/doc/reference/libgtop-sections.txt
@@ -0,0 +1,754 @@
+<INCLUDE>glibtop.h</INCLUDE>
+<SECTION>
+<FILE>glibtop</FILE>
+<TITLE>GlibTop</TITLE>
+GLIBTOP_MOUNTENTRY_LEN
+LIBGTOP_CHECK_VERSION
+glibtop
+glibtop_global_server
+glibtop_init
+glibtop_init_r
+glibtop_init_s
+glibtop_server_features
+</SECTION>
+
+<INCLUDE>glibtop/close.h</INCLUDE>
+<SECTION>
+<FILE>close</FILE>
+<TITLE>Close</TITLE>
+glibtop_close
+glibtop_close_r
+glibtop_close_s
+glibtop_close_p
+</SECTION>
+
+<INCLUDE>glibtop/command.h</INCLUDE>
+<SECTION>
+<FILE>command</FILE>
+<TITLE>Command</TITLE>
+GLIBTOP_CMND_QUIT
+GLIBTOP_CMND_SYSDEPS
+GLIBTOP_CMND_CPU
+GLIBTOP_CMND_MEM
+GLIBTOP_CMND_SWAP
+GLIBTOP_CMND_UPTIME
+GLIBTOP_CMND_LOADAVG
+GLIBTOP_CMND_SHM_LIMITS
+GLIBTOP_CMND_MSG_LIMITS
+GLIBTOP_CMND_SEM_LIMITS
+GLIBTOP_CMND_PROCLIST
+GLIBTOP_CMND_PROC_STATE
+GLIBTOP_CMND_PROC_UID
+GLIBTOP_CMND_PROC_MEM
+GLIBTOP_CMND_PROC_TIME
+GLIBTOP_CMND_PROC_SIGNAL
+GLIBTOP_CMND_PROC_KERNEL
+GLIBTOP_CMND_PROC_SEGMENT
+GLIBTOP_CMND_PROC_ARGS
+GLIBTOP_CMND_PROC_MAP
+GLIBTOP_CMND_MOUNTLIST
+GLIBTOP_CMND_FSUSAGE
+GLIBTOP_CMND_NETLOAD
+GLIBTOP_CMND_PPP
+GLIBTOP_CMND_NETLIST
+GLIBTOP_CMND_PROC_OPEN_FILES
+GLIBTOP_MAX_CMND
+glibtop_command
+glibtop_response
+glibtop_response_union
+glibtop_call
+glibtop_call_l
+glibtop_call_s
+</SECTION>
+
+<INCLUDE>glibtop/glibtop-server.h</INCLUDE>
+<SECTION>
+<FILE>glibtop-server</FILE>
+<TITLE>GlibTop Server</TITLE>
+glibtop_server
+glibtop_server_info
+glibtop_closure
+glibtop_server_new
+glibtop_server_ref
+glibtop_server_unref
+</SECTION>
+
+<INCLUDE>glibtop/inodedb.h</INCLUDE>
+<SECTION>
+<FILE>inodedb</FILE>
+<TITLE>Inode DB</TITLE>
+GLIBTOP_INODEDB_SYSTEM
+GLIBTOP_INODEDB_USER
+GLIBTOP_INODEDB_CACHE
+GLIBTOP_INODEDB_ALL
+glibtop_inodedb
+glibtop_inodedb_key
+glibtop_inodedb_open
+glibtop_inodedb_lookup
+glibtop_inodedb_close
+glibtop_inodedb_open_s
+glibtop_inodedb_lookup_s
+glibtop_inodedb_close_s
+</SECTION>
+
+<INCLUDE>glibtop/netload.h</INCLUDE>
+<SECTION>
+<FILE>netload</FILE>
+<TITLE>Net Load</TITLE>
+GLIBTOP_NETLOAD_IF_FLAGS
+GLIBTOP_NETLOAD_MTU
+GLIBTOP_NETLOAD_SUBNET
+GLIBTOP_NETLOAD_ADDRESS
+GLIBTOP_NETLOAD_PACKETS_IN
+GLIBTOP_NETLOAD_PACKETS_OUT
+GLIBTOP_NETLOAD_PACKETS_TOTAL
+GLIBTOP_NETLOAD_BYTES_IN
+GLIBTOP_NETLOAD_BYTES_OUT
+GLIBTOP_NETLOAD_BYTES_TOTAL
+GLIBTOP_NETLOAD_ERRORS_IN
+GLIBTOP_NETLOAD_ERRORS_OUT
+GLIBTOP_NETLOAD_ERRORS_TOTAL
+GLIBTOP_NETLOAD_COLLISIONS
+GLIBTOP_NETLOAD_ADDRESS6
+GLIBTOP_NETLOAD_PREFIX6
+GLIBTOP_NETLOAD_SCOPE6
+GLIBTOP_NETLOAD_HWADDRESS
+GLIBTOP_MAX_NETLOAD
+glibtop_netload
+glibtop_get_netload
+glibtop_get_netload_r
+glibtop_get_netload_l
+glibtop_init_netload_p
+glibtop_get_netload_p
+glibtop_init_netload_s
+glibtop_get_netload_s
+</SECTION>
+
+<INCLUDE>glibtop/ppp.h</INCLUDE>
+<SECTION>
+<FILE>ppp</FILE>
+<TITLE>PPP</TITLE>
+GLIBTOP_PPP_STATE
+GLIBTOP_PPP_BYTES_IN
+GLIBTOP_PPP_BYTES_OUT
+GLIBTOP_MAX_PPP
+glibtop_ppp
+glibtop_get_ppp
+glibtop_get_ppp_r
+glibtop_get_ppp_l
+glibtop_init_ppp_p
+glibtop_get_ppp_p
+glibtop_init_ppp_s
+glibtop_get_ppp_s
+</SECTION>
+
+<INCLUDE>glibtop/shm_limits.h</INCLUDE>
+<SECTION>
+<FILE>shm_limits</FILE>
+<TITLE>Shared Memory Limits</TITLE>
+GLIBTOP_IPC_SHMMAX
+GLIBTOP_IPC_SHMMIN
+GLIBTOP_IPC_SHMMNI
+GLIBTOP_IPC_SHMSEG
+GLIBTOP_IPC_SHMALL
+GLIBTOP_MAX_SHM_LIMITS
+glibtop_shm_limits
+glibtop_get_shm_limits
+glibtop_get_shm_limits_r
+glibtop_get_shm_limits_l
+glibtop_init_shm_limits_p
+glibtop_get_shm_limits_p
+glibtop_init_shm_limits_s
+glibtop_get_shm_limits_s
+</SECTION>
+
+<INCLUDE>glibtop/uptime.h</INCLUDE>
+<SECTION>
+<FILE>uptime</FILE>
+<TITLE>Uptime</TITLE>
+GLIBTOP_UPTIME_UPTIME
+GLIBTOP_UPTIME_IDLETIME
+GLIBTOP_UPTIME_BOOT_TIME
+GLIBTOP_MAX_UPTIME
+glibtop_uptime
+glibtop_get_uptime
+glibtop_get_uptime_r
+glibtop_get_uptime_l
+glibtop_init_uptime_p
+glibtop_get_uptime_p
+glibtop_init_uptime_s
+glibtop_get_uptime_s
+</SECTION>
+
+<INCLUDE>glibtop/netlist.h</INCLUDE>
+<SECTION>
+<FILE>netlist</FILE>
+<TITLE>Net List</TITLE>
+GLIBTOP_NETLIST_NUMBER
+GLIBTOP_MAX_NETLIST
+glibtop_netlist
+glibtop_get_netlist
+glibtop_get_netlist_r
+glibtop_get_netlist_l
+glibtop_init_netlist_p
+glibtop_get_netlist_p
+glibtop_init_netlist_s
+glibtop_get_netlist_s
+</SECTION>
+
+<INCLUDE>glibtop/open.h</INCLUDE>
+<SECTION>
+<FILE>open</FILE>
+GLIBTOP_INIT_NO_OPEN
+GLIBTOP_INIT_NO_INIT
+GLIBTOP_FEATURES_NO_SERVER
+GLIBTOP_FEATURES_EXCEPT
+GLIBTOP_METHOD_DIRECT
+GLIBTOP_METHOD_PIPE
+GLIBTOP_METHOD_INET
+GLIBTOP_METHOD_UNIX
+GLIBTOP_ERROR_METHOD_IGNORE
+GLIBTOP_ERROR_METHOD_WARN_ONCE
+GLIBTOP_ERROR_METHOD_WARN
+GLIBTOP_ERROR_METHOD_ABORT
+GLIBTOP_ERROR_METHOD_DEFAULT
+glibtop_open_l
+glibtop_init_p
+glibtop_open_p
+glibtop_open_s
+</SECTION>
+
+<INCLUDE>glibtop/parameter.h</INCLUDE>
+<SECTION>
+<FILE>parameter</FILE>
+GLIBTOP_PARAM_METHOD
+GLIBTOP_PARAM_FEATURES
+GLIBTOP_PARAM_COMMAND
+GLIBTOP_PARAM_HOST
+GLIBTOP_PARAM_PORT
+GLIBTOP_PARAM_ERROR_METHOD
+GLIBTOP_PARAM_REQUIRED
+glibtop_get_parameter
+glibtop_set_parameter
+glibtop_get_parameter_l
+glibtop_set_parameter_l
+</SECTION>
+
+<INCLUDE>glibtop/procargs.h</INCLUDE>
+<SECTION>
+<FILE>procargs</FILE>
+GLIBTOP_PROC_ARGS_SIZE
+GLIBTOP_MAX_PROC_ARGS
+glibtop_proc_args
+glibtop_get_proc_args_l
+glibtop_get_proc_args
+glibtop_get_proc_args_r
+glibtop_init_proc_args_p
+glibtop_get_proc_args_p
+glibtop_init_proc_args_s
+glibtop_get_proc_args_s
+glibtop_get_proc_argv_l
+glibtop_get_proc_argv
+</SECTION>
+
+<INCLUDE>glibtop/procmem.h</INCLUDE>
+<SECTION>
+<FILE>procmem</FILE>
+GLIBTOP_PROC_MEM_SIZE
+GLIBTOP_PROC_MEM_VSIZE
+GLIBTOP_PROC_MEM_RESIDENT
+GLIBTOP_PROC_MEM_SHARE
+GLIBTOP_PROC_MEM_RSS
+GLIBTOP_PROC_MEM_RSS_RLIM
+GLIBTOP_MAX_PROC_MEM
+glibtop_proc_mem
+glibtop_get_proc_mem
+glibtop_get_proc_mem_r
+glibtop_get_proc_mem_l
+glibtop_init_proc_mem_p
+glibtop_get_proc_mem_p
+glibtop_init_proc_mem_s
+glibtop_get_proc_mem_s
+</SECTION>
+
+<INCLUDE>glibtop/procopenfiles.h</INCLUDE>
+<SECTION>
+<FILE>procopenfiles</FILE>
+GLIBTOP_PROC_OPEN_FILES_NUMBER
+GLIBTOP_PROC_OPEN_FILES_TOTAL
+GLIBTOP_PROC_OPEN_FILES_SIZE
+GLIBTOP_MAX_PROC_OPEN_FILES
+GLIBTOP_FILE_ENTRY_FD
+GLIBTOP_FILE_ENTRY_NAME
+GLIBTOP_FILE_ENTRY_TYPE
+GLIBTOP_FILE_ENTRY_INETSOCKET_DST_HOST
+GLIBTOP_FILE_ENTRY_INETSOCKET_DST_PORT
+GLIBTOP_MAX_OPEN_FILE_ENTRY
+GLIBTOP_OPEN_FILENAME_LEN
+GLIBTOP_OPEN_DEST_HOST_LEN
+glibtop_open_files_entry
+glibtop_proc_open_files
+glibtop_get_proc_open_files
+glibtop_get_proc_open_files_r
+glibtop_get_proc_open_files_l
+glibtop_init_proc_open_files_p
+glibtop_get_proc_open_files_p
+glibtop_init_proc_open_files_s
+glibtop_get_proc_open_files_s
+</SECTION>
+
+<INCLUDE>glibtop/procsegment.h</INCLUDE>
+<SECTION>
+<FILE>procsegment</FILE>
+GLIBTOP_PROC_SEGMENT_TEXT_RSS
+GLIBTOP_PROC_SEGMENT_SHLIB_RSS
+GLIBTOP_PROC_SEGMENT_DATA_RSS
+GLIBTOP_PROC_SEGMENT_STACK_RSS
+GLIBTOP_PROC_SEGMENT_DIRTY_SIZE
+GLIBTOP_PROC_SEGMENT_START_CODE
+GLIBTOP_PROC_SEGMENT_END_CODE
+GLIBTOP_PROC_SEGMENT_START_STACK
+GLIBTOP_MAX_PROC_SEGMENT
+glibtop_proc_segment
+glibtop_get_proc_segment
+glibtop_get_proc_segment_r
+glibtop_get_proc_segment_l
+glibtop_init_proc_segment_p
+glibtop_get_proc_segment_p
+glibtop_init_proc_segment_s
+glibtop_get_proc_segment_s
+</SECTION>
+
+<INCLUDE>glibtop/procsignal.h</INCLUDE>
+<SECTION>
+<FILE>procsignal</FILE>
+GLIBTOP_PROC_SIGNAL_SIGNAL
+GLIBTOP_PROC_SIGNAL_BLOCKED
+GLIBTOP_PROC_SIGNAL_SIGIGNORE
+GLIBTOP_PROC_SIGNAL_SIGCATCH
+GLIBTOP_MAX_PROC_SIGNAL
+glibtop_proc_signal
+glibtop_get_proc_signal
+glibtop_get_proc_signal_r
+glibtop_get_proc_signal_l
+glibtop_init_proc_signal_p
+glibtop_get_proc_signal_p
+glibtop_init_proc_signal_s
+glibtop_get_proc_signal_s
+</SECTION>
+
+<INCLUDE>glibtop/sysdeps.h</INCLUDE>
+<SECTION>
+<FILE>sysdeps</FILE>
+GLIBTOP_SYSDEPS_FEATURES
+GLIBTOP_SYSDEPS_CPU
+GLIBTOP_SYSDEPS_MEM
+GLIBTOP_SYSDEPS_SWAP
+GLIBTOP_SYSDEPS_UPTIME
+GLIBTOP_SYSDEPS_LOADAVG
+GLIBTOP_SYSDEPS_SHM_LIMITS
+GLIBTOP_SYSDEPS_MSG_LIMITS
+GLIBTOP_SYSDEPS_SEM_LIMITS
+GLIBTOP_SYSDEPS_PROCLIST
+GLIBTOP_SYSDEPS_PROC_STATE
+GLIBTOP_SYSDEPS_PROC_UID
+GLIBTOP_SYSDEPS_PROC_MEM
+GLIBTOP_SYSDEPS_PROC_TIME
+GLIBTOP_SYSDEPS_PROC_SIGNAL
+GLIBTOP_SYSDEPS_PROC_KERNEL
+GLIBTOP_SYSDEPS_PROC_SEGMENT
+GLIBTOP_SYSDEPS_PROC_ARGS
+GLIBTOP_SYSDEPS_PROC_MAP
+GLIBTOP_SYSDEPS_MOUNTLIST
+GLIBTOP_SYSDEPS_FSUSAGE
+GLIBTOP_SYSDEPS_NETLOAD
+GLIBTOP_SYSDEPS_PPP
+GLIBTOP_SYSDEPS_NETLIST
+GLIBTOP_SYSDEPS_PROC_OPEN_FILES
+GLIBTOP_MAX_SYSDEPS
+GLIBTOP_SYSDEPS_ALL
+glibtop_sysdeps
+glibtop_get_sysdeps
+glibtop_get_sysdeps_r
+</SECTION>
+
+<INCLUDE>glibtop/procstate.h</INCLUDE>
+<SECTION>
+<FILE>procstate</FILE>
+GLIBTOP_PROC_STATE_CMD
+GLIBTOP_PROC_STATE_STATE
+GLIBTOP_PROC_STATE_UID
+GLIBTOP_PROC_STATE_GID
+GLIBTOP_PROC_STATE_RUID
+GLIBTOP_PROC_STATE_RGID
+GLIBTOP_PROC_STATE_HAS_CPU
+GLIBTOP_PROC_STATE_PROCESSOR
+GLIBTOP_PROC_STATE_LAST_PROCESSOR
+GLIBTOP_MAX_PROC_STATE
+GLIBTOP_PROCESS_RUNNING
+GLIBTOP_PROCESS_INTERRUPTIBLE
+GLIBTOP_PROCESS_UNINTERRUPTIBLE
+GLIBTOP_PROCESS_ZOMBIE
+GLIBTOP_PROCESS_STOPPED
+GLIBTOP_PROCESS_SWAPPING
+GLIBTOP_PROCESS_DEAD
+glibtop_proc_state
+glibtop_get_proc_state
+glibtop_get_proc_state_r
+glibtop_get_proc_state_l
+glibtop_init_proc_state_p
+glibtop_get_proc_state_p
+glibtop_init_proc_state_s
+glibtop_get_proc_state_s
+</SECTION>
+
+<INCLUDE>glibtop/procuid.h</INCLUDE>
+<SECTION>
+<FILE>procuid</FILE>
+GLIBTOP_PROC_UID_UID
+GLIBTOP_PROC_UID_EUID
+GLIBTOP_PROC_UID_GID
+GLIBTOP_PROC_UID_EGID
+GLIBTOP_PROC_UID_SUID
+GLIBTOP_PROC_UID_SGID
+GLIBTOP_PROC_UID_FSUID
+GLIBTOP_PROC_UID_FSGID
+GLIBTOP_PROC_UID_PID
+GLIBTOP_PROC_UID_PPID
+GLIBTOP_PROC_UID_PGRP
+GLIBTOP_PROC_UID_SESSION
+GLIBTOP_PROC_UID_TTY
+GLIBTOP_PROC_UID_TPGID
+GLIBTOP_PROC_UID_PRIORITY
+GLIBTOP_PROC_UID_NICE
+GLIBTOP_PROC_UID_NGROUPS
+GLIBTOP_PROC_UID_GROUPS
+GLIBTOP_MAX_PROC_UID
+glibtop_proc_uid
+GLIBTOP_MAX_GROUPS
+glibtop_get_proc_uid
+glibtop_get_proc_uid_r
+glibtop_get_proc_uid_l
+glibtop_init_proc_uid_p
+glibtop_get_proc_uid_p
+glibtop_init_proc_uid_s
+glibtop_get_proc_uid_s
+</SECTION>
+
+<INCLUDE>glibtop/proctime.h</INCLUDE>
+<SECTION>
+<FILE>proctime</FILE>
+GLIBTOP_PROC_TIME_START_TIME
+GLIBTOP_PROC_TIME_RTIME
+GLIBTOP_PROC_TIME_UTIME
+GLIBTOP_PROC_TIME_STIME
+GLIBTOP_PROC_TIME_CUTIME
+GLIBTOP_PROC_TIME_CSTIME
+GLIBTOP_PROC_TIME_TIMEOUT
+GLIBTOP_PROC_TIME_IT_REAL_VALUE
+GLIBTOP_PROC_TIME_FREQUENCY
+GLIBTOP_PROC_TIME_XCPU_UTIME
+GLIBTOP_PROC_TIME_XCPU_STIME
+GLIBTOP_MAX_PROC_TIME
+glibtop_proc_time
+glibtop_get_proc_time
+glibtop_get_proc_time_r
+glibtop_get_proc_time_l
+glibtop_init_proc_time_p
+glibtop_get_proc_time_p
+glibtop_init_proc_time_s
+glibtop_get_proc_time_s
+</SECTION>
+
+<INCLUDE>glibtop/signal.h</INCLUDE>
+<SECTION>
+<FILE>signal</FILE>
+glibtop_signame
+</SECTION>
+
+<INCLUDE>glibtop/procmap.h</INCLUDE>
+<SECTION>
+<FILE>procmap</FILE>
+GLIBTOP_PROC_MAP_NUMBER
+GLIBTOP_PROC_MAP_TOTAL
+GLIBTOP_PROC_MAP_SIZE
+GLIBTOP_MAX_PROC_MAP
+GLIBTOP_MAP_ENTRY_START
+GLIBTOP_MAP_ENTRY_END
+GLIBTOP_MAP_ENTRY_OFFSET
+GLIBTOP_MAP_ENTRY_PERM
+GLIBTOP_MAP_ENTRY_INODE
+GLIBTOP_MAP_ENTRY_DEVICE
+GLIBTOP_MAP_ENTRY_FILENAME
+GLIBTOP_MAP_ENTRY_SIZE
+GLIBTOP_MAP_ENTRY_RSS
+GLIBTOP_MAP_ENTRY_SHARED_CLEAN
+GLIBTOP_MAP_ENTRY_SHARED_DIRTY
+GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN
+GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY
+GLIBTOP_MAX_MAP_ENTRY
+GLIBTOP_MAP_FILENAME_LEN
+GLIBTOP_MAP_PERM_READ
+GLIBTOP_MAP_PERM_WRITE
+GLIBTOP_MAP_PERM_EXECUTE
+GLIBTOP_MAP_PERM_SHARED
+GLIBTOP_MAP_PERM_PRIVATE
+glibtop_map_entry
+glibtop_proc_map
+glibtop_get_proc_map
+glibtop_get_proc_map_r
+glibtop_get_proc_map_l
+glibtop_init_proc_map_p
+glibtop_get_proc_map_p
+glibtop_init_proc_map_s
+glibtop_get_proc_map_s
+</SECTION>
+
+<INCLUDE>glibtop/sysinfo.h</INCLUDE>
+<SECTION>
+<FILE>sysinfo</FILE>
+GLIBTOP_SYSINFO_NCPU
+GLIBTOP_SYSINFO_CPUINFO
+GLIBTOP_MAX_SYSINFO
+glibtop_sysinfo
+glibtop_entry
+glibtop_get_sysinfo_r
+glibtop_get_sysinfo_s
+glibtop_get_sysinfo
+</SECTION>
+
+<INCLUDE>glibtop/union.h</INCLUDE>
+<SECTION>
+<FILE>union</FILE>
+glibtop_union
+</SECTION>
+
+<INCLUDE>glibtop/version.h</INCLUDE>
+<SECTION>
+<FILE>version</FILE>
+LIBGTOP_VERSION_STRING
+glibtop_send_version
+</SECTION>
+
+<INCLUDE>glibtop/proclist.h</INCLUDE>
+<SECTION>
+<FILE>proclist</FILE>
+GLIBTOP_PROCLIST_NUMBER
+GLIBTOP_PROCLIST_TOTAL
+GLIBTOP_PROCLIST_SIZE
+GLIBTOP_MAX_PROCLIST
+GLIBTOP_KERN_PROC_ALL
+GLIBTOP_KERN_PROC_PID
+GLIBTOP_KERN_PROC_PGRP
+GLIBTOP_KERN_PROC_SESSION
+GLIBTOP_KERN_PROC_TTY
+GLIBTOP_KERN_PROC_UID
+GLIBTOP_KERN_PROC_RUID
+GLIBTOP_KERN_PROC_MASK
+GLIBTOP_EXCLUDE_IDLE
+GLIBTOP_EXCLUDE_SYSTEM
+GLIBTOP_EXCLUDE_NOTTY
+glibtop_proclist
+glibtop_get_proclist
+glibtop_get_proclist_r
+glibtop_get_proclist_l
+glibtop_init_proclist_p
+glibtop_get_proclist_p
+glibtop_init_proclist_s
+glibtop_get_proclist_s
+</SECTION>
+
+<INCLUDE>glibtop/sem_limits.h</INCLUDE>
+<SECTION>
+<FILE>sem_limits</FILE>
+GLIBTOP_IPC_SEMMAP
+GLIBTOP_IPC_SEMMNI
+GLIBTOP_IPC_SEMMNS
+GLIBTOP_IPC_SEMMNU
+GLIBTOP_IPC_SEMMSL
+GLIBTOP_IPC_SEMOPM
+GLIBTOP_IPC_SEMUME
+GLIBTOP_IPC_SEMUSZ
+GLIBTOP_IPC_SEMVMX
+GLIBTOP_IPC_SEMAEM
+GLIBTOP_MAX_SEM_LIMITS
+glibtop_sem_limits
+glibtop_get_sem_limits
+glibtop_get_sem_limits_r
+glibtop_get_sem_limits_l
+glibtop_init_sem_limits_p
+glibtop_get_sem_limits_p
+glibtop_init_sem_limits_s
+glibtop_get_sem_limits_s
+</SECTION>
+
+<INCLUDE>glibtop/prockernel.h</INCLUDE>
+<SECTION>
+<FILE>prockernel</FILE>
+GLIBTOP_PROC_KERNEL_K_FLAGS
+GLIBTOP_PROC_KERNEL_MIN_FLT
+GLIBTOP_PROC_KERNEL_MAJ_FLT
+GLIBTOP_PROC_KERNEL_CMIN_FLT
+GLIBTOP_PROC_KERNEL_CMAJ_FLT
+GLIBTOP_PROC_KERNEL_KSTK_ESP
+GLIBTOP_PROC_KERNEL_KSTK_EIP
+GLIBTOP_PROC_KERNEL_NWCHAN
+GLIBTOP_PROC_KERNEL_WCHAN
+GLIBTOP_MAX_PROC_KERNEL
+glibtop_proc_kernel
+glibtop_get_proc_kernel
+glibtop_get_proc_kernel_r
+glibtop_get_proc_kernel_l
+glibtop_init_proc_kernel_p
+glibtop_get_proc_kernel_p
+glibtop_init_proc_kernel_s
+glibtop_get_proc_kernel_s
+</SECTION>
+
+<INCLUDE>glibtop/fsusage.h</INCLUDE>
+<SECTION>
+<FILE>fsusage</FILE>
+GLIBTOP_FSUSAGE_BLOCKS
+GLIBTOP_FSUSAGE_BFREE
+GLIBTOP_FSUSAGE_BAVAIL
+GLIBTOP_FSUSAGE_FILES
+GLIBTOP_FSUSAGE_FFREE
+GLIBTOP_FSUSAGE_BLOCK_SIZE
+GLIBTOP_FSUSAGE_READ
+GLIBTOP_FSUSAGE_WRITE
+GLIBTOP_MAX_FSUSAGE
+glibtop_fsusage
+glibtop_get_fsusage
+glibtop_get_fsusage_r
+glibtop_get_fsusage_l
+glibtop_get_fsusage_s
+</SECTION>
+
+<INCLUDE>glibtop/loadavg.h</INCLUDE>
+<SECTION>
+<FILE>loadavg</FILE>
+GLIBTOP_LOADAVG_LOADAVG
+GLIBTOP_LOADAVG_NR_RUNNING
+GLIBTOP_LOADAVG_NR_TASKS
+GLIBTOP_LOADAVG_LAST_PID
+GLIBTOP_MAX_LOADAVG
+glibtop_loadavg
+glibtop_get_loadavg
+glibtop_get_loadavg_r
+glibtop_get_loadavg_l
+glibtop_init_loadavg_p
+glibtop_get_loadavg_p
+glibtop_init_loadavg_s
+glibtop_get_loadavg_s
+</SECTION>
+
+<INCLUDE>glibtop/mem.h</INCLUDE>
+<SECTION>
+<FILE>mem</FILE>
+GLIBTOP_MEM_TOTAL
+GLIBTOP_MEM_USED
+GLIBTOP_MEM_FREE
+GLIBTOP_MEM_SHARED
+GLIBTOP_MEM_BUFFER
+GLIBTOP_MEM_CACHED
+GLIBTOP_MEM_USER
+GLIBTOP_MEM_LOCKED
+GLIBTOP_MAX_MEM
+glibtop_mem
+glibtop_get_mem
+glibtop_get_mem_r
+glibtop_get_mem_l
+glibtop_init_mem_p
+glibtop_get_mem_p
+glibtop_init_mem_s
+glibtop_get_mem_s
+</SECTION>
+
+<INCLUDE>glibtop/mountlist.h</INCLUDE>
+<SECTION>
+<FILE>mountlist</FILE>
+GLIBTOP_MOUNTLIST_NUMBER
+GLIBTOP_MOUNTLIST_TOTAL
+GLIBTOP_MOUNTLIST_SIZE
+GLIBTOP_MAX_MOUNTLIST
+glibtop_mountentry
+glibtop_mountlist
+glibtop_get_mountlist
+glibtop_get_mountlist_r
+glibtop_get_mountlist_l
+glibtop_get_mountlist_s
+</SECTION>
+
+<INCLUDE>glibtop/msg_limits.h</INCLUDE>
+<SECTION>
+<FILE>msg_limits</FILE>
+GLIBTOP_IPC_MSGPOOL
+GLIBTOP_IPC_MSGMAP
+GLIBTOP_IPC_MSGMAX
+GLIBTOP_IPC_MSGMNB
+GLIBTOP_IPC_MSGMNI
+GLIBTOP_IPC_MSGSSZ
+GLIBTOP_IPC_MSGTQL
+GLIBTOP_MAX_MSG_LIMITS
+glibtop_msg_limits
+glibtop_get_msg_limits
+glibtop_get_msg_limits_r
+glibtop_get_msg_limits_l
+glibtop_init_msg_limits_p
+glibtop_get_msg_limits_p
+glibtop_init_msg_limits_s
+glibtop_get_msg_limits_s
+</SECTION>
+
+<INCLUDE>glibtop/cpu.h</INCLUDE>
+<SECTION>
+<FILE>cpu</FILE>
+GLIBTOP_CPU_TOTAL
+GLIBTOP_CPU_USER
+GLIBTOP_CPU_NICE
+GLIBTOP_CPU_SYS
+GLIBTOP_CPU_IDLE
+GLIBTOP_CPU_FREQUENCY
+GLIBTOP_XCPU_TOTAL
+GLIBTOP_XCPU_USER
+GLIBTOP_XCPU_NICE
+GLIBTOP_XCPU_SYS
+GLIBTOP_XCPU_IDLE
+GLIBTOP_XCPU_FLAGS
+GLIBTOP_CPU_IOWAIT
+GLIBTOP_CPU_IRQ
+GLIBTOP_CPU_SOFTIRQ
+GLIBTOP_XCPU_IOWAIT
+GLIBTOP_XCPU_IRQ
+GLIBTOP_XCPU_SOFTIRQ
+GLIBTOP_MAX_CPU
+GLIBTOP_NCPU
+glibtop_cpu
+glibtop_get_cpu
+glibtop_get_cpu_r
+glibtop_get_cpu_l
+glibtop_init_cpu_p
+glibtop_get_cpu_p
+glibtop_init_cpu_s
+glibtop_get_cpu_s
+</SECTION>
+
+<INCLUDE>glibtop/swap.h</INCLUDE>
+<SECTION>
+<FILE>swap</FILE>
+GLIBTOP_SWAP_TOTAL
+GLIBTOP_SWAP_USED
+GLIBTOP_SWAP_FREE
+GLIBTOP_SWAP_PAGEIN
+GLIBTOP_SWAP_PAGEOUT
+GLIBTOP_MAX_SWAP
+glibtop_swap
+glibtop_get_swap
+glibtop_get_swap_r
+glibtop_get_swap_l
+glibtop_init_swap_p
+glibtop_get_swap_p
+glibtop_init_swap_s
+glibtop_get_swap_s
+</SECTION>
+
--- a/doc/reference/version.xml.in
+++ b/doc/reference/version.xml.in
@@ -0,0 +1,4 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+<phrase>@PACKAGE_VERSION@</phrase>
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -18,6 +18,7 @@ pprint
 pprint_static
 procargs
 procargs_static
+proclist
 df
 df_static
 netlist
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,25 @@
+2006-02-27  Benoît Dejean  <benoit@placenet.org>
+
+	* pprint.c: (pprint_get_proc_mem), (main):
+
+	Added proc_mem example.
+
+2005-12-15  Benoît Dejean  <benoit@placenet.org>
+
+	* proclist.c: (print_pids), (main):
+	
+	Improved example.
+
+2005-12-12  Benoît Dejean  <benoit@placenet.org>
+
+	* .cvsignore:
+	* Makefile.am:
+	* proclist.c: (main):
+	* procmap.c: (main):
+
+	Added quick example for glibtop_get_proclist()
+	and updated procmap example to display smap.
+
 2005-08-02  Benoît Dejean  <TazForEver@dlfp.org>

 	* pprint.c: (pprint_get_cpu), (pprint_get_loadavg),
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -8,7 +8,7 @@ DEFS			= @DEFS@

 noinst_PROGRAMS	= 	first second pprint procargs df netlist \
 			  mountlist procmap netload sysdeps timings \
-			  openfiles smp
+			  openfiles smp proclist

 first_SOURCES		= first.c
 first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
@@ -48,3 +48,6 @@ netlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la

 openfiles_SOURCES	= openfiles.c
 openfiles_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+
+proclist_SOURCES	= proclist.c
+proclist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
--- a/examples/df.c
+++ b/examples/df.c
@@ -1,3 +1,6 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
 #include <glibtop.h>

 #include <glibtop/fsusage.h>
--- a/examples/first.c
+++ b/examples/first.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/netlist.c
+++ b/examples/netlist.c
@@ -18,6 +18,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <stdio.h>

 #include <glibtop.h>
--- a/examples/netload.c
+++ b/examples/netload.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/openfiles.c
+++ b/examples/openfiles.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <glibtop.h>
 #include <glibtop/procopenfiles.h>

--- a/examples/pprint.c
+++ b/examples/pprint.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <glibtop.h>

 #include <glibtop/union.h>
@@ -264,6 +268,24 @@ static void pprint_get_proc_kernel(pid_t pid)
 }


+static void pprint_get_proc_mem(pid_t pid)
+{
+  glibtop_proc_mem buf;
+
+  glibtop_get_proc_mem(&buf, pid);
+
+  HEADER_PPRINT(glibtop_get_proc_mem);
+  PPRINT(flags, "%#llx");
+  PPRINT(size, "%llu");
+  PPRINT(vsize, "%llu");
+  PPRINT(resident, "%llu");
+  PPRINT(share, "%llu");
+  PPRINT(rss, "%llu");
+  PPRINT(rss_rlim, "%llu");
+  FOOTER_PPRINT();
+}
+
+

 int main()
 {
@@ -294,6 +316,7 @@ int main()
  pprint_get_uptime();

  pprint_get_proc_kernel(getpid());
+  pprint_get_proc_mem(getpid());

  glibtop_close();

--- a/examples/procargs.c
+++ b/examples/procargs.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <glibtop.h>
 #include <glibtop/procargs.h>

--- a/examples/proclist.c
+++ b/examples/proclist.c
@@ -0,0 +1,43 @@
+#include <glibtop.h>
+#include <glibtop/proclist.h>
+
+#include <glib.h>
+
+#include <stdio.h>
+
+#include <unistd.h>
+#include <sys/types.h>
+
+
+static void print_pids(guint64 which, guint64 arg)
+{
+	unsigned *pids;
+	unsigned i;
+	glibtop_proclist buf;
+
+	pids = glibtop_get_proclist(&buf, which, arg);
+
+	printf("glibtop_get_proclist(%#llx, %llu) -> %lu processes\n",
+	       which, arg, (unsigned long)buf.number);
+
+	for (i = 0; i < buf.number; ++i)
+		printf("%u ", pids[i]);
+
+	putchar('\n');
+	putchar('\n');
+
+	g_free(pids);
+}
+
+
+int main()
+{
+	glibtop_init();
+
+	print_pids(GLIBTOP_KERN_PROC_ALL, 0);
+	print_pids(GLIBTOP_KERN_PROC_UID, getuid());
+
+	glibtop_close();
+
+	return 0;
+}
--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
@@ -153,6 +157,18 @@ main (int argc, char *argv [])
 				 perm);
 		}

+
+		g_print("smaps flags:%#llx size:%llu rss:%llu "
+			"shared_clean:%llu shared_dirty:%llu "
+			"private_clean:%llu private_dirty: %llu\n",
+			maps[i].flags,
+			maps[i].size >> 10,
+			maps[i].rss >> 10,
+			maps[i].shared_clean >> 10,
+			maps[i].shared_dirty >> 10,
+			maps[i].private_clean >> 10,
+			maps[i].private_dirty >> 10);
+
 		if (filename && (filename != maps [i].filename))
 			g_free ((void*)filename);
 	}
--- a/examples/second.c
+++ b/examples/second.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <math.h>
 #include <stdio.h>
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <libintl.h>
 #include <stdio.h>
--- a/examples/timings.c
+++ b/examples/timings.c
@@ -21,6 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #include <locale.h>
 #include <stdio.h>
 #include <libintl.h>
--- a/glibtop.h
+++ b/glibtop.h
@@ -24,6 +24,10 @@
 #ifndef __GLIBTOP_H__
 #define __GLIBTOP_H__

+#include <glib/gmacros.h>
+
+G_BEGIN_DECLS
+
 typedef struct _glibtop		glibtop;

 /**
@@ -65,18 +69,20 @@ LIBGTOP_MICRO_VERSION >= (micro)))

 #include <glibtop/close.h>

+
+#ifdef HAVE_GLIBTOP_MACHINE_H
+
 struct _glibtop
 {
 	unsigned flags;
 	unsigned method;		/* Server Method */
 	unsigned error_method;		/* Error Method */
-#ifdef HAVE_GLIBTOP_MACHINE_H
 	glibtop_machine machine;	/* Machine dependent data */
-#endif
 	int input [2];			/* Pipe client <- server */
 	int output [2];			/* Pipe client -> server */
 	int socket;			/* Accepted connection of a socket */
 	int ncpu;			/* Number of CPUs, zero if single-processor */
+	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
 	unsigned long os_version_code;	/* Version code of the operating system */
 	const char *name;		/* Program name for error messages */
 	const char *server_command;	/* Command used to invoke server */
@@ -90,6 +96,33 @@ struct _glibtop
 	pid_t pid;			/* PID of the server */
 };

+#else /* !HAVE_GLIBTOP_MACHINE_H */
+
+struct _glibtop
+{
+	unsigned flags;
+	unsigned method;		/* Server Method */
+	unsigned error_method;		/* Error Method */
+	int input [2];			/* Pipe client <- server */
+	int output [2];			/* Pipe client -> server */
+	int socket;			/* Accepted connection of a socket */
+	int ncpu;			/* Number of CPUs, zero if single-processor */
+	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
+	unsigned long os_version_code;	/* Version code of the operating system */
+	const char *name;		/* Program name for error messages */
+	const char *server_command;	/* Command used to invoke server */
+	const char *server_host;	/* Host the server should run on */
+	const char *server_user;	/* Name of the user on the target host */
+	const char *server_rsh;		/* Command used to connect to the target host */
+	unsigned long features;		/* Server is required for this features */
+	unsigned long server_port;	/* Port on which daemon is listening */
+	glibtop_sysdeps sysdeps;	/* Detailed feature list */
+	glibtop_sysdeps required;	/* Required feature list */
+	pid_t pid;			/* PID of the server */
+};
+
+#endif /* HAVE_GLIBTOP_MACHINE_H */
+
 extern glibtop *glibtop_global_server;

 extern const unsigned long glibtop_server_features;
@@ -107,4 +140,6 @@ glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);

+G_END_DECLS
+
 #endif
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -0,0 +1,155 @@
+# -*- mode: makefile -*-
+
+####################################
+# Everything below here is generic #
+####################################
+
+if GTK_DOC_USE_LIBTOOL
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+else
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+endif
+
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
+TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+EXTRA_DIST = 				\
+	$(content_files)		\
+	$(HTML_IMAGES)			\
+	$(DOC_MAIN_SGML_FILE)		\
+	$(DOC_MODULE)-sections.txt	\
+	$(DOC_MODULE)-overrides.txt
+
+DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
+
+SCANOBJ_FILES = 		 \
+	$(DOC_MODULE).args 	 \
+	$(DOC_MODULE).hierarchy  \
+	$(DOC_MODULE).interfaces \
+	$(DOC_MODULE).prerequisites \
+	$(DOC_MODULE).signals
+
+CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
+
+if ENABLE_GTK_DOC
+all-local: html-build.stamp
+else
+all-local:
+endif
+
+docs: html-build.stamp
+
+#### scan ####
+
+scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+	@echo 'gtk-doc: Scanning header files'
+	@-chmod -R u+w $(srcdir)
+	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+	else \
+	    cd $(srcdir) ; \
+	    for i in $(SCANOBJ_FILES) ; do \
+               test -f $$i || touch $$i ; \
+	    done \
+	fi
+	cd $(srcdir) && \
+	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+	touch scan-build.stamp
+
+$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
+	@true
+
+#### templates ####
+
+tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+	@echo 'gtk-doc: Rebuilding template files'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+	touch tmpl-build.stamp
+
+tmpl.stamp: tmpl-build.stamp
+	@true
+
+#### xml ####
+
+sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+	@echo 'gtk-doc: Building XML'
+	@-chmod -R u+w $(srcdir)
+	cd $(srcdir) && \
+	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+	touch sgml-build.stamp
+
+sgml.stamp: sgml-build.stamp
+	@true
+
+#### html ####
+
+html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+	@echo 'gtk-doc: Building HTML'
+	@-chmod -R u+w $(srcdir)
+	rm -rf $(srcdir)/html 
+	mkdir $(srcdir)/html
+	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+	@echo 'gtk-doc: Fixing cross-references' 
+	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+	touch html-build.stamp
+
+##############
+
+clean-local:
+	rm -f *~ *.bak
+	rm -rf .libs
+
+maintainer-clean-local: clean
+	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+install-data-local:
+	installfiles=`echo $(srcdir)/html/*`; \
+	if test "$$installfiles" = '$(srcdir)/html/*'; \
+	then echo '-- Nothing to install' ; \
+	else \
+	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
+	  for i in $$installfiles; do \
+	    echo '-- Installing '$$i ; \
+	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+	  done; \
+	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
+	fi
+
+uninstall-local:
+	rm -f $(DESTDIR)$(TARGET_DIR)/*
+
+#
+# Require gtk-doc when making dist
+#
+if ENABLE_GTK_DOC
+dist-check-gtkdoc:
+else
+dist-check-gtkdoc:
+	@echo "*** gtk-doc must be installed and enabled in order to make dist"
+	@false
+endif
+
+dist-hook: dist-check-gtkdoc dist-hook-local
+	mkdir $(distdir)/tmpl
+	mkdir $(distdir)/xml
+	mkdir $(distdir)/html
+	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+	-cp $(srcdir)/xml/*.xml $(distdir)/xml
+	-cp $(srcdir)/html/* $(distdir)/html
+	if test -f $(srcdir)/$(DOC_MODULE).types; then \
+	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
+	fi
+
+.PHONY : dist-hook-local docs
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -52,32 +52,35 @@ G_BEGIN_DECLS

 #define GLIBTOP_MAX_CPU		18

-/* Nobody should really be using more than 4 processors. */
-#define GLIBTOP_NCPU		4
+/* Nobody should really be using more than 4 processors.
+   Yes we are :)
+   Nobody should really be using more than 32 processors.
+*/
+#define GLIBTOP_NCPU		32

 typedef struct _glibtop_cpu	glibtop_cpu;

 struct _glibtop_cpu
 {
-	guint64	flags,
-		total,				/* GLIBTOP_CPU_TOTAL		*/
-		user,				/* GLIBTOP_CPU_USER		*/
-		nice,				/* GLIBTOP_CPU_NICE		*/
-		sys,				/* GLIBTOP_CPU_SYS		*/
-		idle,				/* GLIBTOP_CPU_IDLE		*/
-		iowait,				/* GLIBTOP_CPU_IOWAIT		*/
-		irq,				/* GLIBTOP_CPU_IRQ		*/
-		softirq,			/* GLIBTOP_CPU_SOFTIRQ		*/
-		frequency,			/* GLIBTOP_CPU_FREQUENCY	*/
-		xcpu_total [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_TOTAL		*/
-		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
-		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
-		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
-		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
-		xcpu_iowait [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IOWAIT		*/
-		xcpu_irq [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IRQ		*/
-		xcpu_softirq  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SOFTIRQ		*/
-		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
+	guint64	flags;
+	guint64 total;				/* GLIBTOP_CPU_TOTAL		*/
+	guint64 user;				/* GLIBTOP_CPU_USER		*/
+	guint64 nice;				/* GLIBTOP_CPU_NICE		*/
+	guint64 sys;				/* GLIBTOP_CPU_SYS		*/
+	guint64 idle;				/* GLIBTOP_CPU_IDLE		*/
+	guint64 iowait;				/* GLIBTOP_CPU_IOWAIT		*/
+	guint64 irq;				/* GLIBTOP_CPU_IRQ		*/
+	guint64 softirq;			/* GLIBTOP_CPU_SOFTIRQ		*/
+	guint64 frequency;			/* GLIBTOP_CPU_FREQUENCY	*/
+	guint64 xcpu_total [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_TOTAL		*/
+	guint64 xcpu_user [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_USER		*/
+	guint64 xcpu_nice [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_NICE		*/
+	guint64 xcpu_sys  [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_SYS		*/
+	guint64 xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
+	guint64 xcpu_iowait [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IOWAIT		*/
+	guint64 xcpu_irq [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IRQ		*/
+	guint64 xcpu_softirq  [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_SOFTIRQ		*/
+	guint64 xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
 };

 void glibtop_get_cpu(glibtop_cpu *buf);
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -43,12 +43,12 @@ typedef struct _glibtop_fsusage		glibtop_fsusage;

 struct _glibtop_fsusage
 {
-	guint64	flags,
-		blocks,		/* Total number of blocks. */
-		bfree,		/* Free blocks available to superuser. */
-		bavail,		/* Free blocks available to non-superuser. */
-		files,		/* Total file nodes. */
-		ffree;		/* Free file nodes. */
+	guint64	flags;
+	guint64 blocks;		/* Total number of blocks. */
+	guint64 bfree;		/* Free blocks available to superuser. */
+	guint64 bavail;		/* Free blocks available to non-superuser. */
+	guint64 files;		/* Total file nodes. */
+	guint64 ffree;		/* Free file nodes. */
 	guint32	block_size;	/* Size of a block in bytes. */
 	guint64 read, write;    /* Total blocks read and written */
 };
--- a/include/glibtop/glibtop-backend-info.h
+++ b/include/glibtop/glibtop-backend-info.h
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_INFO_H__
-#define __GLIBTOP_BACKEND_INFO_H__
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/glibtop-server.h>
-
-G_BEGIN_DECLS
-
-typedef struct _glibtop_backend_info	glibtop_backend_info;
-typedef struct _glibtop_backend_entry	glibtop_backend_entry;
-typedef struct _glibtop_backend_module	glibtop_backend_module;
-
-typedef struct _glibtop_call_vector	glibtop_call_vector;
-
-typedef int (*glibtop_backend_open_func_t)  (glibtop_server *, glibtop_backend *,
-					     guint64, const char **);
-typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *,
-					     glibtop_closure *);
-
-struct _glibtop_backend_info
-{
-    const char *name;
-    glibtop_backend_open_func_t open;
-    glibtop_backend_close_func_t close;
-    glibtop_call_vector *call_vector;
-};
-
-#ifdef _IN_LIBGTOP
-
-#include <gmodule.h>
-
-/* private structure */
-struct _glibtop_backend_module
-{
-    int refcount;
-    GModule *module;
-    GSList *extra_modules;
-};
-
-struct _glibtop_backend_entry
-{
-    char *name;
-    char *libtool_name;
-    char *shlib_name;
-
-    GSList *extra_libs;
-
-    /* This is const since you must not attempt to
-     * write into gmodule loaded memory. */
-    const glibtop_backend_info *info;
-
-    /* private pointer */
-    glibtop_backend_module *_priv;
-};
-
-#endif /* _IN_LIBGTOP */
-
-long
-glibtop_register_backend (glibtop_backend_entry *entry);
-
-void
-glibtop_unregister_backend (long id);
-
-glibtop_backend_entry *
-glibtop_backend_by_id (long id);
-
-glibtop_backend_entry *
-glibtop_backend_by_name (const char *backend_name);
-
-void
-glibtop_init_backends (void);
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/glibtop-backend.h
+++ b/include/glibtop/glibtop-backend.h
@@ -1,85 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_BACKEND_H__
-#define __GLIBTOP_BACKEND_H__
-
-#include <glibtop.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define	GLIBTOP_TYPE_BACKEND		(glibtop_backend_get_type ())
-#define GLIBTOP_BACKEND(backend)	(G_TYPE_CHECK_INSTANCE_CAST ((backend), GLIBTOP_TYPE_BACKEND, glibtop_backend))
-#define GLIBTOP_BACKEND_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GLIBTOP_TYPE_BACKEND, glibtop_backend_class))
-#define GLIBTOP_IS_BACKEND(backend)	(G_TYPE_CHECK_INSTANCE_TYPE ((backend), GLIBTOP_TYPE_BACKEND))
-#define GLIBTOP_IS_BACKEND_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GLIBTOP_TYPE_BACKEND))
-#define	GLIBTOP_BACKEND_GET_CLASS(backend)(G_TYPE_INSTANCE_GET_CLASS ((backend), GLIBTOP_TYPE_BACKEND, glibtop_backend_class))
-
-#define GLIBTOP_BACKEND_TYPE(backend)	(G_TYPE_FROM_INSTANCE (backend))
-#define GLIBTOP_BACKEND_TYPE_NAME(backend)(g_type_name (GLIBTOP_BACKEND_TYPE (backend)))
-
-/* --- typedefs & structures --- */
-typedef struct _glibtop_backend		glibtop_backend;
-typedef struct _glibtop_backend_class	glibtop_backend_class;
-typedef struct _glibtop_backend_private	glibtop_backend_private;
-
-#include <glibtop/glibtop-backend-info.h>
-
-struct	_glibtop_backend
-{
-    GObject object;
-
-    /* <private> */
-    glibtop_backend_private *_priv;
-};
-
-struct	_glibtop_backend_class
-{
-    GObjectClass parent_class;;
-};
-
-GType
-glibtop_backend_get_type (void);
-
-glibtop_backend *
-glibtop_backend_get (const char *backend_name, guint64 features,
-		     const char **backend_args, GError **error);
-
-void
-glibtop_backend_set_closure_data (glibtop_backend *backend, glibtop_closure *closure);
-
-glibtop_closure *
-glibtop_backend_get_closure_data (glibtop_backend *backend);
-
-glibtop_call_vector *
-glibtop_backend_get_call_vector (glibtop_backend *backend);
-
-glibtop_server *
-glibtop_backend_get_server (glibtop_backend *backend);
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/glibtop-client.h
+++ b/include/glibtop/glibtop-client.h
@@ -1,97 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CLIENT_H__
-#define __GLIBTOP_CLIENT_H__
-
-#include <glibtop.h>
-
-#include <glib-object.h>
-
-#include <glibtop/glibtop-backend.h>
-
-G_BEGIN_DECLS
-
-#define	GLIBTOP_TYPE_CLIENT		(glibtop_client_get_type ())
-#define GLIBTOP_CLIENT(client)		(G_TYPE_CHECK_INSTANCE_CAST ((client), GLIBTOP_TYPE_CLIENT, glibtop_client))
-#define GLIBTOP_CLIENT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GLIBTOP_TYPE_CLIENT, glibtop_client_class))
-#define GLIBTOP_IS_CLIENT(client)	(G_TYPE_CHECK_INSTANCE_TYPE ((client), GLIBTOP_TYPE_CLIENT))
-#define GLIBTOP_IS_CLIENT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GLIBTOP_TYPE_CLIENT))
-#define	GLIBTOP_CLIENT_GET_CLASS(client)(G_TYPE_INSTANCE_GET_CLASS ((client), GLIBTOP_TYPE_CLIENT, glibtop_client_class))
-
-#define GLIBTOP_CLIENT_TYPE(client)	(G_TYPE_FROM_INSTANCE (client))
-#define GLIBTOP_CLIENT_TYPE_NAME(client)(g_type_name (GLIBTOP_CLIENT_TYPE (client)))
-
-/* --- typedefs & structures --- */
-typedef struct _glibtop_client		glibtop_client;
-typedef struct _glibtop_client_class	glibtop_client_class;
-typedef struct _glibtop_client_private	glibtop_client_private;
-
-struct	_glibtop_client
-{
-    GObject object;
-
-    /* <public> */
-    GError *error;
-
-    /* <private> */
-    glibtop_client_private *_priv;
-};
-
-struct	_glibtop_client_class
-{
-    GObjectClass parent_class;;
-
-    void (*error) (glibtop_client *client, GError *error);
-    void (*warning) (glibtop_client *client, GError *error);
-};
-
-GType
-glibtop_client_get_type (void);
-
-glibtop_client *
-glibtop_client_new (void);
-
-void
-glibtop_client_propagate_error (glibtop_client *client, GError *error);
-
-void
-glibtop_client_propagate_warning (glibtop_client *client, GError *error);
-
-void
-glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     guint64 features, const char **backend_args);
-
-void
-glibtop_client_add_backend (glibtop_client *client,
-			    glibtop_backend *backend);
-
-void
-glibtop_client_remove_backend (glibtop_client *client,
-			       glibtop_backend *backend);
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -26,10 +26,6 @@

 #include <glib.h>

-#ifdef _IN_LIBGTOP
-#include <config.h>
-#endif
-
 #ifdef _IN_LIBGTOP

 #endif /* _IN_LIBGTOP */
--- a/include/glibtop/init_hooks.h
+++ b/include/glibtop/init_hooks.h
@@ -3,9 +3,13 @@

 #include <glibtop.h>

+G_BEGIN_DECLS
+
 typedef void (*glibtop_init_func_t)(glibtop *);

 extern const glibtop_init_func_t _glibtop_init_hook_s[];
 extern const glibtop_init_func_t _glibtop_init_hook_p[];

+G_END_DECLS
+
 #endif /* H_LIBGTOP_INIT_HOOKS_1122955666 */
--- a/include/glibtop/limits.h
+++ b/include/glibtop/limits.h
@@ -1,56 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_LIMITS_H__
-#define __GLIBTOP_LIMITS_H__
-
-#include <glibtop/global.h>
-
-G_BEGIN_DECLS
-
-/* Nobody should really be using more than 64 processors. */
-#define GLIBTOP_NCPU		64
-
-/* Maximum number of process groups in glibtop_proc_uid. */
-#define GLIBTOP_MAX_GROUPS	32
-
-/* Maximum length of a mountpoint/device name in glibtop_mountlist. */
-#define GLIBTOP_MOUNTENTRY_LEN	79
-
-/* Maximum length of a network interface name. */
-#define GLIBTOP_INTERFACE_LEN	32
-
-/* Length of a network interface address in bytes. */
-#define GLIBTOP_IFADDR_LEN	16
-
-/* This is ((guint64)-1) */
-#define GLIBTOP_UNLIMITED	(~(guint64)0)
-
-/* Maximum length of a backend name. */
-#define GLIBTOP_BACKEND_NAME_LEN	40
-
-G_END_DECLS
-
-#endif
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -42,9 +42,9 @@ struct _glibtop_loadavg
 {
 	guint64 flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
-		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
-		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
+	guint64 nr_running;		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	guint64 nr_tasks;		/* GLIBTOP_LOADAVG_NR_TASKS	*/
+	guint64 last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };

 void glibtop_get_loadavg(glibtop_loadavg *buf);
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -44,15 +44,15 @@ typedef struct _glibtop_mem	glibtop_mem;

 struct _glibtop_mem
 {
-	guint64	flags,
-		total,		/* GLIBTOP_MEM_TOTAL	*/
-		used,		/* GLIBTOP_MEM_USED	*/
-		free,		/* GLIBTOP_MEM_FREE	*/
-		shared,		/* GLIBTOP_MEM_SHARED	*/
-		buffer,		/* GLIBTOP_MEM_BUFFER	*/
-		cached,		/* GLIBTOP_MEM_CACHED	*/
-		user,		/* GLIBTOP_MEM_USER	*/
-		locked;		/* GLIBTOP_MEM_LOCKED	*/
+	guint64	flags;
+	guint64 total;		/* GLIBTOP_MEM_TOTAL	*/
+	guint64 used;		/* GLIBTOP_MEM_USED	*/
+	guint64 free;		/* GLIBTOP_MEM_FREE	*/
+	guint64 shared;		/* GLIBTOP_MEM_SHARED	*/
+	guint64 buffer;		/* GLIBTOP_MEM_BUFFER	*/
+	guint64 cached;		/* GLIBTOP_MEM_CACHED	*/
+	guint64 user;		/* GLIBTOP_MEM_USER	*/
+	guint64 locked;		/* GLIBTOP_MEM_LOCKED	*/
 };

 void glibtop_get_mem(glibtop_mem *buf);
--- a/include/glibtop/mountlist.h
+++ b/include/glibtop/mountlist.h
@@ -49,10 +49,10 @@ struct _glibtop_mountentry

 struct _glibtop_mountlist
 {
-	guint64	flags,
-		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
-		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
-		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_MOUNTLIST_NUMBER	*/
+	guint64 total;			/* GLIBTOP_MOUNTLIST_TOTAL	*/
+	guint64 size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
 };

 glibtop_mountentry *
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -43,14 +43,14 @@ typedef struct _glibtop_msg_limits	glibtop_msg_limits;

 struct _glibtop_msg_limits
 {
-	guint64	flags,
-		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
-		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
-		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/
-		msgmnb,		/* GLIBTOP_IPC_MSGMNB	*/
-		msgmni,		/* GLIBTOP_IPC_MSGMNI	*/
-		msgssz,		/* GLIBTOP_IPC_MSGSSZ	*/
-		msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
+	guint64	flags;
+	guint64 msgpool;	/* GLIBTOP_IPC_MSGPOOL	*/
+	guint64 msgmap;		/* GLIBTOP_IPC_MSGMAP	*/
+	guint64 msgmax;		/* GLIBTOP_IPC_MSGMAX	*/
+	guint64 msgmnb;		/* GLIBTOP_IPC_MSGMNB	*/
+	guint64 msgmni;		/* GLIBTOP_IPC_MSGMNI	*/
+	guint64 msgssz;		/* GLIBTOP_IPC_MSGSSZ	*/
+	guint64 msgtql;		/* GLIBTOP_IPC_MSGTQL	*/
 };

 void glibtop_get_msg_limits(glibtop_msg_limits *buf);
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -68,7 +68,8 @@ enum {
 	GLIBTOP_IF_FLAGS_LINK1,
 	GLIBTOP_IF_FLAGS_LINK2,
 	GLIBTOP_IF_FLAGS_ALTPHYS,
-	GLIBTOP_IF_FLAGS_MULTICAST
+	GLIBTOP_IF_FLAGS_MULTICAST,
+	GLIBTOP_IF_FLAGS_WIRELESS
 };

 enum GLIBTOP_IF_IN6_SCOPE
@@ -82,23 +83,23 @@ enum GLIBTOP_IF_IN6_SCOPE

 struct _glibtop_netload
 {
-	guint64	flags,
-		if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
+	guint64	flags;
+	guint64 if_flags;		/* GLIBTOP_NETLOAD_IF_FLAGS	*/

-	guint32	mtu,			/* GLIBTOP_NETLOAD_MTU		*/
-		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
-		address;		/* GLIBTOP_NETLOAD_ADDRESS	*/
+	guint32	mtu;			/* GLIBTOP_NETLOAD_MTU		*/
+	guint32 subnet;			/* GLIBTOP_NETLOAD_SUBNET	*/
+	guint32 address;		/* GLIBTOP_NETLOAD_ADDRESS	*/

-	guint64	packets_in,		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
-		packets_out,		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
-		packets_total,		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
-		bytes_in,		/* GLIBTOP_NETLOAD_BYTES_IN	*/
-		bytes_out,		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
-		bytes_total,		/* GLIBTOP_NETLOAD_BYTES_TOTAL	*/
-		errors_in,		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
-		errors_out,		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
-		errors_total,		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
-		collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/
+	guint64	packets_in;		/* GLIBTOP_NETLOAD_PACKETS_IN	*/
+	guint64 packets_out;		/* GLIBTOP_NETLOAD_PACKETS_OUT	*/
+	guint64 packets_total;		/* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
+	guint64 bytes_in;		/* GLIBTOP_NETLOAD_BYTES_IN	*/
+	guint64 bytes_out;		/* GLIBTOP_NETLOAD_BYTES_OUT	*/
+	guint64 bytes_total;		/* GLIBTOP_NETLOAD_BYTES_TOTAL	*/
+	guint64 errors_in;		/* GLIBTOP_NETLOAD_ERRORS_IN	*/
+	guint64 errors_out;		/* GLIBTOP_NETLOAD_ERRORS_OUT	*/
+	guint64 errors_total;		/* GLIBTOP_NETLOAD_ERRORS_TOTAL	*/
+	guint64 collisions;		/* GLIBTOP_NETLOAD_COLLISIONS	*/

 	guint8 address6[16];		/* GLIBTOP_NETLOAD_ADDRESS6     */
 	guint8 prefix6[16];		/* GLIBTOP_NETLOAD_PREXIF6      */
--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -45,10 +45,10 @@ enum {

 struct _glibtop_ppp
 {
-	guint64	flags,
-		state,			/* GLIBTOP_PPP_STATE		*/
-		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
-		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
+	guint64	flags;
+	guint64 state;			/* GLIBTOP_PPP_STATE		*/
+	guint64 bytes_in;		/* GLIBTOP_PPP_BYTES_IN		*/
+	guint64 bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
 };

 void glibtop_get_ppp(glibtop_ppp *buf, unsigned short device);
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -37,8 +37,8 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;

 struct _glibtop_proc_args
 {
-	guint64	flags,
-		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
+	guint64	flags;
+	guint64 size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };


--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -48,18 +48,18 @@ typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;
 struct _glibtop_proc_kernel
 {
 	guint64 flags;
-	guint64 k_flags,	/* kernel flags for the process */
-		min_flt,	/* number of minor page faults since
+	guint64 k_flags;	/* kernel flags for the process */
+	guint64 min_flt;	/* number of minor page faults since
 				 * process start */
-		maj_flt,	/* number of major page faults since
+	guint64 maj_flt;	/* number of major page faults since
 				 * process start */
-		cmin_flt,	/* cumulative min_flt of process and
+	guint64 cmin_flt;	/* cumulative min_flt of process and
 				 * child processes */
-		cmaj_flt,	/* cumulative maj_flt of process and
+	guint64 cmaj_flt;	/* cumulative maj_flt of process and
 				 * child processes */
-		kstk_esp,	/* kernel stack pointer */
-		kstk_eip,	/* kernel stack pointer */
-		nwchan;		/* address of kernel wait channel
+	guint64 kstk_esp;	/* kernel stack pointer */
+	guint64 kstk_eip;	/* kernel stack pointer */
+	guint64 nwchan;		/* address of kernel wait channel
 				 * proc is sleeping in */
 	char wchan [40];
 };
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -56,10 +56,10 @@ typedef struct _glibtop_proclist	glibtop_proclist;

 struct _glibtop_proclist
 {
-	guint64	flags,
-		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
-		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
-		size;			/* GLIBTOP_PROCLIST_SIZE	*/
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_PROCLIST_NUMBER	*/
+	guint64 total;			/* GLIBTOP_PROCLIST_TOTAL	*/
+	guint64 size;			/* GLIBTOP_PROCLIST_SIZE	*/
 };

 unsigned *
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -43,7 +43,15 @@ G_BEGIN_DECLS
 #define GLIBTOP_MAP_ENTRY_DEVICE	5
 #define GLIBTOP_MAP_ENTRY_FILENAME	6

-#define GLIBTOP_MAX_MAP_ENTRY		7
+/* Smap support */
+#define GLIBTOP_MAP_ENTRY_SIZE			 7
+#define GLIBTOP_MAP_ENTRY_RSS			 8
+#define GLIBTOP_MAP_ENTRY_SHARED_CLEAN		 9
+#define GLIBTOP_MAP_ENTRY_SHARED_DIRTY		10
+#define GLIBTOP_MAP_ENTRY_PRIVATE_CLEAN		11
+#define GLIBTOP_MAP_ENTRY_PRIVATE_DIRTY		12
+
+#define GLIBTOP_MAX_MAP_ENTRY		13

 #define GLIBTOP_MAP_FILENAME_LEN	215

@@ -59,16 +67,28 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;

 struct _glibtop_map_entry
 {
-	guint64 flags, start, end, offset, perm, inode, device;
+	guint64 flags; 
+	guint64 start; 
+	guint64 end; 
+	guint64 offset; 
+	guint64 perm; 
+	guint64 inode; 
+	guint64 device;
+	guint64 size;
+	guint64 rss;
+	guint64 shared_clean; 
+	guint64 shared_dirty;
+	guint64 private_clean; 
+	guint64 private_dirty;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };

 struct _glibtop_proc_map
 {
-	guint64	flags,
-		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
-		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
-		size;			/* GLIBTOP_PROC_MAP_SIZE	*/
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_PROC_MAP_NUMBER	*/
+	guint64 total;			/* GLIBTOP_PROC_MAP_TOTAL	*/
+	guint64 size;			/* GLIBTOP_PROC_MAP_SIZE	*/
 };
 glibtop_map_entry *
 glibtop_get_proc_map(glibtop_proc_map *buf, pid_t pid);
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -44,14 +44,14 @@ typedef struct _glibtop_proc_mem	glibtop_proc_mem;

 struct _glibtop_proc_mem
 {
-	guint64	flags,
-		size,		/* total # of pages of memory */
-		vsize,		/* number of pages of virtual memory ... */
-		resident,	/* number of resident set
+	guint64	flags;
+	guint64 size;		/* total # of pages of memory */
+	guint64 vsize;		/* number of pages of virtual memory ... */
+	guint64 resident;	/* number of resident set
 				 * (non-swapped) pages (4k) */
-		share,		/* number of pages of shared (mmap'd) memory */
-		rss,		/* resident set size */
-		rss_rlim;	/* current limit (in bytes) of the rss
+	guint64 share;		/* number of pages of shared (mmap'd) memory */
+	guint64 rss;		/* resident set size */
+	guint64 rss_rlim;	/* current limit (in bytes) of the rss
 				 * of the process; usually 2,147,483,647 */
 };

--- a/include/glibtop/procopenfiles.h
+++ b/include/glibtop/procopenfiles.h
@@ -88,10 +88,10 @@ struct _glibtop_open_files_entry

 struct _glibtop_proc_open_files
 {
-	guint64	flags,
-		number,			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
-		total,			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
-		size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
+	guint64	flags;
+	guint64 number;			/* GLIBTOP_PROC_OPEN_FILES_NUMBER */
+	guint64 total;			/* GLIBTOP_PROC_OPEN_FILES_TOTAL  */
+	guint64 size;			/* GLIBTOP_PROC_OPEN_FILES_SIZE   */
 };

 glibtop_open_files_entry *
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -46,16 +46,16 @@ typedef struct _glibtop_proc_segment	glibtop_proc_segment;

 struct _glibtop_proc_segment
 {
-	guint64	flags,
-		text_rss,	/* text resident set size */
-		shlib_rss,	/* shared-lib resident set size */
-		data_rss,	/* data resident set size */
-		stack_rss,	/* stack resident set size */
-		dirty_size,	/* size of dirty pages */
-		start_code,
+	guint64	flags;
+	guint64 text_rss;	/* text resident set size */
+	guint64 shlib_rss;	/* shared-lib resident set size */
+	guint64 data_rss;	/* data resident set size */
+	guint64 stack_rss;	/* stack resident set size */
+	guint64 dirty_size;	/* size of dirty pages */
+	guint64 start_code;
 				/* address of beginning of code segment */
-		end_code,	/* address of end of code segment */
-		start_stack;	/* address of the bottom of stack segment */
+	guint64 end_code;	/* address of end of code segment */
+	guint64 start_stack;	/* address of the bottom of stack segment */
 };

 void glibtop_get_proc_segment(glibtop_proc_segment *buf, pid_t pid);
--- a/include/glibtop/procsignal.h
+++ b/include/glibtop/procsignal.h
@@ -42,11 +42,11 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;

 struct _glibtop_proc_signal
 {
-	guint64	flags,
-		signal [2],		/* mask of pending signals */
-		blocked [2],		/* mask of blocked signals */
-		sigignore [2],		/* mask of ignored signals */
-		sigcatch [2];		/* mask of caught  signals */
+	guint64	flags;
+	guint64 signal [2];		/* mask of pending signals */
+	guint64 blocked [2];		/* mask of blocked signals */
+	guint64 sigignore [2];		/* mask of ignored signals */
+	guint64 sigcatch [2];		/* mask of caught  signals */
 };

 void glibtop_get_proc_signal(glibtop_proc_signal *buf, pid_t pid);
--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -58,20 +58,19 @@ struct _glibtop_proc_state
 	guint64 flags;
 	char cmd[40];		/* basename of executable file in
 				 * call to exec(2) */
-	unsigned state;		/* single-char code for process state
-				 * (S=sleeping) */
+	unsigned state;
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
 	/* IMPORTANT NOTICE: For security reasons, it is extremely important
 	 *                   only to set the flags value for those two
 	 *                   fields if their values are corrent ! */
-	int uid,		/* UID of process */
-		gid,		/* GID of process */
-        ruid,
-        rgid;
-    int has_cpu,
-        processor,
-        last_processor;
+	int uid;		/* UID of process */
+	int gid;		/* GID of process */
+    int ruid;
+    int rgid;
+    int has_cpu;
+    int processor;
+    int last_processor;
 };

 void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -50,24 +50,24 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;

 struct _glibtop_proc_time
 {
-	guint64	flags,
-		start_time,	/* start time of process --
+	guint64	flags;
+	guint64 start_time;	/* start time of process --
 				 * seconds since 1-1-70 */
-		rtime,		/* real time accumulated by process */
-		utime,		/* user-mode CPU time accumulated by process */
-		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and
+	guint64 rtime;		/* real time accumulated by process */
+	guint64 utime;		/* user-mode CPU time accumulated by process */
+	guint64 stime;		/* kernel-mode CPU time accumulated by process */
+	guint64 cutime;		/* cumulative utime of process and
 				 * reaped children */
-		cstime,		/* cumulative stime of process and
+	guint64 cstime;		/* cumulative stime of process and
 				 * reaped children */
-		timeout,	/* The time (in jiffies) of the process's
+	guint64 timeout;	/* The time (in jiffies) of the process's
 				 * next timeout */
-		it_real_value,	/* The time (in jiffies) before the
+	guint64 it_real_value;	/* The time (in jiffies) before the
 				 * next SIGALRM is sent to the process
 				 * due to an interval timer. */
-		frequency,	/* Tick frequency. */
-		xcpu_utime [GLIBTOP_NCPU],	/* utime and stime for all CPUs on */
-		xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
+	guint64 frequency;	/* Tick frequency. */
+	guint64 xcpu_utime [GLIBTOP_NCPU];	/* utime and stime for all CPUs on */
+	guint64 xcpu_stime [GLIBTOP_NCPU];	/* SMP machines. */
 };


--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -59,24 +59,24 @@ typedef struct _glibtop_proc_uid	glibtop_proc_uid;
 struct _glibtop_proc_uid
 {
 	guint64 flags;
-	gint32 uid,		/* user id */
-		euid,		/* effective user id */
-		gid,		/* group id */
-		egid,		/* effective group id */
-        suid,       /* set user id */
-        sgid,       /* set group id */
-        fsuid,      /* ??? user id */
-        fsgid,      /* ??? group id */
-		pid,		/* process id */
-		ppid,		/* pid of parent process */
-		pgrp,		/* process group id */
-		session,	/* session id */
-		tty,		/* full device number of controlling terminal */
-		tpgid,		/* terminal process group id */
-		priority,	/* kernel scheduling priority */
-		nice,		/* standard unix nice level of process */
-		ngroups,
-        groups [GLIBTOP_MAX_GROUPS];
+	gint32 uid;		/* user id */
+	gint32 euid;		/* effective user id */
+	gint32 gid;		/* group id */
+	gint32 egid;		/* effective group id */
+	gint32 suid;       /* set user id */
+	gint32 sgid;       /* set group id */
+	gint32 fsuid;      /* ??? user id */
+	gint32 fsgid;      /* ??? group id */
+	gint32 pid;		/* process id */
+	gint32 ppid;		/* pid of parent process */
+	gint32 pgrp;		/* process group id */
+	gint32 session;	/* session id */
+	gint32 tty;		/* full device number of controlling terminal */
+	gint32 tpgid;		/* terminal process group id */
+	gint32 priority;	/* kernel scheduling priority */
+	gint32 nice;		/* standard unix nice level of process */
+	gint32 ngroups;
+	gint32 groups [GLIBTOP_MAX_GROUPS];

 };

--- a/include/glibtop/sem_limits.h
+++ b/include/glibtop/sem_limits.h
@@ -46,17 +46,17 @@ typedef struct _glibtop_sem_limits	glibtop_sem_limits;

 struct _glibtop_sem_limits
 {
-	guint64	flags,
-		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
-		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
-		semmns,		/* GLIBTOP_IPC_SEMMNS	*/
-		semmnu,		/* GLIBTOP_IPC_SEMMNU	*/
-		semmsl,		/* GLIBTOP_IPC_SEMMSL	*/
-		semopm,		/* GLIBTOP_IPC_SEMOPM	*/
-		semume,		/* GLIBTOP_IPC_SEMUME	*/
-		semusz,		/* GLIBTOP_IPC_SEMUSZ	*/
-		semvmx,		/* GLIBTOP_IPC_SEMVMX	*/
-		semaem;		/* GLIBTOP_IPC_SEMAEM	*/
+	guint64	flags;
+	guint64 semmap;		/* GLIBTOP_IPC_SEMMAP	*/
+	guint64 semmni;		/* GLIBTOP_IPC_SEMMNI	*/
+	guint64 semmns;		/* GLIBTOP_IPC_SEMMNS	*/
+	guint64 semmnu;		/* GLIBTOP_IPC_SEMMNU	*/
+	guint64 semmsl;		/* GLIBTOP_IPC_SEMMSL	*/
+	guint64 semopm;		/* GLIBTOP_IPC_SEMOPM	*/
+	guint64 semume;		/* GLIBTOP_IPC_SEMUME	*/
+	guint64 semusz;		/* GLIBTOP_IPC_SEMUSZ	*/
+	guint64 semvmx;		/* GLIBTOP_IPC_SEMVMX	*/
+	guint64 semaem;		/* GLIBTOP_IPC_SEMAEM	*/
 };

 void glibtop_get_sem_limits(glibtop_sem_limits *buf);
--- a/include/glibtop/shm_limits.h
+++ b/include/glibtop/shm_limits.h
@@ -41,12 +41,12 @@ typedef struct _glibtop_shm_limits	glibtop_shm_limits;

 struct _glibtop_shm_limits
 {
-	guint64	flags,
-		shmmax,		/* GLIBTOP_IPC_SHMMAX	*/
-		shmmin,		/* GLIBTOP_IPC_SHMMIN	*/
-		shmmni,		/* GLIBTOP_IPC_SHMMNI	*/
-		shmseg,		/* GLIBTOP_IPC_SHMSEG	*/
-		shmall;		/* GLIBTOP_IPC_SHMALL	*/
+	guint64	flags;
+	guint64 shmmax;		/* GLIBTOP_IPC_SHMMAX	*/
+	guint64 shmmin;		/* GLIBTOP_IPC_SHMMIN	*/
+	guint64 shmmni;		/* GLIBTOP_IPC_SHMMNI	*/
+	guint64 shmseg;		/* GLIBTOP_IPC_SHMSEG	*/
+	guint64 shmall;		/* GLIBTOP_IPC_SHMALL	*/
 };

 void glibtop_get_shm_limits(glibtop_shm_limits *buf);
--- a/include/glibtop/swap.h
+++ b/include/glibtop/swap.h
@@ -41,12 +41,12 @@ typedef struct _glibtop_swap	glibtop_swap;

 struct _glibtop_swap
 {
-	guint64	flags,
-		total,		/* GLIBTOP_SWAP_TOTAL	*/
-		used,		/* GLIBTOP_SWAP_USED	*/
-		free,		/* GLIBTOP_SWAP_FREE	*/
-		pagein,		/* GLIBTOP_SWAP_PAGEIN	*/
-		pageout;	/* GLIBTOP_SWAP_PAGEOUT	*/
+	guint64	flags;
+	guint64 total;		/* GLIBTOP_SWAP_TOTAL	*/
+	guint64 used;		/* GLIBTOP_SWAP_USED	*/
+	guint64 free;		/* GLIBTOP_SWAP_FREE	*/
+	guint64 pagein;		/* GLIBTOP_SWAP_PAGEIN	*/
+	guint64 pageout;	/* GLIBTOP_SWAP_PAGEOUT	*/
 };

 void
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -62,32 +62,32 @@ typedef struct _glibtop_sysdeps	glibtop_sysdeps;

 struct _glibtop_sysdeps
 {
-	guint64 flags,
-		features,		/* server features	*/
-		cpu,			/* glibtop_cpu		*/
-		mem,			/* glibtop_mem		*/
-		swap,			/* glibtop_swap		*/
-		uptime,			/* glibtop_uptime	*/
-		loadavg,		/* glibtop_loadavg	*/
-		shm_limits,		/* glibtop_shm_limits	*/
-		msg_limits,		/* glibtop_msg_limits	*/
-		sem_limits,		/* glibtop_sem_limits	*/
-		proclist,		/* glibtop_proclist	*/
-		proc_state,		/* glibtop_proc_state	*/
-		proc_uid,		/* glibtop_proc_uid	*/
-		proc_mem,		/* glibtop_proc_mem	*/
-		proc_time,		/* glibtop_proc_time	*/
-		proc_signal,		/* glibtop_proc_signal	*/
-		proc_kernel,		/* glibtop_proc_kernel	*/
-		proc_segment,		/* glibtop_proc_segment	*/
-		proc_args,		/* glibtop_proc_args	*/
-		proc_map,		/* glibtop_proc_map	*/
-		proc_open_files,	/* glibtop_proc_open_files */
-		mountlist,		/* glibtop_mountlist	*/
-		fsusage,		/* glibtop_fsusage	*/
-		netlist,		/* glibtop_netlist	*/
-		netload,		/* glibtop_netload	*/
-		ppp;			/* glibtop_ppp		*/
+	guint64 flags;
+	guint64 features;		/* server features	*/
+	guint64 cpu;			/* glibtop_cpu		*/
+	guint64 mem;			/* glibtop_mem		*/
+	guint64 swap;			/* glibtop_swap		*/
+	guint64 uptime;			/* glibtop_uptime	*/
+	guint64 loadavg;		/* glibtop_loadavg	*/
+	guint64 shm_limits;		/* glibtop_shm_limits	*/
+	guint64 msg_limits;		/* glibtop_msg_limits	*/
+	guint64 sem_limits;		/* glibtop_sem_limits	*/
+	guint64 proclist;		/* glibtop_proclist	*/
+	guint64 proc_state;		/* glibtop_proc_state	*/
+	guint64 proc_uid;		/* glibtop_proc_uid	*/
+	guint64 proc_mem;		/* glibtop_proc_mem	*/
+	guint64 proc_time;		/* glibtop_proc_time	*/
+	guint64 proc_signal;		/* glibtop_proc_signal	*/
+	guint64 proc_kernel;		/* glibtop_proc_kernel	*/
+	guint64 proc_segment;		/* glibtop_proc_segment	*/
+	guint64 proc_args;		/* glibtop_proc_args	*/
+	guint64 proc_map;		/* glibtop_proc_map	*/
+	guint64 proc_open_files;	/* glibtop_proc_open_files */
+	guint64 mountlist;		/* glibtop_mountlist	*/
+	guint64 fsusage;		/* glibtop_fsusage	*/
+	guint64 netlist;		/* glibtop_netlist	*/
+	guint64 netload;		/* glibtop_netload	*/
+	guint64 ppp;			/* glibtop_ppp		*/
 };

 void glibtop_get_sysdeps (glibtop_sysdeps *buf);
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -50,7 +50,8 @@ struct _glibtop_entry

 struct _glibtop_sysinfo
 {
-	guint64	flags, ncpu;
+	guint64	flags;
+	guint64 ncpu;
 	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };

--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -40,8 +40,8 @@ typedef struct _glibtop_uptime	glibtop_uptime;
 struct _glibtop_uptime
 {
 	guint64 flags;
-	double uptime,		/* GLIBTOP_UPTIME_UPTIME	*/
-		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
+	double uptime;		/* GLIBTOP_UPTIME_UPTIME	*/
+	double idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
 	guint64 boot_time;
 };

--- a/lib/close.c
+++ b/lib/close.c
@@ -21,6 +21,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/error.h>
--- a/lib/command.c
+++ b/lib/command.c
@@ -21,6 +21,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop/read.h>
 #include <glibtop/write.h>
 #include <glibtop/read_data.h>
--- a/lib/glibtop-backend-info.c
+++ b/lib/glibtop-backend-info.c
@@ -1,280 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-#include <glibtop/global.h>
-
-#include <glibtop/glibtop-backend.h>
-#include <glibtop/glibtop-backend-info.h>
-
-static GHashTable *_glibtop_backend_list = NULL;
-static long _glibtop_backend_nr = 0;
-
-#define LIBGTOP_XML_NAMESPACE	"http://www.home-of-linux.org/libgtop/1.1"
-
-#include <libxml/parser.h>
-
-#include <dirent.h>
-
-static void _glibtop_init_gmodule_backends (const char *);
-
-void
-glibtop_init_backends (void)
-{
-    static int backends_initialized = 0;
-
-    if (backends_initialized)
-	return;
-    backends_initialized = 1;
-
-    LIBXML_TEST_VERSION;
-
-    _glibtop_init_gmodule_backends (LIBGTOP_BACKEND_DIR);
-}
-
-static gchar *
-_get_library_filename (xmlDocPtr doc, xmlNodePtr cur, const char *directory)
-{
-    char *filename = xmlNodeListGetString (doc, cur->xmlChildrenNode, 1);
-    gchar *retval;
-
-    if (!filename)
-	return NULL;
-
-    /* already absolute */
-    if (filename [0] == '/')
-	retval = g_strdup (filename);
-    else
-	retval = g_strdup_printf ("%s/%s", directory, filename);
-
-    return retval;
-}
-
-static GSList *
-_parse_extra_libs (xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, const char *dir)
-{
-    GSList *list = NULL;
-
-    /* We don't care what the top level element name is */
-    cur = cur->xmlChildrenNode;
-    while (cur != NULL) {
-        if ((!strcmp (cur->name, "ExtraLib")) && (cur->ns == ns)) {
-	    xmlNodePtr sub = cur->xmlChildrenNode;
-
-	    while (sub != NULL) {
-		if ((!strcmp (sub->name, "ShlibName")) && (sub->ns == ns))
-		    list = g_slist_append
-			(list, _get_library_filename (doc, sub, dir));
-
-		sub = sub->next;
-	    }
-	}
-
-        cur = cur->next;
-    }
-
-    return list;
-}
-
-static glibtop_backend_entry *
-_parseBackend (xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur, const char *dir)
-{
-    glibtop_backend_entry *ret = NULL;
-
-    /*
-     * allocate the struct
-     */
-    ret = g_new0 (glibtop_backend_entry, 1);
-
-    /* We don't care what the top level element name is */
-    cur = cur->xmlChildrenNode;
-    while (cur != NULL) {
-        if ((!strcmp (cur->name, "Name")) && (cur->ns == ns))
-            ret->name = xmlNodeListGetString
-		(doc, cur->xmlChildrenNode, 1);
-
-        if ((!strcmp (cur->name, "Location")) && (cur->ns == ns)) {
-	    xmlNodePtr sub = cur->xmlChildrenNode;
-
-	    while (sub != NULL) {
-		if ((!strcmp (sub->name, "LibtoolName")) && (sub->ns == ns))
-		    ret->libtool_name = _get_library_filename (doc, sub, dir);
-		if ((!strcmp (sub->name, "ShlibName")) && (sub->ns == ns))
-		    ret->shlib_name = _get_library_filename (doc, sub, dir);
-
-		if ((!strcmp (sub->name, "ExtraLibs")) && (sub->ns == ns))
-		    ret->extra_libs = _parse_extra_libs (doc, ns, sub, dir);
-
-		sub = sub->next;
-	    }
-	}
-
-        cur = cur->next;
-    }
-
-    return ret;
-}
-
-static void
-_glibtop_init_gmodule_backends (const char *directory)
-{
-    DIR *dir;
-    struct dirent *entry;
-
-    dir = opendir (directory);
-    if (!dir) return;
-
-    while ((entry = readdir (dir)) != NULL) {
-	size_t len = strlen (entry->d_name);
-	gchar *filename;
-	xmlDocPtr doc;
-	xmlNsPtr ns;
-	xmlNodePtr cur;
-
-	if (len < 8)
-	    continue;
-
-	if (strcmp (entry->d_name+len-8, ".backend"))
-	    continue;
-
-	filename = g_strdup_printf ("%s/%s", directory, entry->d_name);
-
-	doc = xmlParseFile (filename);
-
-	if (!doc) {
-	    g_warning ("Cannot parse %s", filename);
-	    g_free (filename);
-	    continue;
-	}
-
-	/* Make sure the document is of the right kind */
-
-	cur = xmlDocGetRootElement (doc);
-	if (!cur) {
-	    xmlFreeDoc (doc);
-	    g_free (filename);
-	    continue;
-	}
-
-	ns = xmlSearchNsByHref (doc, cur, LIBGTOP_XML_NAMESPACE);
-	if (!ns) {
-	    g_warning ("File %s of wrong type; LibGTop Namespace not found",
-		       filename);
-	    g_free (filename);
-	    xmlFreeDoc (doc);
-	    continue;
-	}
-
-	if (strcmp (cur->name, "Backends")) {
-	    g_warning ("File %s of the wrong type, root node != 'Backends'",
-		       filename);
-	    g_free (filename);
-	    xmlFreeDoc (doc);
-	    continue;
-	}
-
-	cur = cur->xmlChildrenNode;
-	while (cur != NULL) {
-	    glibtop_backend_entry *backend;
-
-	    if ((!strcmp(cur->name, "Backend")) && (cur->ns == ns)) {
-		backend = _parseBackend (doc, ns, cur, directory);
-		if (!backend) {
-		    g_warning ("File %s of wrong type; cannot parse",
-			       filename);
-		    continue;
-		}
-
-		glibtop_register_backend (backend);
-	    }
-	    cur = cur->next;
-	}
-
-	g_free (filename);
-	xmlFreeDoc (doc);
-    }
-
-    closedir (dir);
-}
-
-long
-glibtop_register_backend (glibtop_backend_entry *entry)
-{
-    long id;
-
-    if (!_glibtop_backend_list)
-	_glibtop_backend_list = g_hash_table_new (NULL, NULL);
-
-    id = ++_glibtop_backend_nr;
-
-    g_hash_table_insert (_glibtop_backend_list,
-			 GINT_TO_POINTER (id),
-			 entry);
-
-    return id;
-}
-
-void
-glibtop_unregister_backend (long id)
-{
-    g_hash_table_remove (_glibtop_backend_list,
-			 GINT_TO_POINTER (id));
-}
-
-glibtop_backend_entry *
-glibtop_backend_by_id (long id)
-{
-    return g_hash_table_lookup (_glibtop_backend_list,
-				GINT_TO_POINTER (id));
-}
-
-typedef struct {
-    const char *backend_name;
-    glibtop_backend_entry *entry;
-} _find_by_name_param_t;
-
-static void
-find_by_name (gpointer key, gpointer value, gpointer user_data)
-{
-    _find_by_name_param_t *param = (_find_by_name_param_t *) user_data;
-    glibtop_backend_entry *entry = (glibtop_backend_entry *) value;
-
-    if (!entry || !entry->name || param->entry)
-	return;
-
-    if (!strcmp (entry->name, param->backend_name))
-	param->entry = entry;
-}
-
-glibtop_backend_entry *
-glibtop_backend_by_name (const char *backend_name)
-{
-    _find_by_name_param_t param = { backend_name, NULL };
-
-    g_hash_table_foreach (_glibtop_backend_list,
-			  find_by_name, &param);
-
-    return param.entry;
-}
--- a/lib/glibtop-backend.c
+++ b/lib/glibtop-backend.c
@@ -1,271 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-
-#include <glib-object.h>
-
-#include <glibtop/glibtop-backend.h>
-#include <glibtop/glibtop-backend-info.h>
-
-static void glibtop_backend_class_init    (glibtop_backend_class  *klass);
-static void glibtop_backend_init          (glibtop_backend        *backend);
-static void glibtop_backend_finalize      (GObject                *object);
-
-static gpointer parent_class = NULL;
-
-
-/* Internal data */
-
-struct _glibtop_backend_private
-{
-    const glibtop_backend_info *info;
-
-    glibtop_closure *closure_data;
-
-    glibtop_server *server;
-    glibtop_backend_module *module;
-};
-
-GType
-glibtop_backend_get_type (void)
-{
-    static GType glibtop_backend_type = 0;
-
-    if (!glibtop_backend_type) {
-	static const GTypeInfo glibtop_backend_info = {
-	    sizeof (glibtop_backend_class),
-	    NULL,		/* base_class_init */
-	    NULL,		/* base_class_finalize */
-	    (GClassInitFunc) glibtop_backend_class_init,
-	    NULL,		/* class_finalize */
-	    NULL,		/* class_data */
-	    sizeof (glibtop_backend),
-	    16,			/* n_preallocs */
-	    (GInstanceInitFunc) glibtop_backend_init,
-	};
-
-	glibtop_backend_type = g_type_register_static
-	    (G_TYPE_OBJECT, "glibtop_backend", &glibtop_backend_info, 0);
-    }
-
-    return glibtop_backend_type;
-}
-
-static void
-glibtop_backend_class_init (glibtop_backend_class *class)
-{
-    GObjectClass *gobject_class;
-
-    gobject_class = (GObjectClass *) class;
-
-    parent_class = g_type_class_ref (G_TYPE_OBJECT);
-
-    gobject_class->finalize = glibtop_backend_finalize;
-}
-
-static void
-glibtop_backend_init (glibtop_backend *backend)
-{
-    glibtop_backend_private *priv;
-
-    priv = g_new0 (glibtop_backend_private, 1);
-    backend->_priv = priv;
-}
-
-static void
-glibtop_backend_finalize (GObject *object)
-{
-    glibtop_backend *glibtop;
-    glibtop_backend_private *priv = NULL;
-
-    glibtop = GLIBTOP_BACKEND (object);
-    priv = glibtop->_priv;
-
-    g_free (priv);
-
-    if (G_OBJECT_CLASS (parent_class)->finalize)
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-unload_module (gpointer data, gpointer user_data)
-{
-    g_module_close (data);
-}
-
-static int
-load_extra_libs (glibtop_backend_entry *entry, GError **error)
-{
-    GSList *list;
-    GSList *loaded_here = NULL;
-
-    for (list = entry->extra_libs; list; list = list->next) {
-	const gchar *filename = list->data;
-	GModule *module;
-
-	module = g_module_open (filename, G_MODULE_BIND_LAZY);
-	if (!module) {
-	    g_set_error (error, GLIBTOP_ERROR, GLIBTOP_ERROR_NO_SUCH_BACKEND,
-			 "Cannot open extra shared library `%s' "
-			 "for backend `%s' (%s)", filename, entry->name,
-			 g_module_error ());
-	    g_slist_foreach (loaded_here, unload_module, NULL);
-	    return -GLIBTOP_ERROR_NO_SUCH_BACKEND;
-	}
-
-	loaded_here = g_slist_prepend (loaded_here, module);
-    }
-
-    entry->_priv->extra_modules = g_slist_concat
-	(loaded_here, entry->_priv->extra_modules);
-
-    return 0;
-}
-
-glibtop_backend *
-glibtop_backend_get (const char *backend_name, guint64 features,
-		     const char **backend_args, GError **error)
-{
-    const glibtop_backend_info *info;
-    glibtop_backend_entry *entry;
-    glibtop_backend *backend;
-
-    glibtop_init_backends ();
-
-    entry = glibtop_backend_by_name (backend_name);
-    if (!entry) {
-	g_set_error (error, GLIBTOP_ERROR, GLIBTOP_ERROR_NO_SUCH_BACKEND,
-		     "No backend with this name");
-	return NULL;
-    }
-
-    if (!entry->_priv) {
-	entry->_priv = g_new0 (glibtop_backend_module, 1);
-
-	if (entry->extra_libs) {
-	    int retval;
-
-	    retval = load_extra_libs (entry, error);
-	    if (retval < 0)
-		return NULL;
-	}
-
-	entry->_priv->module = g_module_open (entry->shlib_name,
-					      G_MODULE_BIND_LAZY);
-	if (!entry->_priv->module) {
-	    g_set_error (error, GLIBTOP_ERROR, GLIBTOP_ERROR_NO_SUCH_BACKEND,
-			 "Cannot open shared library `%s' "
-			 "for backend `%s' (%s)", entry->shlib_name,
-			 entry->name, g_module_error ());
-	    return NULL;
-	}
-
-	if (!g_module_symbol (entry->_priv->module,
-			      "LibGTopBackendInfo",
-			      (gpointer*) &entry->info)) {
-	    g_set_error (error, GLIBTOP_ERROR, GLIBTOP_ERROR_NO_SUCH_BACKEND,
-			 "Library `%s' is not a valid "
-			 "LibGTop Backend library (start symbol not found)",
-			 entry->shlib_name);
-
-	    g_module_close (entry->_priv->module);
-	    g_free (entry->_priv);
-	    entry->_priv = NULL;
-
-	    return NULL;
-	}
-    }
-
-    info = entry->info;
-    if (!info) {
-	g_set_error (error, GLIBTOP_ERROR, GLIBTOP_ERROR_NO_SUCH_BACKEND,
-		     "Can't get backend info");
-	return NULL;
-    }
-
-    backend = g_object_new (GLIBTOP_TYPE_BACKEND, NULL);
-
-    backend->_priv->module = entry->_priv;
-    backend->_priv->info = info;
-
-    backend->_priv->server = glibtop_server_new ();
-
-    if (info->open) {
-	int retval;
-
-	retval = info->open (backend->_priv->server, backend, features,
-			     backend_args);
-	if (retval) {
-	    g_set_error (error, GLIBTOP_ERROR, GLIBTOP_ERROR_NO_SUCH_BACKEND,
-			 "Backend open function return error condition");
-
-	    g_object_unref (G_OBJECT (backend));
-	    return NULL;
-	}
-    }
-
-    entry->_priv->refcount++;
-
-    return backend;
-}
-
-glibtop_call_vector *
-glibtop_backend_get_call_vector (glibtop_backend *backend)
-{
-    g_return_val_if_fail (GLIBTOP_IS_BACKEND (backend), NULL);
-
-    g_assert (backend->_priv->info != NULL);
-
-    return backend->_priv->info->call_vector;
-}
-
-glibtop_server *
-glibtop_backend_get_server (glibtop_backend *backend)
-{
-    g_return_val_if_fail (GLIBTOP_IS_BACKEND (backend), NULL);
-
-    glibtop_server_ref (backend->_priv->server);
-
-    return backend->_priv->server;
-}
-
-glibtop_closure *
-glibtop_backend_get_closure_data (glibtop_backend *backend)
-{
-    g_return_val_if_fail (GLIBTOP_IS_BACKEND (backend), NULL);
-
-    return backend->_priv->closure_data;
-}
-
-void
-glibtop_backend_set_closure_data (glibtop_backend *backend,
-				  glibtop_closure *closure)
-{
-    g_return_if_fail (GLIBTOP_IS_BACKEND (backend));
-    g_return_if_fail (backend->_priv->closure_data == NULL);
-
-    backend->_priv->closure_data = closure;
-}
--- a/lib/glibtop-client-private.h
+++ b/lib/glibtop-client-private.h
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_CLIENT_PRIVATE_H__
-#define __GLIBTOP_CLIENT_PRIVATE_H__
-
-struct _glibtop_client_private
-{
-    GSList *backend_list;
-};
-
-#endif
--- a/lib/glibtop-client.c
+++ b/lib/glibtop-client.c
@@ -1,257 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 2.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#include <glibtop.h>
-
-#include <glib-object.h>
-
-static void glibtop_client_class_init    (glibtop_client_class   *klass);
-static void glibtop_client_init          (glibtop_client         *client);
-static void glibtop_client_finalize      (GObject                *object);
-
-static gpointer parent_class = NULL;
-
-#include <glibtop-client-private.h>
-
-enum {
-    GLIBTOP_CLIENT_SIGNAL_ERROR,
-    GLIBTOP_CLIENT_SIGNAL_WARNING,
-    LAST_SIGNAL
-};
-
-static guint glibtop_client_signals [LAST_SIGNAL] = { 0 };
-
-GType
-glibtop_client_get_type (void)
-{
-    static GType glibtop_client_type = 0;
-
-    if (!glibtop_client_type) {
-	static const GTypeInfo glibtop_client_info = {
-	    sizeof (glibtop_client_class),
-	    NULL,		/* base_class_init */
-	    NULL,		/* base_class_finalize */
-	    (GClassInitFunc) glibtop_client_class_init,
-	    NULL,		/* class_finalize */
-	    NULL,		/* class_data */
-	    sizeof (glibtop_client),
-	    16,			/* n_preallocs */
-	    (GInstanceInitFunc) glibtop_client_init,
-	};
-
-	glibtop_client_type = g_type_register_static
-	    (G_TYPE_OBJECT, "glibtop_client", &glibtop_client_info, 0);
-    }
-
-    return glibtop_client_type;
-}
-
-static void
-glibtop_client_error_handler (glibtop_client *client, GError *error)
-{
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-
-    if (error == NULL)
-	return;
-
-    g_error ("%s (%d): %s", g_quark_to_string (error->domain),
-	     error->code, error->message);
-}
-
-static void
-glibtop_client_warning_handler (glibtop_client *client, GError *error)
-{
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-
-    if (error == NULL)
-	return;
-
-    g_warning ("%s (%d): %s", g_quark_to_string (error->domain),
-	       error->code, error->message);
-
-}
-
-static void
-glibtop_client_class_init (glibtop_client_class *klass)
-{
-    GObjectClass *gobject_class;
-
-    gobject_class = (GObjectClass *) klass;
-
-    parent_class = g_type_class_peek_parent (klass);
-
-    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR] =
-	g_signal_new ("error",
-		       G_TYPE_FROM_CLASS (klass),
-		       G_SIGNAL_RUN_LAST,
-		       G_STRUCT_OFFSET (glibtop_client_class, error),
-		       NULL, NULL,
-		       g_cclosure_marshal_VOID__POINTER,
-		       G_TYPE_NONE, 1, G_TYPE_POINTER, NULL);
-
-    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_WARNING] =
-	g_signal_new ("warning",
-		       G_TYPE_FROM_CLASS (klass),
-		       G_SIGNAL_RUN_LAST,
-		       G_STRUCT_OFFSET (glibtop_client_class, warning),
-		       NULL, NULL,
-		       g_cclosure_marshal_VOID__POINTER,
-		       G_TYPE_NONE, 1, G_TYPE_POINTER, NULL);
-
-    klass->error = glibtop_client_error_handler;
-    klass->warning = glibtop_client_warning_handler;
-
-    gobject_class->finalize = glibtop_client_finalize;
-}
-
-static void
-glibtop_client_init (glibtop_client *glibtop)
-{
-    glibtop_client_private *priv;
-
-    priv = g_new0 (glibtop_client_private, 1);
-    glibtop->_priv = priv;
-}
-
-static void
-glibtop_client_finalize (GObject *object)
-{
-    glibtop_client *glibtop;
-    glibtop_client_private *priv = NULL;
-    GSList *c;
-
-    glibtop = GLIBTOP_CLIENT (object);
-    priv = glibtop->_priv;
-
-    for (c = priv->backend_list; c; c = c->next)
-	g_object_unref (G_OBJECT (c->data));
-    g_slist_free (priv->backend_list);
-
-    g_free (priv);
-
-    if (G_OBJECT_CLASS (parent_class)->finalize)
-	G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-glibtop_client *
-glibtop_client_new (void)
-{
-    return g_object_new (GLIBTOP_TYPE_CLIENT, NULL);
-}
-
-void
-glibtop_client_propagate_error (glibtop_client *client, GError *error)
-{
-    GValue params [2] = { { 0, }, { 0, } };
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-
-    if (error == NULL)
-	return;
-
-    g_value_init (params, GLIBTOP_CLIENT_TYPE (client));
-    g_value_set_object (params, G_OBJECT (client));
-
-    g_value_init (params + 1, G_TYPE_POINTER);
-    g_value_set_pointer (params + 1, error);
-
-    g_signal_emitv (params,
-		    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_ERROR],
-		    0, NULL);
-
-    g_value_unset (params + 1);
-    g_value_unset (params + 0);
-}
-
-void
-glibtop_client_propagate_warning (glibtop_client *client, GError *error)
-{
-    GValue params [2] = { { 0, }, { 0, } };
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-
-    if (error == NULL)
-	return;
-
-    g_value_init (params, GLIBTOP_CLIENT_TYPE (client));
-    g_value_set_object (params, G_OBJECT (client));
-
-    g_value_init (params + 1, G_TYPE_POINTER);
-    g_value_set_pointer (params + 1, error);
-
-    g_signal_emitv (params,
-		    glibtop_client_signals [GLIBTOP_CLIENT_SIGNAL_WARNING],
-		    0, NULL);
-
-    g_value_unset (params + 1);
-    g_value_unset (params + 0);
-}
-
-void
-glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     guint64 features, const char **backend_args)
-{
-    glibtop_backend *backend;
-    GError *error = NULL;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-
-    backend = glibtop_backend_get (backend_name, features, backend_args,
-				   &error);
-    if (!backend) {
-	glibtop_client_propagate_error (client, error);
-	g_error_free (error);
-	return;
-    }
-
-    glibtop_client_add_backend (client, backend);
-}
-
-void
-glibtop_client_add_backend (glibtop_client *client,
-			    glibtop_backend *backend)
-{
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    g_return_if_fail (GLIBTOP_IS_BACKEND (backend));
-
-    client->_priv->backend_list = g_slist_append
-	(client->_priv->backend_list, backend);
-}
-
-void
-glibtop_client_remove_backend (glibtop_client *client,
-			       glibtop_backend *backend)
-{
-    GSList *c;
-
-    g_return_if_fail (GLIBTOP_IS_CLIENT (client));
-    g_return_if_fail (GLIBTOP_IS_BACKEND (backend));
-
-    c = g_slist_find (client->_priv->backend_list, backend);
-    if (!c) return;
-
-    g_slist_remove_link (client->_priv->backend_list, c);
-    g_object_unref (G_OBJECT (backend));
-}
--- a/lib/glibtop-server.c
+++ b/lib/glibtop-server.c
@@ -23,6 +23,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop-server-private.h>

--- a/lib/init.c
+++ b/lib/init.c
@@ -21,6 +21,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/sysdeps.h>
--- a/lib/inodedb.c
+++ b/lib/inodedb.c
@@ -21,6 +21,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
 #include <glibtop/inodedb.h>
--- a/lib/open.c
+++ b/lib/open.c
@@ -21,6 +21,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/read.h>
@@ -137,10 +138,10 @@ glibtop_open_l (glibtop *server, const char *program_name,

 		sprintf (version, LIBGTOP_VERSION_STRING,
 			 LIBGTOP_VERSION, LIBGTOP_SERVER_VERSION,
-			 sizeof (glibtop_command),
-			 sizeof (glibtop_response),
-			 sizeof (glibtop_union),
-			 sizeof (glibtop_sysdeps));
+			 (guint) sizeof (glibtop_command),
+			 (guint) sizeof (glibtop_response),
+			 (guint) sizeof (glibtop_union),
+			 (guint) sizeof (glibtop_sysdeps));

 		size = strlen (version) + 1;

--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -21,6 +21,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop/parameter.h>
 #include <glibtop/error.h>
--- a/lib/read.c
+++ b/lib/read.c
@@ -53,7 +53,7 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 	glibtop_init_r (&server, 0, 0);

 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
+	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
 #endif

 	if (server->socket) {
@@ -64,6 +64,6 @@ glibtop_read_l (glibtop *server, size_t size, void *buf)
 				server,
 				ngettext ("read %d byte",
 					  "read %d bytes", size),
-				size);
+				(int)size);
 	}
 }
--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -19,6 +19,7 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop.h>
 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
--- a/lib/test-backends.c
+++ b/lib/test-backends.c
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop 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 General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. 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>
-
-int
-main (int argc, char *argv [])
-{
-    glibtop_client *client;
-    glibtop_backend *backend_common;
-    glibtop_backend *backend_sysdeps;
-    GError *error = NULL;
-    glibtop_cpu cpu;
-
-    g_type_init ();
-
-    client = glibtop_client_new ();
-
-    backend_common = glibtop_backend_get ("glibtop-backend-common",
-					  0, NULL, &error);
-
-    if (error != NULL) {
-	glibtop_client_propagate_warning (client, error);
-	g_error_free (error);
-	error = NULL;
-    }
-
-    g_message (G_STRLOC ": backend = %p", backend_common);
-
-    if (backend_common != NULL)
-	glibtop_client_add_backend (client, backend_common);
-
-    backend_sysdeps = glibtop_backend_get ("glibtop-backend-sysdeps-stub",
-					   0, NULL, &error);
-
-    if (error != NULL) {
-	glibtop_client_propagate_warning (client, error);
-	g_error_free (error);
-	error = NULL;
-    }
-
-    g_message (G_STRLOC ": backend = %p", backend_sysdeps);
-
-    if (backend_sysdeps != NULL)
-	glibtop_client_add_backend (client, backend_sysdeps);
-
-    glibtop_get_cpu_l (client, &cpu);
-
-    exit (0);
-}
--- a/lib/write.c
+++ b/lib/write.c
@@ -39,7 +39,7 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	if (size == 0) return;

 #ifdef DEBUG
-	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
+	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
 #endif

 	if (server->socket) {
@@ -49,5 +49,8 @@ glibtop_write_l (glibtop *server, size_t size, void *buf)
 	}

 	if (ret < 0)
-		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
+		glibtop_error_io_r (server,
+				    ngettext("wrote %d byte",
+					     "wrote %d bytes", size),
+				    (int) size);
 }
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -18,23 +18,22 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_SUBST(libgtop_need_server)

 	AC_ARG_WITH(libgtop-examples,
-	[  --with-libgtop-examples Build the libgtop examples (default=no)],[
+	AS_HELP_STRING([--with-libgtop-examples],
+	[Build the libgtop examples @<:@default=no@:>@]),[
 	build_examples="$withval"], [build_examples=no])

 	AM_CONDITIONAL(EXAMPLES, test x"$build_examples" = xyes)

 	AC_ARG_ENABLE(hacker-mode,
-	[  --enable-hacker-mode    Enable building of unstable sysdeps],
+	AS_HELP_STRING([--enable-hacker-mode],
+	[Enable building of unstable sysdeps]),
 	[hacker_mode="$enableval"], [hacker_mode=no])

 	AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)

-	if test x$hacker_mode = xyes ; then
-	  LIBGTOP_HACKER_TESTS
-	fi
-
 	AC_ARG_WITH(libgtop-smp,
-	[  --with-libgtop-smp      Enable SMP support (default-auto)],[
+	AS_HELP_STRING([--with-libgtop-smp],
+	[Enable SMP support @<:@default-auto@:>@]),[
 	libgtop_smp="$withval"],[libgtop_smp=auto])

 	if test $libgtop_smp = auto ; then
@@ -54,7 +53,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	fi

 	if test $libgtop_smp = yes ; then
-	  AC_DEFINE(HAVE_LIBGTOP_SMP)
+	  AC_DEFINE(HAVE_LIBGTOP_SMP, 1, [Define if libgtop supports SMP])
 	fi

 	AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes)
@@ -68,7 +67,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  libgtop_have_sysinfo=yes
 	  libgtop_need_server=no
 	  ;;
-	freebsd*|netbsd*|openbsd*|bsdi*)
+	freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
 	  libgtop_sysdeps_dir=freebsd
 	  libgtop_use_machine_h=yes
 	  libgtop_need_server=yes
@@ -126,6 +125,15 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[

 	case "$host_os" in
 	*bsd*)
+		case "$host_os" in
+		*kfreebsd*)
+		AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
+		*) 
+	  	AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
+	  	esac
+	  
+	  AC_SUBST(KVM_LIBS)
+
 	  AC_CHECK_HEADERS(net/if_var.h)
 	  AC_MSG_CHECKING([for I4B])
 	  AC_TRY_COMPILE([
@@ -142,7 +150,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>

-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -152,7 +160,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 ], have_i4b=yes, have_i4b=no)
 	  AC_MSG_RESULT($have_i4b)
 	  if test x$have_i4b = xyes; then
-	    AC_DEFINE(HAVE_I4B)
+	    AC_DEFINE(HAVE_I4B, 1, [Define if I4B is available])
 	    AC_MSG_CHECKING([for I4B accounting])
 	    AC_TRY_COMPILE([
 #include <sys/types.h>
@@ -168,7 +176,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 #include <net/netisr.h>
 #include <net/route.h>

-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
 #include <net/if_sppp.h>
 #else
 #include <i4b/sppp/if_sppp.h>
@@ -180,7 +188,8 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 ], have_i4b_acct=yes, have_i4b_acct=no)
 	    AC_MSG_RESULT($have_i4b_acct)
 	    if test x$have_i4b_acct = xyes ; then
-	      AC_DEFINE(HAVE_I4B_ACCT)
+	      AC_DEFINE(HAVE_I4B_ACCT, 1,
+                        [Define if I4B accounting is supported])
 	    else
 	      AC_WARN([
 *** I4B accounting disabled - you won't get any PPP statistics.
@@ -188,6 +197,41 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 *** to see how to enable it.])
 	    fi
 	  fi
+
+	  AC_MSG_CHECKING(what we need to define to get struct msginfo)
+	  AC_CACHE_VAL(msginfo_needs,
+	    msginfo_needs=
+	    for def in nothing KERNEL _KERNEL; do
+	      AC_COMPILE_IFELSE([#define $def
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <stdio.h>
+
+int
+main (void)
+{
+  struct msginfo mi;
+  mi.msgmax = 0;
+  return 0;
+}],
+	        [
+	          msginfo_needs=$def
+	          if test ${msginfo_needs} = KERNEL; then
+	            AC_DEFINE(STRUCT_MSGINFO_NEEDS_KERNEL, 1,
+	              [Define to 1 if we need to define KERNEL to get 'struct msginfo'])
+	          elif test ${msginfo_needs} = _KERNEL; then
+	            AC_DEFINE(STRUCT_MSGINFO_NEEDS__KERNEL, 1,
+	              [Define to 1 if we need to define _KERNEL to get 'struct msginfo'])
+	          fi
+	        ]
+	      )
+	      test -n "${msginfo_needs}" && break
+	    done
+	  )
+	  AC_MSG_RESULT($msginfo_needs)
+	  if test -z "${msginfo_needs}"; then
+	    AC_MSG_ERROR([Could not find the definition of 'struct msginfo'])
+	  fi
 	  ;;
 	linux*)
 	  os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \
@@ -211,19 +255,21 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	  fi

 	  AC_MSG_CHECKING(for Linux kernel version code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code,
+              [Same as LINUX_VERSION_CODE either from <linux/version.h> or from the running kernel (if there are no configured kernel sources).])
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	solaris*)
-	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'`
-	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'`
-	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'`
+	  os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]*\)\.*\([[0-9]]*\)/\1/'`
+	  os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]*\)\.*\([[0-9]]*\)/\2/'`
+	  os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]*\)\.*\([[0-9]]*\)/\3/'`
 	  test -z "$os_micro_version" && os_micro_version=0
-	  os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q"
+	  os_version_expr="$os_major_version 10000 * $os_minor_version 100 * + $os_micro_version + p q"
 	  os_version_code=`echo "$os_version_expr" | dc`

 	  AC_MSG_CHECKING(for Solaris release code)
-	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code)
+	  AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code,
+              [Solaris release code (eg. 20501 for Solaris 2.5.1).])
 	  AC_MSG_RESULT($os_version_code)
 	  ;;
 	esac
@@ -235,11 +281,12 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
 	AC_MSG_RESULT($libgtop_need_server)

 	if test x$libgtop_need_server = xyes ; then
-	  AC_DEFINE(NEED_LIBGTOP)
+	  AC_DEFINE(NEED_LIBGTOP, 1, [Define if libgtop is required])
 	fi

 	if test x$libgtop_use_machine_h = xyes ; then
-	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H)
+	  AC_DEFINE(HAVE_GLIBTOP_MACHINE_H, 1,
+                    [Define if machine.h in libgtop sysdeps dir])
 	fi

 	AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,144 @@
+2006-12-1  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation.
+
+2006-11-19  Wouter Bolsterlee  <wbolster@cvs.gnome.org>
+
+	* pl.po: Translation updated by GNOME PL Team.
+
+2006-11-18  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po: Updated Arabic Translation.
+
+2006-10-30  Djihed Afifi <djihed@gmail.com> 
+
+	* ar.po Updated Arabic Translation.
+
+2006-10-30  Satoru SATOH <ss@gnome.gr.jp>
+
+	* ja.po: Fixed wrong plural form entries.
+
+2006-09-21  Pawan Chitrakar  <pchitrakar@gmail.com>
+
+	* ne.po: Updated Nepali Translation
+
+2006-09-19  Sunil Mohan Adapa  <sunil@atc.tcs.co.in>
+
+	* te.po: Added Telugu "te" translation done by
+	Sree Ganesh <mrthottempudi@yahoo.com>.
+	* LINGUAS: Added "te".
+
+2006-09-01  Runa Bhattacharjee <runabh@gmail.com>
+
+	* bn_IN.po: Fixed some typos.
+
+2006-08-27  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Fixed plural strings.
+
+2006-08-16  Gabor Kelemen  <kelemeng@gnome.hu>
+
+	* hu.po: Translation updated.
+
+2006-08-14  Matic Žgur  <mr.zgur@gmail.com>
+
+	* sl.po: Updated Slovenian translation.
+
+2006-08-07  Runa Bhattacharjee <runabh@gmail.com>
+
+	* bn_IN.po: Updated Bengali India Translation.
+
+2006-08-05  Ani Peter <peter.ani@gmail.com>
+
+	*ml.po Updated Malayalam Translation
+
+2006-07-05  Thierry Randrianiriana <thierryR@cvs.gnome.org>
+
+        * mg.po: Added Malagasy translation
+        * LINGUAS: Added Malagasy code 'mg' to the list
+
+2006-07-03  Runa Bhattacharjee <runabh@gmail.com>
+
+        * bn_IN.po: Added Bengali India Translation
+        * LINGUAS: Added Bengali India (bn_IN) to the list of languages.
+
+2006-07-03  Simos Xenitellis  <simos@gnome.org>
+
+	* ne.po: Fixed ^M, bug #316750.
+
+2006-06-26  Abel Cheung  <abel@oaka.org>
+
+	* zh_HK.po, zh_TW.po: Updated traditional Chinese translation.
+
+2006-06-08  Gora Mohanty  <gmohanty@cvs.gnome.org>
+
+        * LINGUAS: Added 'eo' (Esperanto)
+        * eo.po: Added Esperanto translation by Guillaume Savaton
+          <gsavaton@hotmail.com>
+
+2006-04-07  Ales Nyakhaychyk  <nab@mail.by>
+
+	* be.po: Updated Belarusian translation.
+
+2006-04-02  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* POTFILES.skip: Remove non-existing files.
+	* nb.po: Updated Norwegian bokmål translation.
+	* no.po: Same.
+
+2006-03-27  Yair Hershkovitz  <yairhr@gmail.com>
+
+	* he.po:  Updated Hebrew translation.
+
+2006-03-22  Gora Mohanty  <gmohanty@cvs.gnome.org>
+
+        * or.po: Updated Oriya translation.
+
+2006-03-18  Vladimer Sichinava  <vlsichinava@gmail.com>
+
+	* ka.po: Updated Georgian translation.
+
+2006-03-03  Žygimantas Beručka  <zygis@gnome.org>
+
+	* lt.po: Updated Lithuanian translation.
+
+2006-02-28  Clytie Siddall <clytie@riverland.net.au>
+
+	* lv.po: Updated Latvian translation by Raivis Dejus <orvils@gmail.com>.
+
+2005-12-04  Theppitak Karoonboonyanan  <thep@linux.thai.net>
+
+	* th.po: Added Thai translation.
+
+2005-11-17  Timur Jamakeev  <timurj@cvs.gnome.org>
+
+	* ky.po: Added Kirghiz translation.
+
+2005-11-16  Priit Laes  <plaes@cvs.gnome.org>
+
+	* et.po: Translation updated by Ivar Smolin.
+
+2005-10-28  Erdal Ronahi  <erdal.ronahi@gmail.com>
+
+	* ku.po: Added Kurdish translation
+
+2005-10-03  Christian Rose  <menthos@menthos.com>
+
+	* sv.po: Reverted unauthorized changes made by
+	user 'kloczek'.
+
+2005-10-01  Runa Bhattacharjee <runa@bengalinux.org>
+
+        * bn.po: Updated Bengali (bn) translation. Translation by Mahay Alam Khan <makl10n@yahoo.com>
+
+2005-09-08  Inaki Larranaga  <dooteo@euskalgnu.org>
+
+	* eu.po: Updated Basque translation.
+
 2005-08-29  Telsa Gwynne  <hobbit@aloss.ukuu.org.uk>

        * cy.po: Updated Welsh translation.
-	
+
 2005-08-22  Mugurel Tudor  <mugurelu@gnome.ro>

 	* ro.po: Updated Romanian translation
@@ -134,9 +271,9 @@
 	* ru.po: Updated Russian translation

 2005-02-07  David Lodge <dave@cirt.net>
-                                                                                
+
        * en_GB.po: Updated British translation.
-                                                                                
+
 2005-02-06  Ole Laursen  <olau@hardworking.dk>

 	* da.po: Updated Danish translation.
@@ -229,7 +366,7 @@

 2004-12-29  Benoît Dejean  <tazforever@dlfp.org>

-	* POTFILES.in: Removed a bunch of strings. 
+	* POTFILES.in: Removed a bunch of strings.

 2004-12-28  Christian Rose  <menthos@menthos.com>

@@ -279,9 +416,9 @@
 	* it.po: Updated Italian translation.

 2004-09-14  Gora Mohanty  <gmohanty@cvs.gnome.org>
-                                                                                
+
        * or.po: Updated Oriya translation.
-  
+
 2004-09-12  Laszlo Dvornik  <dvornik@gnome.hu>

 	* hu.po: Updated Hungarian translation by Gabor Kelemen.
@@ -302,7 +439,7 @@
 2004-09-06  Mugurel Tudor  <mugurelu@go.ro>

        * ro.po: Updated Romanian translation
-        by Misu Moldovan <dumol@go.ro> 
+        by Misu Moldovan <dumol@go.ro>

 2004-09-06  Kostas Papadimas <pkst@gnome.org>

@@ -315,11 +452,11 @@
 2004-09-03  Baris Cicek <baris@teamforce.name.tr>

 	* tr.po: Updated Turkish Translation
-	
+
 2004-09-02  Hendrik Richter <hendrik@gnome-de.org>

 	* de.po: Updated German translation
-	
+
 2004-08-30  Nikos Charonitakis  <charosn@her.forthnet.gr>

 	* el.po: Updated Greek translation.
@@ -479,9 +616,9 @@

 	* es.po: Updated Spanih translation.

-2004-07-28  David Lodge  <dave@cirt.net>                                                                       
+2004-07-28  David Lodge  <dave@cirt.net>
        * en_GB.po: Updated British translation.
-                                                                                
+
 2004-07-26  Duarte Loreto <happyguy_pt@hotmail.com>

 	* pt.po: Updated Portuguese translation.
@@ -584,7 +721,7 @@

 	* bg.po: Updated Bulgarian translation by
 	Rostislav Raykov <zbrox@i-space.org>
-		
+
 2004-06-28  Laurent Dhima  <laurenti@alblinux.net>

 	* sq.po: Translation updated.
@@ -1485,4 +1622,3 @@ Sun, 31 May 1998 22:38:59 +0200  Vincent Renardias  <vincent@waw.com>
 1998-05-21  Martin Baulig  <martin@home-of-linux.org>

 	* ChangeLog: new file - currently empty
-
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -0,0 +1,76 @@
+# please keep this list sorted alphabetically
+#
+am
+ar
+az
+be
+bg
+bn
+bn_IN
+bs
+ca
+cs
+cy
+da
+de
+dz
+el
+en_CA
+en_GB
+eo
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+gu
+he
+hi
+hr
+hu
+id
+it
+ja
+ka
+ko
+ku
+ky
+lt
+lv
+mg
+mi
+mk
+ml
+mn
+ms
+nb
+ne
+nl
+nn
+or
+pa
+pl
+pt
+pt_BR
+ro
+ru
+rw
+sk
+sl
+sq
+sr
+sr@Latn
+sv
+ta
+te
+th
+tr
+uk
+vi
+xh
+zh_CN
+zh_HK
+zh_TW
--- a/po/Makefile.in.in.in
+++ b/po/Makefile.in.in.in
@@ -1,248 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-PACKAGE = @LIBGTOP_PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.pox:
-	$(MAKE) $(PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: cat-id-tbl.c $(CATALOGS)
-all-no:
-
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=$(srcdir)/POTFILES.in \
-	&& test ! -f $(PACKAGE).po \
-	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
-		&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
-
-check: all
-
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
-	  fi; \
-	done
-
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,6 +1,2 @@
-support/error.c
-support/getopt.c
-support/popt.c
-support/popthelp.c
 examples/smp.c
 lib/lib.c
--- a/po/am.po
+++ b/po/am.po
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/az.po
+++ b/po/az.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-28 14:05+0300\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2005-07-28 14:04+0300\n"
 "Last-Translator: Rostislav Raykov <zbrox@i-space.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -18,64 +18,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: ../lib/read.c:65
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
 msgstr[0] "прочетен %d байт"
 msgstr[1] "прочетени %d байта"

-#: ../lib/read_data.c:53
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "размер прочетени данни"

-#: ../lib/read_data.c:72
+#: lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
 msgstr[0] "прочетен %lu байт данни"
 msgstr[1] "прочетени %lu байта данни"

-#: ../lib/write.c:52
+#: lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
 msgstr[0] "записан %d байт"
 msgstr[1] "записани %d байта"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Включване на дебъгване"

-#: ../src/daemon/gnuserv.c:460
+#: src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "DEBUG"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Включен подробен изход"

-#: ../src/daemon/gnuserv.c:462
+#: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "ПОДРОБЕН"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Не се поражда процес във фонов режим"

-#: ../src/daemon/gnuserv.c:464
+#: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "БЕЗ-ДЕМОН"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Извикан от inetd"

-#: ../src/daemon/gnuserv.c:466
+#: src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"

-#: ../src/daemon/gnuserv.c:500
+#: src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
@@ -85,126 +85,126 @@ msgstr ""
 "Изпълнете '%s --help' за да видите пълния списък от налични за командата "
 "опции.\n"

-#: ../sysdeps/osf1/siglist.c:28 ../sysdeps/sun4/siglist.c:28
+#: sysdeps/osf1/siglist.c:28 sysdeps/sun4/siglist.c:28
 msgid "Hangup"
 msgstr "Разпадане"

-#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+#: sysdeps/osf1/siglist.c:29 sysdeps/sun4/siglist.c:29
 msgid "Interrupt"
 msgstr "Прекъсване"

-#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+#: sysdeps/osf1/siglist.c:30 sysdeps/sun4/siglist.c:30
 msgid "Quit"
 msgstr "Напускане"

-#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+#: sysdeps/osf1/siglist.c:31 sysdeps/sun4/siglist.c:31
 msgid "Illegal instruction"
 msgstr "Недопустима инструкция"

-#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+#: sysdeps/osf1/siglist.c:32 sysdeps/sun4/siglist.c:32
 msgid "Trace trap"
 msgstr "Точка на прекъсване"

-#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+#: sysdeps/osf1/siglist.c:33 sysdeps/sun4/siglist.c:33
 msgid "Abort"
 msgstr "Прекъсване"

-#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+#: sysdeps/osf1/siglist.c:34 sysdeps/sun4/siglist.c:34
 msgid "EMT error"
 msgstr "EMT грешка"

-#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+#: sysdeps/osf1/siglist.c:35 sysdeps/sun4/siglist.c:35
 msgid "Floating-point exception"
 msgstr "Изключение с плаваща запетая"

-#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+#: sysdeps/osf1/siglist.c:36 sysdeps/sun4/siglist.c:36
 msgid "Kill"
 msgstr "Убиване"

-#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+#: sysdeps/osf1/siglist.c:37 sysdeps/sun4/siglist.c:37
 msgid "Bus error"
 msgstr "Грешка в шината"

-#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+#: sysdeps/osf1/siglist.c:38 sysdeps/sun4/siglist.c:38
 msgid "Segmentation violation"
 msgstr "Сегментация"

-#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+#: sysdeps/osf1/siglist.c:39 sysdeps/sun4/siglist.c:39
 msgid "Bad argument to system call"
 msgstr "Грешен аргумент на системно извикване"

-#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+#: sysdeps/osf1/siglist.c:40 sysdeps/sun4/siglist.c:40
 msgid "Broken pipe"
 msgstr "Нарушен програмен канал"

-#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+#: sysdeps/osf1/siglist.c:41 sysdeps/sun4/siglist.c:41
 msgid "Alarm clock"
 msgstr "Алармен часовник"

-#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+#: sysdeps/osf1/siglist.c:42 sysdeps/sun4/siglist.c:42
 msgid "Termination"
 msgstr "Завършване"

-#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+#: sysdeps/osf1/siglist.c:43 sysdeps/sun4/siglist.c:43
 msgid "Urgent condition on socket"
 msgstr "Неотложно състояние на socket"

-#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+#: sysdeps/osf1/siglist.c:44 sysdeps/sun4/siglist.c:44
 msgid "Stop"
 msgstr "Стоп"

-#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+#: sysdeps/osf1/siglist.c:45 sysdeps/sun4/siglist.c:45
 msgid "Keyboard stop"
 msgstr "Стоп от клавиатурата"

-#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+#: sysdeps/osf1/siglist.c:46 sysdeps/sun4/siglist.c:46
 msgid "Continue"
 msgstr "Продължаване"

-#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+#: sysdeps/osf1/siglist.c:47 sysdeps/sun4/siglist.c:47
 msgid "Child status has changed"
 msgstr "Промяна в състоянието на дъщерни процеси"

-#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+#: sysdeps/osf1/siglist.c:48 sysdeps/sun4/siglist.c:48
 msgid "Background read from tty"
 msgstr "Фоново четене от tty"

-#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+#: sysdeps/osf1/siglist.c:49 sysdeps/sun4/siglist.c:49
 msgid "Background write to tty"
 msgstr "Фонов запис в tty"

-#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+#: sysdeps/osf1/siglist.c:50 sysdeps/sun4/siglist.c:50
 msgid "I/O now possible"
 msgstr "I/O сега е възможно"

-#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+#: sysdeps/osf1/siglist.c:51 sysdeps/sun4/siglist.c:51
 msgid "CPU limit exceeded"
 msgstr "Превишено ограничение за CPU"

-#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+#: sysdeps/osf1/siglist.c:52 sysdeps/sun4/siglist.c:52
 msgid "File size limit exceeded"
 msgstr "Превишено ограничение за размер на файл"

-#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+#: sysdeps/osf1/siglist.c:53 sysdeps/sun4/siglist.c:53
 msgid "Virtual alarm clock"
 msgstr "Виртуален алармен часовник"

-#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+#: sysdeps/osf1/siglist.c:54 sysdeps/sun4/siglist.c:54
 msgid "Profiling alarm clock"
 msgstr "Профилиран алармен часовник"

-#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+#: sysdeps/osf1/siglist.c:55 sysdeps/sun4/siglist.c:55
 msgid "Window size change"
 msgstr "Променяне размера на прозорец"

-#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+#: sysdeps/osf1/siglist.c:56 sysdeps/sun4/siglist.c:56
 msgid "Information request"
 msgstr "Заявка за данни"

-#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+#: sysdeps/osf1/siglist.c:57 sysdeps/sun4/siglist.c:57
 msgid "User defined signal 1"
 msgstr "Сигнал на потребител 1"

-#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+#: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Сигнал на потребител 2"
--- a/po/bn.po
+++ b/po/bn.po
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -0,0 +1,243 @@
+# Bengali India  translation of libgtop.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+# This file is distributed under the same license as the libgtop package.
+# Vat <vatzcar@yahoo.co.in>, 2003.
+# Mahay Alam Khan <makl10n@yahoo.com>, 2005.
+# Samia Niamatullah <mailsamia2001@yahoo.com>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libgtop\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-09-01 01:20+0200\n"
+"PO-Revision-Date: 2006-08-07 12:47+0530\n"
+"Last-Translator: Runa Bhattacharjee <runabh@gmail.com>\n"
+"Language-Team: Bengali India\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
+"X-Generator: KBabel 1.9.1\n"
+
+#: ../lib/read.c:65
+#, c-format
+msgid "read %d byte"
+msgid_plural "read %d bytes"
+msgstr[0] "%d বাইট পড়া হয়েছে"
+msgstr[1] "%d বাইট পড়া হয়েছে"
+
+# msgstr "%d বাইট পড়া গেছে"  "ড়" এর জায়গায় "ডহ্হা" লেখা
+# #########################################
+# দয়া করে "গেছে" এর পরিবর্তে "গিয়েছে" লিখেন
+# #########################################
+#: ../lib/read_data.c:53
+msgid "read data size"
+msgstr "তথ্যের মাপ পড়া হবে"
+
+#: ../lib/read_data.c:72
+#, c-format
+msgid "read %lu byte of data"
+msgid_plural "read %lu bytes of data"
+msgstr[0] "%lu বাইট তথ্য পড়া হয়েছে"
+msgstr[1] "%lu বাইট তথ্য পড়া হয়েছে"
+
+# msgstr "%d বাইট তথ্য পড়া গেছে"
+# msgstr "%d বাইট তথ্য পড়া হোক"
+#: ../lib/write.c:53
+#, c-format
+msgid "wrote %d byte"
+msgid_plural "wrote %d bytes"
+msgstr[0] "%d বাইট লেখা হয়েছে"
+msgstr[1] "%d বাইট লেখা হয়েছে"
+
+# msgstr "%d বাইট লেখা হয়েছে"
+#: ../src/daemon/gnuserv.c:460
+msgid "Enable debugging"
+msgstr "ডিবাগ ব্যবস্থা সক্রিয় করুন"
+
+# msgstr "ডিবাগ প্রক্রিয়া সক্রিয় করা হোক"
+# ২ এটা কি বিবেচনা করা যায় না? অন্যান্য জায়গায় "ডিবাগ" লেখা হইছে, তাই এখানে অন্য রকম হয়ে যায়।
+# আপনার আপত্তি থাকলে অবশ্য কোন কথা নাই।
+#: ../src/daemon/gnuserv.c:460
+msgid "DEBUG"
+msgstr "DEBUG"
+
+# msgstr "ডিবাগ"
+#: ../src/daemon/gnuserv.c:462
+msgid "Enable verbose output"
+msgstr "বিস্তারিত (ভার্বোস) আউটপুট সক্রিয় করা হবে"
+
+# msgstr "ভার্বোস (Verbose) ফলাফল চালু করুন"
+# msgstr "বর্ণনাযুক্ত ফলাফল দেখানো হোক"
+#: ../src/daemon/gnuserv.c:462
+msgid "VERBOSE"
+msgstr "VERBOSE"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "Don't fork into background"
+msgstr "পটভূমিতে fork করা হবে না"
+
+#: ../src/daemon/gnuserv.c:464
+msgid "NO-DAEMON"
+msgstr "NO-DAEMON"
+
+#: ../src/daemon/gnuserv.c:466
+msgid "Invoked from inetd"
+msgstr "inetd থেকে আরম্ভ করা হয়েছে"
+
+#: ../src/daemon/gnuserv.c:466
+msgid "INETD"
+msgstr "INETD"
+
+#: ../src/daemon/gnuserv.c:500
+#, c-format
+msgid ""
+"Error on option %s: %s.\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"%s বিকল্পে সমস্যা: %s.\n"
+"কমান্ত-লাইন থেকে ব্যবহারযোগ্য সমস্ত বিকল্পের সম্পূর্ণ তালিকা দেখতে '%s --help' প্রয়োগ "
+"করুন।\n"
+
+# msgstr "সিস্টেম বুট হবার পর থেকে নিষ্ক্রিয় কাজে অতিবাহিত সময় (সেকেন্ডে)"
+#: ../sysdeps/osf1/siglist.c:29 ../sysdeps/sun4/siglist.c:29
+msgid "Hangup"
+msgstr "বন্ধ করুন"
+
+#: ../sysdeps/osf1/siglist.c:30 ../sysdeps/sun4/siglist.c:30
+msgid "Interrupt"
+msgstr "ইন্টারাপ্ট উৎপন্ন করুন"
+
+#: ../sysdeps/osf1/siglist.c:31 ../sysdeps/sun4/siglist.c:31
+msgid "Quit"
+msgstr "প্রস্থান"
+
+# msgstr "প্রস্থান"
+#: ../sysdeps/osf1/siglist.c:32 ../sysdeps/sun4/siglist.c:32
+msgid "Illegal instruction"
+msgstr "অবৈধ নির্দেশ"
+
+# msgstr "অবৈধ ইনস্ট্রাকশন"
+# Instruction এখানে Technical term।
+#: ../sysdeps/osf1/siglist.c:33 ../sysdeps/sun4/siglist.c:33
+msgid "Trace trap"
+msgstr "ট্রেস ট্র্যাপ"
+
+# ২ এটা আসলে ঠিক বোঝা যাচ্ছে না। তাই মনে হয় বাদ রাখাই ভাল
+#: ../sysdeps/osf1/siglist.c:34 ../sysdeps/sun4/siglist.c:34
+msgid "Abort"
+msgstr "অস্বাভাবিক প্রস্থান"
+
+# msgstr "বন্ধ করা"
+#: ../sysdeps/osf1/siglist.c:35 ../sysdeps/sun4/siglist.c:35
+msgid "EMT error"
+msgstr "EMT সংক্রান্ত সমস্যা"
+
+#: ../sysdeps/osf1/siglist.c:36 ../sysdeps/sun4/siglist.c:36
+msgid "Floating-point exception"
+msgstr "ফ্লোটিং-পয়েন্ট এক্সেপশন"
+
+# msgstr "ভগ্নাংশ সংক্রান্ত ব্যতীক্রম" <-- বানান ভুল
+#: ../sysdeps/osf1/siglist.c:37 ../sysdeps/sun4/siglist.c:37
+msgid "Kill"
+msgstr "Kill করুন"
+
+# msgstr "শেষ করা (Kill)"
+#: ../sysdeps/osf1/siglist.c:38 ../sysdeps/sun4/siglist.c:38
+msgid "Bus error"
+msgstr "বাস সংক্রান্ত সমস্যা"
+
+# msgstr "বাস (Bus) সংক্রান্ত সমস্যা"
+#: ../sysdeps/osf1/siglist.c:39 ../sysdeps/sun4/siglist.c:39
+msgid "Segmentation violation"
+msgstr "সেগমেন্টেশন সংক্রান্ত সমস্যা"
+
+#: ../sysdeps/osf1/siglist.c:40 ../sysdeps/sun4/siglist.c:40
+msgid "Bad argument to system call"
+msgstr "সিস্টেম-কল'এ ভুল আর্গুমেন্ট প্রেরিত হয়েছে"
+
+# msgstr "সিস্টেম call এ ভুল মান প্রেরিত হয়েছে"
+#: ../sysdeps/osf1/siglist.c:41 ../sysdeps/sun4/siglist.c:41
+msgid "Broken pipe"
+msgstr "ক্ষতিগ্রস্ত পাইপ"
+
+# msgstr "অচল পাইপ"
+#: ../sysdeps/osf1/siglist.c:42 ../sysdeps/sun4/siglist.c:42
+msgid "Alarm clock"
+msgstr "অ্যালার্ম ঘড়ি"
+
+#: ../sysdeps/osf1/siglist.c:43 ../sysdeps/sun4/siglist.c:43
+msgid "Termination"
+msgstr "সমাপ্তি"
+
+#: ../sysdeps/osf1/siglist.c:44 ../sysdeps/sun4/siglist.c:44
+msgid "Urgent condition on socket"
+msgstr "সকেটে গুরুতর অবস্থা"
+
+#: ../sysdeps/osf1/siglist.c:45 ../sysdeps/sun4/siglist.c:45
+msgid "Stop"
+msgstr "বন্ধ করুন"
+
+#: ../sysdeps/osf1/siglist.c:46 ../sysdeps/sun4/siglist.c:46
+msgid "Keyboard stop"
+msgstr "কি-বোর্ড বন্ধ করুন"
+
+# ২ কীবোর্ড
+#: ../sysdeps/osf1/siglist.c:47 ../sysdeps/sun4/siglist.c:47
+msgid "Continue"
+msgstr "এগিয়ে চলুন"
+
+#: ../sysdeps/osf1/siglist.c:48 ../sysdeps/sun4/siglist.c:48
+msgid "Child status has changed"
+msgstr "চাইল্ডের অবস্থা পরিবর্তিত হয়েছে"
+
+#: ../sysdeps/osf1/siglist.c:49 ../sysdeps/sun4/siglist.c:49
+msgid "Background read from tty"
+msgstr "পটভূমিতে tty'থেকে পড়া হচ্ছে"
+
+# ভাল হইলো না
+#: ../sysdeps/osf1/siglist.c:50 ../sysdeps/sun4/siglist.c:50
+msgid "Background write to tty"
+msgstr "পটভূমিতে tty'এ লেখা হচ্ছে"
+
+#: ../sysdeps/osf1/siglist.c:51 ../sysdeps/sun4/siglist.c:51
+msgid "I/O now possible"
+msgstr "I/O বর্তমানে করা সম্ভব"
+
+#: ../sysdeps/osf1/siglist.c:52 ../sysdeps/sun4/siglist.c:52
+msgid "CPU limit exceeded"
+msgstr "CPU'র সীমা অতিক্রান্ত"
+
+#: ../sysdeps/osf1/siglist.c:53 ../sysdeps/sun4/siglist.c:53
+msgid "File size limit exceeded"
+msgstr "ফাইলের মাপের সীমা অতিক্রান্ত"
+
+# msgstr "ফাইলের আয়তন সীমা ছাড়িয়ে গেছে"
+#: ../sysdeps/osf1/siglist.c:54 ../sysdeps/sun4/siglist.c:54
+msgid "Virtual alarm clock"
+msgstr "ভার্চুয়াল অ্যালার্ম ঘড়ি"
+
+# msgstr "কাল্পনিক এলার্ম ঘড়ি"
+#: ../sysdeps/osf1/siglist.c:55 ../sysdeps/sun4/siglist.c:55
+msgid "Profiling alarm clock"
+msgstr "অ্যালার্ম ঘড়ি প্রোফাইল করা হবে"
+
+#: ../sysdeps/osf1/siglist.c:56 ../sysdeps/sun4/siglist.c:56
+msgid "Window size change"
+msgstr "উইন্ডোর মাপে পরিবর্তন"
+
+# msgstr "উইন্ডো'র আয়তন পরিবর্তন"
+# Window এর বাংলা করার দরকার নাই
+#: ../sysdeps/osf1/siglist.c:57 ../sysdeps/sun4/siglist.c:57
+msgid "Information request"
+msgstr "তথ্যের অনুরোধ"
+
+# msgstr "তথ্যের আবেদন"
+#: ../sysdeps/osf1/siglist.c:58 ../sysdeps/sun4/siglist.c:58
+msgid "User defined signal 1"
+msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ১"
+
+#: ../sysdeps/osf1/siglist.c:59 ../sysdeps/sun4/siglist.c:59
+msgid "User defined signal 2"
+msgstr "ব্যবহারকারী নির্ধারিত সিগনাল ২"
--- a/po/bs.po
+++ b/po/bs.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-02 12:29+0100\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2005-01-02 15:10+0100\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

-#: lib/read.c:64
+#: lib/read.c:65
 #, c-format
 msgid "read %d byte"
 msgid_plural "read %d bytes"
@@ -25,11 +25,11 @@ msgstr[0] "přečten %d bajt"
 msgstr[1] "přečteny %d bajty"
 msgstr[2] "přečteno %d bajtů"

-#: lib/read_data.c:52
+#: lib/read_data.c:53
 msgid "read data size"
 msgstr "velikost přečtených dat"

-#: lib/read_data.c:71
+#: lib/read_data.c:72
 #, c-format
 msgid "read %lu byte of data"
 msgid_plural "read %lu bytes of data"
@@ -37,7 +37,7 @@ msgstr[0] "přečten %lu bajt dat"
 msgstr[1] "přečteny %lu bajty dat"
 msgstr[2] "přečteno %lu bajtů dat"

-#: lib/write.c:51
+#: lib/write.c:52
 #, c-format
 msgid "wrote %d byte"
 msgid_plural "wrote %d bytes"
@@ -45,39 +45,39 @@ msgstr[0] "zapsán %d bajt"
 msgstr[1] "zapsány %d bajty"
 msgstr[2] "zapsáno %d bajtů"

-#: src/daemon/gnuserv.c:461
+#: src/daemon/gnuserv.c:460
 msgid "Enable debugging"
 msgstr "Povolit ladění"

-#: src/daemon/gnuserv.c:461
+#: src/daemon/gnuserv.c:460
 msgid "DEBUG"
 msgstr "LADĚNÍ"

-#: src/daemon/gnuserv.c:463
+#: src/daemon/gnuserv.c:462
 msgid "Enable verbose output"
 msgstr "Povolit podrobný výstup"

-#: src/daemon/gnuserv.c:463
+#: src/daemon/gnuserv.c:462
 msgid "VERBOSE"
 msgstr "PODROBNĚ"

-#: src/daemon/gnuserv.c:465
+#: src/daemon/gnuserv.c:464
 msgid "Don't fork into background"
 msgstr "Neforkovat do pozadí"

-#: src/daemon/gnuserv.c:465
+#: src/daemon/gnuserv.c:464
 msgid "NO-DAEMON"
 msgstr "NE-DÉMON"

-#: src/daemon/gnuserv.c:467
+#: src/daemon/gnuserv.c:466
 msgid "Invoked from inetd"
 msgstr "Spuštěn z inetd"

-#: src/daemon/gnuserv.c:467
+#: src/daemon/gnuserv.c:466
 msgid "INETD"
 msgstr "INETD"

-#: src/daemon/gnuserv.c:501
+#: src/daemon/gnuserv.c:500
 #, c-format
 msgid ""
 "Error on option %s: %s.\n"
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-29 20:31+0100\n"
+"POT-Creation-Date: 2005-09-25 18:15+0200\n"
 "PO-Revision-Date: 2005-08-29 20:39+0100\n"
 "Last-Translator: Bryn Salisbury <bryn@randomlyevil.org.uk>\n"
 "Language-Team: Welsh <gnome-cy@www.linux.org>\n"
@@ -205,966 +205,3 @@ msgstr "Arwydd diffiniwyd gan y defnyddiwr 1"
 #: sysdeps/osf1/siglist.c:58 sysdeps/sun4/siglist.c:58
 msgid "User defined signal 2"
 msgstr "Arwydd diffiniwyd gan y defnyddiwr 2"
-
-#~ msgid "Ticks (%ld per second):"
-#~ msgstr "Ticiau (%ld yr eiliad):"
-
-#~ msgid "Total"
-#~ msgstr "Cyfanswm"
-
-#~ msgid "User"
-#~ msgstr "Defnyddiwr"
-
-#~ msgid "Nice"
-#~ msgstr "Neis"
-
-#~ msgid "Sys"
-#~ msgstr "Sys"
-
-#~ msgid "Idle"
-#~ msgstr "Segur"
-
-#~ msgid ""
-#~ "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-#~ "\n"
-#~ msgstr ""
-#~ "CPU          (0x%08lx): %12.0f %12.0f %12.0f %12.0f %12.0f\n"
-#~ "\n"
-
-#~ msgid "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-#~ msgstr "CPU %3d      (0x%08lx): %12lu %12lu %12lu %12lu %12lu\n"
-
-#~ msgid "Percent:"
-#~ msgstr "Canran:"
-
-#~ msgid "Total (%)"
-#~ msgstr "Cyfanswm (%)"
-
-#~ msgid "User (%)"
-#~ msgstr "Defnyddiwr (%)"
-
-#~ msgid "Nice (%)"
-#~ msgstr "Neis (%)"
-
-#~ msgid "Sys (%)"
-#~ msgstr "Sys (%)"
-
-#~ msgid "Idle (%)"
-#~ msgstr "Segur (%)"
-
-#~ msgid ""
-#~ "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-#~ "\n"
-#~ msgstr ""
-#~ "CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-#~ "\n"
-
-#~ msgid "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-#~ msgstr "CPU %3d      (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n"
-
-#~ msgid "Spin:"
-#~ msgstr "Troelli:"
-
-#~ msgid "read data %d byte"
-#~ msgid_plural "read data %d bytes"
-#~ msgstr[0] "data darllen %d beit"
-#~ msgstr[1] "data darllen %d feit"
-
-#~ msgid "Total CPU Time"
-#~ msgstr "Cyfanswm Amser CPU"
-
-#~ msgid "CPU Time in User Mode"
-#~ msgstr "Amser CPU Modd Defnyddiwr"
-
-#~ msgid "CPU Time in User Mode (nice)"
-#~ msgstr "Amser CPU Modd Defnyddiwr (neis)"
-
-#~ msgid "CPU Time in System Mode"
-#~ msgstr "Amser CPU Modd System"
-
-#~ msgid "CPU Time in the Idle Task"
-#~ msgstr "Amser CPU yn y Tasg Segur"
-
-#~ msgid "Tick Frequency"
-#~ msgstr "Amledd Tic"
-
-#~ msgid "SMP Total CPU Time"
-#~ msgstr "Cyfanswm Amser CPU SMP"
-
-#~ msgid "SMP CPU Time in User Mode"
-#~ msgstr "Amser CPU SMP Modd Defnyddiwr"
-
-#~ msgid "SMP CPU Time in User Mode (nice)"
-#~ msgstr "Amser CPU SMP Modd Defnyddiwr (neis)"
-
-#~ msgid "SMP CPU Time in System Mode"
-#~ msgstr "Amser CPU SMP Modd System"
-
-#~ msgid "SMP CPU Time in the Idle Task"
-#~ msgstr "Amser CPU SMP yn y Tasg Segur"
-
-#~ msgid "SMP CPU Flags"
-#~ msgstr "Banneri CPU SMP"
-
-#~ msgid "Number of clock ticks since system boot"
-#~ msgstr "Nifer o diciau cloc ers fwtio'r system"
-
-#~ msgid "Number of clock ticks the system spent in user mode"
-#~ msgstr "Nifer o diciau cloc gwariodd y system yn y modd defnyddiwr"
-
-#~ msgid "Number of clock ticks the system spent in user mode (nice)"
-#~ msgstr "Nifer o diciau cloc gwariodd y system yn y modd defnyddiwr (neis)"
-
-#~ msgid "Number of clock ticks the system spent in system mode"
-#~ msgstr "Nifer o diciau cloc gwariodd y system yn y modd system"
-
-#~ msgid "Number of clock ticks the system spent in the idle task"
-#~ msgstr "Nifer o diciau cloc gwariodd y system yn y tasg segur"
-
-#~ msgid "Tick frequency (default is 100)"
-#~ msgstr "Amledd tic (100 yw'r rhagoosdiad)"
-
-#~ msgid "Bit field indicating which CPU is currently running"
-#~ msgstr "Maes did yn penod i pa CPU sy'n rhedeg yn gyfredol"
-
-#~ msgid "Total blocks"
-#~ msgstr "Cyfanswm blociau"
-
-#~ msgid "Free blocks"
-#~ msgstr "Blociau rhydd"
-
-#~ msgid "Available blocks"
-#~ msgstr "Blociau ar gael"
-
-#~ msgid "Total file nodes"
-#~ msgstr "Cyfanswm nodau ffeil"
-
-#~ msgid "Free file nodes"
-#~ msgstr "Nodau ffeil rhydd"
-
-#~ msgid "Block size"
-#~ msgstr "Maint bloc"
-
-#~ msgid "Free blocks available to the superuser"
-#~ msgstr "Blociau rhydd ar gael i'r uwchddefnyddiwr"
-
-#~ msgid "Free blocks available to non-superusers"
-#~ msgstr "Blociau rhydd ar gale i nid-uwchddefnyddwyr"
-
-#~ msgid "Load Average"
-#~ msgstr "Cyfartaledd Llwyth"
-
-#~ msgid "Running Tasks"
-#~ msgstr "Tasgiau sy'n Rhedeg"
-
-#~ msgid "Number of Tasks"
-#~ msgstr "Nifer o Dasgiau"
-
-#~ msgid "Last PID"
-#~ msgstr "PID Diwethaf"
-
-#~ msgid ""
-#~ "Number of jobs running simultaneously averaged over 1, 5 and 15 minutes"
-#~ msgstr ""
-#~ "Nifer o dasgau'n rhedeg ar yr un pryd wedi eu cyfartaleddu dros 1, 5 a 15 "
-#~ "munud"
-
-#~ msgid "Number of tasks currently running"
-#~ msgstr "Y nifer o dasgiau'n rhedeg yn gyfredol"
-
-#~ msgid "Total number of tasks"
-#~ msgstr "Cyfanswm y tasgau"
-
-#~ msgid "Total Memory"
-#~ msgstr "Cyfanswm Cof"
-
-#~ msgid "Used Memory"
-#~ msgstr "Cof Mewn Defnydd"
-
-#~ msgid "Free Memory"
-#~ msgstr "Cof Rhydd"
-
-#~ msgid "Shared Memory"
-#~ msgstr "Cof Rhannedig"
-
-#~ msgid "Buffers"
-#~ msgstr "Byffrau"
-
-#~ msgid "Cached"
-#~ msgstr "Yn Y Storfa"
-
-#~ msgid "Locked"
-#~ msgstr "Wedi Cloi"
-
-#~ msgid "Total physical memory in kB"
-#~ msgstr "Cyfanswm cof ffisegol mewn cB"
-
-#~ msgid "Used memory size in kB"
-#~ msgstr "Maint cof mewn defnydd mewn cB"
-
-#~ msgid "Free memory size in kB"
-#~ msgstr "Maint cof rhydd mewn cB"
-
-#~ msgid "Shared memory size in kB"
-#~ msgstr "Maint cof rhannedig mewn cB"
-
-#~ msgid "Size of buffers kB"
-#~ msgstr "Maint byffrau mewn cB"
-
-#~ msgid "Size of cached memory in kB"
-#~ msgstr "Maint storfa cof mewn cB"
-
-#~ msgid "Memory used from user processes in kB"
-#~ msgstr "Cof a ddefnyddir gan brosesau defnyddwyr mewn cB"
-
-#~ msgid "Memory in locked pages in kB"
-#~ msgstr "Cof mewn tudalennau cloedig mewn cB"
-
-#~ msgid "Number of list elements"
-#~ msgstr "Nifer o elfennau rhestr"
-
-#~ msgid "Total size of list"
-#~ msgstr "Maint cyfan y rhestr"
-
-#~ msgid "Size of a single list element"
-#~ msgstr "Maint elfen rhestr sengl"
-
-#~ msgid "Size in kilobytes of message pool"
-#~ msgstr "Maint mewn cilobeitiau y pwll negeseuon"
-
-#~ msgid "Number of entries in message map"
-#~ msgstr "Nifer o elfennau yn y map negeseuon"
-
-#~ msgid "Max size of message"
-#~ msgstr "Maint mwyaf neges"
-
-#~ msgid "Default max size of queue"
-#~ msgstr "Maint mwyaf rhagosod ciw"
-
-#~ msgid "Max queues system wide"
-#~ msgstr "Maint ciwiau system-eang"
-
-#~ msgid "Message segment size"
-#~ msgstr "Maint segment neges"
-
-#~ msgid "Number of system message headers"
-#~ msgstr "Nifer o benawdau neges system"
-
-#~ msgid "Interface Flags"
-#~ msgstr "Banneri Rhyngwyneb"
-
-#~ msgid "MTU"
-#~ msgstr "MTU"
-
-#~ msgid "IPv4 Subnet"
-#~ msgstr "Isrhwyd IPv4"
-
-#~ msgid "IPv4 Address"
-#~ msgstr "Cyfeiriad IPv4"
-
-#~ msgid "Packets In"
-#~ msgstr "Pecynnau Mewn"
-
-#~ msgid "Packets Out"
-#~ msgstr "Pecynnau Allan"
-
-#~ msgid "Packets Total"
-#~ msgstr "Cyfanswm Pecynnau"
-
-#~ msgid "Bytes In"
-#~ msgstr "Beitiau Mewn"
-
-#~ msgid "Bytes Out"
-#~ msgstr "Beitiau Allan"
-
-#~ msgid "Bytes Total"
-#~ msgstr "Cyfanswm Beitiau"
-
-#~ msgid "Errors In"
-#~ msgstr "Gwallau Mewn"
-
-#~ msgid "Errors Out"
-#~ msgstr "Gwallau Allan"
-
-#~ msgid "Errors Total"
-#~ msgstr "Cyfanswm Gwallau"
-
-#~ msgid "Collisions"
-#~ msgstr "Gwrthdrawiadau"
-
-#~ msgid "IPv6 Address"
-#~ msgstr "Cyfeiriad IPv6"
-
-#~ msgid "IPv6 Prefix"
-#~ msgstr "Rhagddodiad IPv6"
-
-#~ msgid "IPv6 Scope"
-#~ msgstr "Cwmpas IPv6"
-
-#~ msgid "Maximum Transfer Unit"
-#~ msgstr "Uned Cludo Mwyaf"
-
-#~ msgid "PPP State"
-#~ msgstr "Cyflwr PPP"
-
-#~ msgid "Input bytes"
-#~ msgstr "Beitiau mewnbwn"
-
-#~ msgid "Output bytes"
-#~ msgstr "Beitiau allbwn"
-
-#~ msgid "Number of input bytes"
-#~ msgstr "Nifer o feitiau mewnbwn"
-
-#~ msgid "Number of output bytes"
-#~ msgstr "Nifer o feitiau allbwn"
-
-#~ msgid "Size"
-#~ msgstr "Maint"
-
-#~ msgid "Length in bytes of the returned string."
-#~ msgstr "Hyd mewn beitiau y llinyn a ddychwelir"
-
-#~ msgid "K_Flags"
-#~ msgstr "K_Flags"
-
-#~ msgid "Min_Flt"
-#~ msgstr "Min_Flt"
-
-#~ msgid "Maj_Flt"
-#~ msgstr "Maj_Flt"
-
-#~ msgid "CMin_Flt"
-#~ msgstr "CMin_Flt"
-
-#~ msgid "CMaj_Flt"
-#~ msgstr "CMaj_Flt"
-
-#~ msgid "KStk_ESP"
-#~ msgstr "KStk_ESP"
-
-#~ msgid "KStk_EIP"
-#~ msgstr "KStk_EIP"
-
-#~ msgid "NWChan"
-#~ msgstr "NWChan"
-
-#~ msgid "WChan"
-#~ msgstr "WChan"
-
-#~ msgid ""
-#~ "Kernel flags of the process.\n"
-#~ "\n"
-#~ "On Linux, currently every flag has the math bit set, because crt0.s "
-#~ "checks for math emulation, so this is not included in the output.\n"
-#~ "\n"
-#~ "This is probably a bug, as not every process is a compiled C program.\n"
-#~ "\n"
-#~ "The math bit should be a decimal 4, and the traced bit is decimal 10."
-#~ msgstr ""
-#~ "Banneri cnewyllyn y proses.\n"
-#~ "\n"
-#~ "Ar Linux, mae gan bob baner y did mathemateg wedi ei osod, gan fod crt0.s "
-#~ "yn edrych am efelychiad mathematg, felly ni chynhwysir hyn yn yr allbwn.\n"
-#~ "\n"
-#~ "Mae hyn mwynathebyg yn wall, gan nad yw pob proses yn rhaglen C "
-#~ "crynhoedig.\n"
-#~ "\n"
-#~ "Dylai'r did mathemateg fod yn 4 degol, a'r bit trywyddu yn 10 degol."
-
-#~ msgid ""
-#~ "The number of minor faults the process has made, those which have not "
-#~ "required loading a memory page from disk."
-#~ msgstr ""
-#~ "Nifer o wallau bychan mae'r proses wedi ei wneud, rheiny nad ydynt wedi "
-#~ "angen llwytho tudalen cof o'r disg."
-
-#~ msgid ""
-#~ "The number of major faults the process has made, those which have "
-#~ "required loading a memory page from disk."
-#~ msgstr ""
-#~ "Nifer o wallau mawr mae'r proses wedi ei wneud, rheiny sydd wedi angen "
-#~ "llwytho tudalen cof o'r disg."
-
-#~ msgid ""
-#~ "The number of minor faults that the process and its children have made."
-#~ msgstr "Y nifer o wallau bychan mae'r proses a'i blant wedi eu gwneud."
-
-#~ msgid ""
-#~ "The number of major faults that the process and its children have made."
-#~ msgstr "Y nifer o wallau mawr mae'r proses a'i blant wedi eu gwneud."
-
-#~ msgid ""
-#~ "The current value of esp (32-bit stack pointer), as found in the kernel "
-#~ "stack page for the process."
-#~ msgstr ""
-#~ "Gwerth cyfredol yr ESP (pwyntydd stac 32-did), fel a chanfuir yn nhydalen "
-#~ "stac y cnewyllyn ar gyfer y proses."
-
-#~ msgid "The current EIP (32-bit instruction pointer)."
-#~ msgstr "Yr EIP cyfredol (pwyntydd cyfarwyddiad 32-did)."
-
-#~ msgid ""
-#~ "This is the \"channel\" in which the process is waiting.  This is the "
-#~ "address of a system call, and can be looked up in a namelist if you need "
-#~ "a textual name.  (If you have an up-to-date /etc/psdatabase, then try ps -"
-#~ "l to see the WCHAN field in action)"
-#~ msgstr ""
-#~ "Dyma'r \"sianel\" mae'r proses yn aros ynddi. Dyma gyfeiriad galwad "
-#~ "system, a gellir ei edrych i fyny mewn rhestr enw os ydych angen enw "
-#~ "testunol. (Os mae /etc/psdatabase diweddar gennych, ceisiwch ps -l er "
-#~ "mwyn gweld y maes WCHAN ar waith)"
-
-#~ msgid "This is the textual name of the `nwchan' field."
-#~ msgstr "Dyma enw testun y maes `nwchan'."
-
-#~ msgid "Virtual"
-#~ msgstr "Rhithwyr"
-
-#~ msgid "Resident"
-#~ msgstr "Preswyl"
-
-#~ msgid "Share"
-#~ msgstr "Rhannu"
-
-#~ msgid "Resident Set Size"
-#~ msgstr "Maint Set Preswyl"
-
-#~ msgid "Resident Set Size Limit"
-#~ msgstr "Cyfwmng Maint Set Preswyl"
-
-#~ msgid "Total # of pages of memory"
-#~ msgstr "Cyfanswm nifer o dydalennau mewn cof"
-
-#~ msgid "Number of pages of virtual memory"
-#~ msgstr "Nifer o dudalennau o gof rhithwir"
-
-#~ msgid "Number of resident set (non-swapped) pages"
-#~ msgstr "Nifer o dudalennau set preswyl (heb eu cyfnewid)"
-
-#~ msgid "Number of pages of shared (mmap'd) memory"
-#~ msgstr "Nifer o dudalennau o gof wedi ei rhannu (wedi mmap()io)"
-
-#~ msgid ""
-#~ "Number of pages the process has in real memory, minus 3 for "
-#~ "administrative purposes. This is just the pages which count towards text, "
-#~ "data, or stack space. This does not include pages which have not been "
-#~ "demand-loaded in, or which are swapped out."
-#~ msgstr ""
-#~ "Nifer y tudalennau sydd gan y proses mewn gwir gof, llai 3 ar gyfer "
-#~ "rhesymau gweinyddol. Dim ond y tudalennau sy'n cyfri at ofod testun, data "
-#~ "neu stac yw hyn. Nid yw hyn yn cynnwys tudalennau a gafwyd eu llwytho i "
-#~ "fewn ar gais, neu sydd wedi eu cyfnewid allan."
-
-#~ msgid ""
-#~ "Current limit in bytes on the rss of the process (usually 2,147,483,647)."
-#~ msgstr ""
-#~ "Y cyfwng presenol mewn beitiau ar RSS y proses (fel arfer 2,147,483,647)."
-
-#~ msgid "Text_RSS"
-#~ msgstr "Text_RSS"
-
-#~ msgid "ShLib_RSS"
-#~ msgstr "ShLib_RSS"
-
-#~ msgid "Data_RSS"
-#~ msgstr "Data_RSS"
-
-#~ msgid "Stack_RSS"
-#~ msgstr "Stack_RSS"
-
-#~ msgid "Dirty Size"
-#~ msgstr "Maint Brwnt"
-
-#~ msgid "Start_Code"
-#~ msgstr "Start_Code"
-
-#~ msgid "End_Code"
-#~ msgstr "End_Code"
-
-#~ msgid "Start_Stack"
-#~ msgstr "Start_Stack"
-
-#~ msgid "Text resident set size"
-#~ msgstr "Maint set preswyl testun"
-
-#~ msgid "Shared-Lib resident set size"
-#~ msgstr "Maint set preswyl llyfrgellau rhanedig"
-
-#~ msgid "Data resident set size"
-#~ msgstr "Maint set preswyl data"
-
-#~ msgid "Stack resident set size"
-#~ msgstr "Maint set preswyl stac"
-
-#~ msgid "Total size of dirty pages"
-#~ msgstr "Cyfanswm maint tudalennau brwnt"
-
-#~ msgid "Address of beginning of code segment"
-#~ msgstr "Cyfeiriad dechrau y segment côd"
-
-#~ msgid "Address of end of code segment"
-#~ msgstr "Cyfeiriad diwedd y segment côd"
-
-#~ msgid "Address of the bottom of stack segment"
-#~ msgstr "Cyfeiriad gwaelod y segment stac"
-
-#~ msgid "Signal"
-#~ msgstr "Arwydd"
-
-#~ msgid "Blocked"
-#~ msgstr "Wedi Blocio"
-
-#~ msgid "SigIgnore"
-#~ msgstr "SigIgnore"
-
-#~ msgid "SigCatch"
-#~ msgstr "SigCatch"
-
-#~ msgid "Mask of pending signals"
-#~ msgstr "Masg signalau disgwyl"
-
-#~ msgid "Mask of blocked signals"
-#~ msgstr "Masg signalau wedi eu blocio"
-
-#~ msgid "Mask of ignored signals"
-#~ msgstr "Masg signalau a anwybyddir"
-
-#~ msgid "Mask of caught signals"
-#~ msgstr "Masg signalau a ddelir"
-
-#~ msgid "Cmd"
-#~ msgstr "Cmd"
-
-#~ msgid "State"
-#~ msgstr "Cyflwr"
-
-#~ msgid "UID"
-#~ msgstr "UID"
-
-#~ msgid "GID"
-#~ msgstr "GID"
-
-#~ msgid "RGid"
-#~ msgstr "RGid"
-
-#~ msgid "RUid"
-#~ msgstr "RUid"
-
-#~ msgid "HasCPU"
-#~ msgstr "EfoCPU"
-
-#~ msgid "Proc"
-#~ msgstr "Proc"
-
-#~ msgid "LProc"
-#~ msgstr "LProc"
-
-#~ msgid "Basename of executable file in call to exec()"
-#~ msgstr "Enw sail y ffeil gweithredadwy yn y galwad i exec()"
-
-#~ msgid "Single-Char code for process state (S=sleeping)"
-#~ msgstr "Côd un nod ar gyfer cyflwr y proses (S=cysgu)"
-
-#~ msgid "UID of process"
-#~ msgstr "UID y proses"
-
-#~ msgid "GID of process"
-#~ msgstr "GID y proses"
-
-#~ msgid "Real UID of process"
-#~ msgstr "UID go iawngo iawn  y proses"
-
-#~ msgid "Real GID of process"
-#~ msgstr "GID go iawn y proses"
-
-#~ msgid "Has CPU"
-#~ msgstr "Efo CPU"
-
-#~ msgid "Processor"
-#~ msgstr "Prosesydd"
-
-#~ msgid "Last Processor"
-#~ msgstr "Prosesydd Diweddaf"
-
-#~ msgid "Start_Time"
-#~ msgstr "Start_Time"
-
-#~ msgid "RTime"
-#~ msgstr "RTime"
-
-#~ msgid "UTime"
-#~ msgstr "UTime"
-
-#~ msgid "STime"
-#~ msgstr "STime"
-
-#~ msgid "CUTime"
-#~ msgstr "CUTime"
-
-#~ msgid "CSTime"
-#~ msgstr "CSTime"
-
-#~ msgid "TimeOut"
-#~ msgstr "TimeOut"
-
-#~ msgid "It_Real_Value"
-#~ msgstr "It_Real_Value"
-
-#~ msgid "Frequency"
-#~ msgstr "Amledd"
-
-#~ msgid "XCPU_UTime"
-#~ msgstr "XCPU_UTime"
-
-#~ msgid "XCPU_STime"
-#~ msgstr "XCPU_STime"
-
-#~ msgid "Start time of process in seconds since the epoch"
-#~ msgstr "Amser cychwyn y proses mewn eiliadau ers yr epoc"
-
-#~ msgid "Real time accumulated by process (should be utime + stime)"
-#~ msgstr "Gwir amser a gasglwyd gan y proses (dylai god utime + stime)"
-
-#~ msgid "user-mode CPU time accumulated by process"
-#~ msgstr "amser CPU modd defnyddiwr a gasglwyd gan y proses"
-
-#~ msgid "kernel-mode CPU time accumulated by process"
-#~ msgstr "amser CPU modd cnewyllyn a gasglwyd gan y proses"
-
-#~ msgid "cumulative utime of process and reaped children"
-#~ msgstr "utime cynyddol y proses a plant a gafodd eu medi"
-
-#~ msgid "cumulative stime of process and reaped children"
-#~ msgstr "utime cynyddol y proses a plant a gafodd eu medi"
-
-#~ msgid "The time (in jiffies) of the process's next timeout"
-#~ msgstr "Amser (mewn jiffiau) diwedd amser nesa'r proses"
-
-#~ msgid ""
-#~ "The time (in jiffies) before the next SIGALRM is sent to the process due "
-#~ "to an interval timer."
-#~ msgstr ""
-#~ "Yr amser (mewn jiffiau) cyn caiff y SIGALRM nesaf ei anfon i'r proses "
-#~ "oherwydd amserydd ysbaid."
-
-#~ msgid "Tick frequency"
-#~ msgstr "Amledd tic"
-
-#~ msgid "SMP user-mode CPU time accumulated by process"
-#~ msgstr "Amser CPU SMP modd defnyddiwr a gasglwyd gan y proses"
-
-#~ msgid "SMP kernel-mode CPU time accumulated by process"
-#~ msgstr "Amser CPU SMP modd cnewyllyn a gasglwyd gan y proses"
-
-#~ msgid "Uid"
-#~ msgstr "Uid"
-
-#~ msgid "EUid"
-#~ msgstr "EUid"
-
-#~ msgid "Gid"
-#~ msgstr "Gid"
-
-#~ msgid "EGid"
-#~ msgstr "EGid"
-
-#~ msgid "SUid"
-#~ msgstr "SUid"
-
-#~ msgid "SGid"
-#~ msgstr "SGid"
-
-#~ msgid "FSUid"
-#~ msgstr "FSUid"
-
-#~ msgid "FSGid"
-#~ msgstr "FSGid"
-
-#~ msgid "Pid"
-#~ msgstr "Pid"
-
-#~ msgid "PPid"
-#~ msgstr "PPid"
-
-#~ msgid "PGrp"
-#~ msgstr "PGrp"
-
-#~ msgid "Session"
-#~ msgstr "Sesiwn"
-
-#~ msgid "Tty"
-#~ msgstr "Tty"
-
-#~ msgid "TPGid"
-#~ msgstr "TPGid"
-
-#~ msgid "Priority"
-#~ msgstr "Blaenoriaeth"
-
-#~ msgid "NGroups"
-#~ msgstr "Nifer Grŵpiau"
-
-#~ msgid "Groups"
-#~ msgstr "Grŵpiau"
-
-#~ msgid "User ID"
-#~ msgstr "ID Defnyddiwr"
-
-#~ msgid "Effective User ID"
-#~ msgstr "ID Defnyddiwr Effeithiol"
-
-#~ msgid "Group ID"
-#~ msgstr "ID Grŵp"
-
-#~ msgid "Effective Group ID"
-#~ msgstr "ID Grŵp Effeithiol"
-
-#~ msgid "Set User ID"
-#~ msgstr "Gosod ID Defnyddiwr"
-
-#~ msgid "Set Group ID"
-#~ msgstr "Gosod ID Grŵp"
-
-#~ msgid "Filesystem User ID"
-#~ msgstr "ID Defnyddiwr System Ffeiliau"
-
-#~ msgid "Filesystem Group ID"
-#~ msgstr "ID Grŵp System Ffeiliau"
-
-#~ msgid "Process ID"
-#~ msgstr "ID Proses"
-
-#~ msgid "PID of parent process"
-#~ msgstr "PID y proses rhiant"
-
-#~ msgid "Process group ID"
-#~ msgstr "ID grŵp prosesau"
-
-#~ msgid "Session ID"
-#~ msgstr "ID Sesiwn"
-
-#~ msgid "Full device number of controlling terminal"
-#~ msgstr "Rhif dyfais llawn y terfynell rheoli"
-
-#~ msgid "Terminal process group ID"
-#~ msgstr "ID grŵp proses terfynell"
-
-#~ msgid "Kernel scheduling priority"
-#~ msgstr "Blaenoriaeth trefnu'r cnewyllyn"
-
-#~ msgid "Standard unix nice level of process"
-#~ msgstr "Lfel neis unix safonnol y proses"
-
-#~ msgid "Number of additional process groups"
-#~ msgstr "Nifer y grŵpiau proses ychwanegol"
-
-#~ msgid "Array of additional process groups"
-#~ msgstr "Arae grŵpiau proses ychwanegol"
-
-#~ msgid "Number of entries in semaphore map"
-#~ msgstr "Nifer o gofnodion yn y map semaffor"
-
-#~ msgid "Max number of arrays"
-#~ msgstr "Uchafrif araeau"
-
-#~ msgid "Max semaphores system wide"
-#~ msgstr "Uchafrif semafforau system-eang"
-
-#~ msgid "Number of undo structures system wide"
-#~ msgstr "Nifer o strwythurau datwneud system-eang"
-
-#~ msgid "Max semaphores per array"
-#~ msgstr "Uchafrif semafforau i bob arae"
-
-#~ msgid "Max ops per semop call"
-#~ msgstr "Uchafrif gweithredion i bob galwad semop"
-
-#~ msgid "Max number of undo entries per process"
-#~ msgstr "Uchafrif cofnodion datwneud i bob proses"
-
-#~ msgid "sizeof struct sem_undo"
-#~ msgstr "maint strwythyr sem_undo"
-
-#~ msgid "Semaphore max value"
-#~ msgstr "Gwerth uchaf semaffor"
-
-#~ msgid "Adjust on exit max value"
-#~ msgstr "Gwerth uchafrif addasu wrth adael"
-
-#~ msgid "Max segment size"
-#~ msgstr "Maint segment mwyaf"
-
-#~ msgid "Min segment size"
-#~ msgstr "Maint segment lleiaf"
-
-#~ msgid "Max number of segments"
-#~ msgstr "Uchafrif nifer segmentau"
-
-#~ msgid "Max shared segments per process"
-#~ msgstr "Uchafrif segmentau rhanedig i bob proses"
-
-#~ msgid "Max total shared memory"
-#~ msgstr "Uchafrif cyfanswm cof rhanedig"
-
-#~ msgid "Total Swap Space"
-#~ msgstr "Cyfanswm Gofod Cyfnewid"
-
-#~ msgid "Used Swap Space"
-#~ msgstr "Gofod Cyfnewid Mewn Defnydd"
-
-#~ msgid "Free Swap Space"
-#~ msgstr "Gofod Cyfnewid Rhydd"
-
-#~ msgid "Page In"
-#~ msgstr "Tudalen Mewn"
-
-#~ msgid "Page Out"
-#~ msgstr "Tudalen Allan"
-
-#~ msgid ""
-#~ "Total number of swap pages that have been brought in since system boot"
-#~ msgstr ""
-#~ "Cyfansm nifer y tudalennau cyfnewid a dynnwyd i fewn ers bwtio'r system"
-
-#~ msgid ""
-#~ "Total number of swap pages that have been brought out since system boot"
-#~ msgstr ""
-#~ "Cyfansm nifer y tudalennau cyfnewid a dynnwyd allan ers bwtio'r system"
-
-#~ msgid "Server Features"
-#~ msgstr "Nodweddion Gweinydd"
-
-#~ msgid "CPU Usage"
-#~ msgstr "Defnydd CPU"
-
-#~ msgid "Memory Usage"
-#~ msgstr "Defnydd Cof"
-
-#~ msgid "Swap Usage"
-#~ msgstr "Defnydd Cyfnewid"
-
-#~ msgid "System Uptime"
-#~ msgstr "Amser Rehdeg y System"
-
-#~ msgid "Load Averange"
-#~ msgstr "Cyfartaledd Llwyth"
-
-#~ msgid "Shared Memory Limits"
-#~ msgstr "Cyfyngion Cof Rhanedig"
-
-#~ msgid "Message Queue Limits"
-#~ msgstr "Cyfyngion Ciwiau Neges"
-
-#~ msgid "Semaphore Set Limits"
-#~ msgstr "Cyfyngion Set Semaffor"
-
-#~ msgid "List of running Processes"
-#~ msgstr "Rhestr o brosesau sy'n rhedeg"
-
-#~ msgid "Process Status information"
-#~ msgstr "Gwybodaeth statws proses"
-
-#~ msgid "Process UID and TTY information"
-#~ msgstr "Gwybodaeth TTY a UID proses"
-
-#~ msgid "Process Memory information"
-#~ msgstr "Gwybodaeth cof proses"
-
-#~ msgid "Process Time information"
-#~ msgstr "Gwybodaeth amser proses"
-
-#~ msgid "Process Signal information"
-#~ msgstr "Gwybodaeth arwydd proses"
-
-#~ msgid "Process Kernel Data information"
-#~ msgstr "Gwybodaeth data cnewyllyn proses"
-
-#~ msgid "Process Segment information"
-#~ msgstr "Gwybodaeth segment proses"
-
-#~ msgid "Process Arguments"
-#~ msgstr "Ymresymiadau Proses"
-
-#~ msgid "Process Memory Map"
-#~ msgstr "Map Cof Proses"
-
-#~ msgid "Mount List"
-#~ msgstr "Rhestr Gosod"
-
-#~ msgid "File System Usage"
-#~ msgstr "Defnydd System Ffeilio"
-
-#~ msgid "Network Load"
-#~ msgstr "Llwyth Rhwydwaith"
-
-#~ msgid "PPP Statistics"
-#~ msgstr "Ystadegau PPP"
-
-#~ msgid "Command line arguments of the process"
-#~ msgstr "Ymresymiadau llinell gorchymyn proses"
-
-#~ msgid "List of currently mounted filesystems"
-#~ msgstr "Rhestr o systemau ffeil wedi eu gosod yn gyfredol"
-
-#~ msgid "Uptime"
-#~ msgstr "Amser Rhedeg"
-
-#~ msgid "Idletime"
-#~ msgstr "Amser Segur"
-
-#~ msgid "BootTime"
-#~ msgstr "AmserBŵt"
-
-#~ msgid "Time in seconds since system boot"
-#~ msgstr "Amser mewn eiliadau ers bwtio'r system"
-
-#~ msgid "Time in seconds the system spent in the idle task since system boot"
-#~ msgstr ""
-#~ "Amser mewn eiliadau mae'r system wedi gwario yn y tasg segur ers bwtio'r "
-#~ "system"
-
-#~ msgid "Time of last system boot in seconds since the epoch"
-#~ msgstr "Amser bŵt diwethaf y system mewn eiliadau ers yr epoc"
-
-#~ msgid "Unknown system error"
-#~ msgstr "Gwall system anhysbys"
-
-#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s: mae'r opsiwn `%s' yn amwys\n"
-
-#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s: nid yw'r opsiwn `--%s' yn caniatau ymresymiad\n"
-
-#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s: nid yw'r opsiwn `%c%s' yn caniatau ymresymiad\n"
-
-#~ msgid "%s: option `%s' requires an argument\n"
-#~ msgstr "%s: mae'r opsiwn `%s' yn mynnu ymresymiad\n"
-
-#~ msgid "%s: unrecognized option `--%s'\n"
-#~ msgstr "%s: opsiwn anadnabyddus `--%s'\n"
-
-#~ msgid "%s: unrecognized option `%c%s'\n"
-#~ msgstr "%s: opswin anadnabyddus `%c%s'\n"
-
-#~ msgid "%s: illegal option -- %c\n"
-#~ msgstr "%s: opsiwn anghyfreithlon -- %c\n"
-
-#~ msgid "%s: invalid option -- %c\n"
-#~ msgstr "%s: opsiwn annilys -- %c\n"
-
-#~ msgid "%s: option requires an argument -- %c\n"
-#~ msgstr "%s: mae'r opsiwn yn mynnu ymresymiad -- `%c'\n"
-
-#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s: mae'r opsiwn `-W %s' yn amwys\n"
-
-#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
-#~ msgstr "%s: nid yw'r opsiwn `-W %s' yn caniatau ymresymiad\n"
-
-#~ msgid "Show this help message"
-#~ msgstr "Dangos y neges cymorth hwn"
-
-#~ msgid "Display brief usage message"
-#~ msgstr "Dangos neges defnydd byr"
--- a/po/da.po
+++ b/po/da.po
--- a/Show More
+++ b/Show More