From 973dc2d37cbf07ea47859050d9741bf85b13962c Mon Sep 17 00:00:00 2001 From: Kevin Vandersloot Date: Mon, 26 Nov 2001 03:23:22 +0000 Subject: [PATCH] port stable libgtop to GNOME 2.0. Too much to detail. pkgconfig is now 2001-11-25 Kevin Vandersloot * port stable libgtop to GNOME 2.0. Too much to detail. pkgconfig is now used. Libs are named libgtop-2.0 etc for parallel install. --- ChangeLog | 6 + LIBGTOP-VERSION | 8 +- Makefile.am | 43 ++-- acinclude.m4 | 414 ++++++++++++++++++++++++++++++++ autogen.sh | 7 +- configure.in | 79 +++--- doc/.cvsignore | 10 + doc/ChangeLog | 38 +++ doc/Makefile.am | 45 ++++ doc/auto-macros.texi.in | 12 + doc/libgtop.texi | 80 ++++++ doc/white-paper.texi | 90 +++++++ examples/Makefile.am | 54 ++--- include/glibtop/Makefile.am | 2 +- lib/Makefile.am | 6 +- libgtop-2.0.pc.in | 13 + src/daemon/Makefile.am | 30 +-- src/inodedb/Makefile.am | 14 +- sysdeps/common/Makefile.am | 12 +- sysdeps/freebsd/Makefile.am | 12 +- sysdeps/guile/Makefile.am | 6 +- sysdeps/guile/names/Makefile.am | 6 +- sysdeps/kernel/Makefile.am | 8 +- sysdeps/linux/Makefile.am | 10 +- sysdeps/names/Makefile.am | 6 +- sysdeps/osf1/Makefile.am | 16 +- sysdeps/solaris/Makefile.am | 14 +- sysdeps/stub/Makefile.am | 8 +- sysdeps/stub_suid/Makefile.am | 12 +- sysdeps/sun4/Makefile.am | 16 +- 30 files changed, 900 insertions(+), 177 deletions(-) create mode 100644 acinclude.m4 create mode 100644 doc/.cvsignore create mode 100644 doc/ChangeLog create mode 100644 doc/Makefile.am create mode 100644 doc/auto-macros.texi.in create mode 100644 doc/libgtop.texi create mode 100644 doc/white-paper.texi create mode 100644 libgtop-2.0.pc.in diff --git a/ChangeLog b/ChangeLog index d58e3290..6da6a5de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-11-25 Kevin Vandersloot + + * port stable libgtop to GNOME 2.0. Too much to detail. + pkgconfig is now used. Libs are named libgtop-2.0 etc for + parallel install. + 2001-10-17 Abel Chueng * configure.in, Makefile.am, include/glibtop/Makefile.am: headers diff --git a/LIBGTOP-VERSION b/LIBGTOP-VERSION index 5c960001..3c641468 100644 --- a/LIBGTOP-VERSION +++ b/LIBGTOP-VERSION @@ -7,11 +7,11 @@ # set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0. # LIBGTOP_MAJOR_VERSION=1 -LIBGTOP_MINOR_VERSION=0 -LIBGTOP_MICRO_VERSION=12 +LIBGTOP_MINOR_VERSION=90 +LIBGTOP_MICRO_VERSION=0 -LIBGTOP_INTERFACE_AGE=11 -LIBGTOP_BINARY_AGE=11 +LIBGTOP_INTERFACE_AGE=0 +LIBGTOP_BINARY_AGE=0 # you can set this to `-snap' for instance to create # a `libgtop-1.x.y-snap.tar.gz' tarball. LIBGTOP_VERSION_SUFFIX= diff --git a/Makefile.am b/Makefile.am index e90e8414..bda4bd0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,25 +1,25 @@ ## Process this file with automake to produce Makefile.in. -if EXAMPLES -examples_SUBDIRS = examples -else +## if EXAMPLES +## examples_SUBDIRS = examples +## else examples_SUBDIRS = -endif +## endif if BUILD_GNOME_SUPPORT support = support endif -SUBDIRS = po intl $(support) macros misc include sysdeps lib src \ +SUBDIRS = po $(support) misc include sysdeps lib src \ $(examples_SUBDIRS) doc libgtopinclude_HEADERS = glibtop.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \ LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \ RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \ - libgtop-mirror.sh + libgtop-mirror.sh libgtop-2.0.pc.in dist-hook: cp libgtop.spec $(distdir) @@ -29,19 +29,22 @@ release: ## Put `exec' in the name because this should be installed by ## `install-exec', not `install-data'. -confexecdir = $(libdir) -confexec_DATA = $(top_builddir)/libgtopConf.sh \ - $(top_builddir)/libgtop-features.def +## confexecdir = $(libdir) +## confexec_DATA = $(top_builddir)/libgtopConf.sh \ +## $(top_builddir)/libgtop-features.def + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libgtop-2.0.pc CLEANFILES=libgtopConf.sh -bin_SCRIPTS = $(top_builddir)/libgtop-config +## bin_SCRIPTS = $(top_builddir)/libgtop-config ## to automatically rebuild aclocal.m4 if any of the macros in ## `macros/' change -@MAINT@ include macros/macros.dep -@MAINT@macros/macros.dep: macros/Makefile.am -@MAINT@ cd macros && $(MAKE) macros.dep +## @MAINT@ include macros/macros.dep +## @MAINT@macros/macros.dep: macros/Makefile.am +## @MAINT@ cd macros && $(MAKE) macros.dep @MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION @@ -52,7 +55,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config libgtopConf.sh: libgtopConf.sh.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-1.0#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' \ @@ -79,11 +82,11 @@ libgtopConf.sh: libgtopConf.sh.in Makefile < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \ && mv libgtopConf.tmp libgtopConf.sh -libgtop-config: libgtop-config.in Makefile - sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \ - < $(srcdir)/libgtop-config.in > libgtop-config.tmp \ - && mv libgtop-config.tmp libgtop-config && \ - chmod 755 libgtop-config +# libgtop-config: libgtop-config.in Makefile +# sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \ +# < $(srcdir)/libgtop-config.in > libgtop-config.tmp \ +# && mv libgtop-config.tmp libgtop-config && \ +# chmod 755 libgtop-config libgtop-features.def: features.def @LN_S@ $< $@ diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 00000000..7c11a785 --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,414 @@ +dnl +dnl GNOME_FILEUTILS_CHECKS +dnl +dnl checks that are needed for the diskusage applet. +dnl + +AC_DEFUN([GNOME_FILEUTILS_CHECKS], +[ +AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \ +mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \ +sys/filsys.h sys/fs_types.h sys/fs/s5param.h) + +AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \ +getcwd getmntinfo gettimeofday isascii lchown \ +listmntent memcpy mkfifo strchr strerror strrchr vprintf) + +dnl Set some defaults when cross-compiling + +if test x$cross_compiling = xyes ; then + case "$host_os" in + linux*) + fu_cv_sys_mounted_getmntent1=yes + fu_cv_sys_stat_statfs2_bsize=yes + ;; + sunos*) + fu_cv_sys_stat_statfs4=yes + ;; + freebsd*) + fu_cv_sys_stat_statfs2_bsize=yes + ;; + osf*) + fu_cv_sys_stat_statfs3_osf1=yes + ;; + esac +fi + +# Determine how to get the list of mounted filesystems. +list_mounted_fs= + +# If the getmntent function is available but not in the standard library, +# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). +AC_FUNC_GETMNTENT + +# This test must precede the ones for getmntent because Unicos-9 is +# reported to have the getmntent function, but its support is incompatible +# with other getmntent implementations. + +# NOTE: Normally, I wouldn't use a check for system type as I've done for +# `CRAY' below since that goes against the whole autoconf philosophy. But +# I think there is too great a chance that some non-Cray system has a +# function named listmntent to risk the false positive. + +if test -z "$list_mounted_fs"; then +# Cray UNICOS 9 +AC_MSG_CHECKING([for listmntent of Cray/Unicos-9]) +AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent, +[fu_cv_sys_mounted_cray_listmntent=no +AC_EGREP_CPP(yes, +[#ifdef _CRAY +yes +#endif +], [test $ac_cv_func_listmntent = yes \ +&& fu_cv_sys_mounted_cray_listmntent=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) +fi +fi + +if test $ac_cv_func_getmntent = yes; then + +# This system has the getmntent function. +# Determine whether it's the one-argument variant or the two-argument one. + +if test -z "$list_mounted_fs"; then +# 4.3BSD, SunOS, HP-UX, Dynix, Irix +AC_MSG_CHECKING([for one-argument getmntent function]) +AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, +[test $ac_cv_header_mntent_h = yes \ +&& fu_cv_sys_mounted_getmntent1=yes \ +|| fu_cv_sys_mounted_getmntent1=no]) +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) +fi +fi + +if test -z "$list_mounted_fs"; then +# SVR4 +AC_MSG_CHECKING([for two-argument getmntent function]) +AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, +[AC_EGREP_HEADER(getmntent, sys/mnttab.h, +fu_cv_sys_mounted_getmntent2=yes, +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) +fi +fi + +if test -z "$list_mounted_fs"; then +AC_MSG_ERROR([could not determine how to read list of mounted filesystems]) +fi + +fi + +if test -z "$list_mounted_fs"; then +# DEC Alpha running OSF/1. +AC_MSG_CHECKING([for getfsstat function]) +AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, +[AC_TRY_LINK([ +#include +#include +#include ], +[struct statfs *stats; +int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], +fu_cv_sys_mounted_getsstat=yes, +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) +fi +fi + +if test -z "$list_mounted_fs"; then +# AIX. +AC_MSG_CHECKING([for mntctl function and struct vmount]) +AC_CACHE_VAL(fu_cv_sys_mounted_vmount, +[AC_TRY_CPP([#include ], +fu_cv_sys_mounted_vmount=yes, +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) +fi +fi + +if test -z "$list_mounted_fs"; then +# SVR3 +AC_MSG_CHECKING([for FIXME existence of three headers]) +AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, +[AC_TRY_CPP([ +#include +#include +#include ], +fu_cv_sys_mounted_fread_fstyp=yes, +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) +fi +fi + +if test -z "$list_mounted_fs"; then +# 4.4BSD and DEC OSF/1. +AC_MSG_CHECKING([for getmntinfo function]) +AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, +[ +ok= +if test $ac_cv_func_getmntinfo = yes; then +AC_EGREP_HEADER(f_type;, sys/mount.h, +ok=yes) +fi +test -n "$ok" \ +&& fu_cv_sys_mounted_getmntinfo=yes \ +|| fu_cv_sys_mounted_getmntinfo=no +]) +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) +fi +fi + +# FIXME: add a test for netbsd-1.1 here + +if test -z "$list_mounted_fs"; then +# Ultrix +AC_MSG_CHECKING([for getmnt function]) +AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, +[AC_TRY_CPP([ +#include +#include ], +fu_cv_sys_mounted_getmnt=yes, +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) +fi +fi + +if test -z "$list_mounted_fs"; then +# SVR2 +AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) +AC_CACHE_VAL(fu_cv_sys_mounted_fread, +[AC_TRY_CPP([#include ], +fu_cv_sys_mounted_fread=yes, +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) +fi +fi + +if test -z "$list_mounted_fs"; then +AC_MSG_ERROR([could not determine how to read list of mounted filesystems]) +# FIXME -- no need to abort building the whole package +# Can't build mountlist.c or anything that needs its functions +fi + +AC_CHECKING(how to get filesystem space usage) +space=no + +# Perform only the link test since it seems there are no variants of the +# statvfs function. This check is more than just AC_CHECK_FUNCS(statvfs) +# because that got a false positive on SCO OSR5. Adding the declaration +# of a `struct statvfs' causes this test to fail (as it should) on such +# systems. That system is reported to work fine with STAT_STATFS4 which +# is what it gets when this test fails. +if test $space = no; then +# SVR4 +AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs, +[AC_TRY_LINK([#include +#include ], +[struct statvfs fsd; statvfs (0, &fsd);], +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) +fi +fi + +if test $space = no; then +# DEC Alpha running OSF/1 +AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) +AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, +[AC_TRY_RUN([ +#include +#include +#include +main () +{ +struct statfs fsd; +fsd.f_fsize = 0; +exit (statfs (".", &fsd, sizeof (struct statfs))); +}], +fu_cv_sys_stat_statfs3_osf1=yes, +fu_cv_sys_stat_statfs3_osf1=no, +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) +fi +fi + +if test $space = no; then +# AIX +AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl +member (AIX, 4.3BSD)]) +AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, +[AC_TRY_RUN([ +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif +main () +{ +struct statfs fsd; +fsd.f_bsize = 0; +exit (statfs (".", &fsd)); +}], +fu_cv_sys_stat_statfs2_bsize=yes, +fu_cv_sys_stat_statfs2_bsize=no, +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) +fi +fi + +if test $space = no; then +# SVR3 +AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) +AC_CACHE_VAL(fu_cv_sys_stat_statfs4, +[AC_TRY_RUN([#include +#include +main () +{ +struct statfs fsd; +exit (statfs (".", &fsd, sizeof fsd, 0)); +}], +fu_cv_sys_stat_statfs4=yes, +fu_cv_sys_stat_statfs4=no, +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) +fi +fi + +if test $space = no; then +# 4.4BSD and NetBSD +AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl +member (4.4BSD and NetBSD)]) +AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, +[AC_TRY_RUN([#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +main () +{ +struct statfs fsd; +fsd.f_fsize = 0; +exit (statfs (".", &fsd)); +}], +fu_cv_sys_stat_statfs2_fsize=yes, +fu_cv_sys_stat_statfs2_fsize=no, +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) +fi +fi + +if test $space = no; then +# Ultrix +AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) +AC_CACHE_VAL(fu_cv_sys_stat_fs_data, +[AC_TRY_RUN([#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_FS_TYPES_H +#include +#endif +main () +{ +struct fs_data fsd; +/* Ultrix's statfs returns 1 for success, +0 for not mounted, -1 for failure. */ +exit (statfs (".", &fsd) != 1); +}], +fu_cv_sys_stat_fs_data=yes, +fu_cv_sys_stat_fs_data=no, +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) +fi +fi + +if test $space = no; then +# SVR2 +AC_TRY_CPP([#include ], +AC_DEFINE(STAT_READ_FILSYS) space=yes) +fi + +if test -n "$list_mounted_fs" && test $space != no; then +DF_PROG="df" +# LIBOBJS="$LIBOBJS fsusage.o" +# LIBOBJS="$LIBOBJS mountlist.o" +fi + +# Check for SunOS statfs brokenness wrt partitions 2GB and larger. +# If exists and struct statfs has a member named f_spare, +# enable the work-around code in fsusage.c. +AC_MSG_CHECKING([for statfs that truncates block counts]) +AC_CACHE_VAL(fu_cv_sys_truncating_statfs, +[AC_TRY_COMPILE([ +#if !defined(sun) && !defined(__sun) +choke -- this is a workaround for a Sun-specific problem +#endif +#include +#include ], +[struct statfs t; long c = *(t.f_spare);], +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) +fi +AC_MSG_RESULT($fu_cv_sys_truncating_statfs) + +AC_CHECKING(for AFS) +test -d /afs && AC_DEFINE(AFS) +]) diff --git a/autogen.sh b/autogen.sh index 13ee7e0c..82d2be6c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,6 +3,7 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ." PKG_NAME="Gnome Top Library" @@ -14,4 +15,8 @@ PKG_NAME="Gnome Top Library" exit 1 } -. $srcdir/macros/autogen.sh +which gnome-autogen.sh || { + echo "You need to install gnome-common from the GNOME CVS" + exit 1 +} +USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/configure.in b/configure.in index 0d7ff15e..a8aa463d 100644 --- a/configure.in +++ b/configure.in @@ -47,12 +47,12 @@ AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -AM_ACLOCAL_INCLUDE(. macros) +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I ." AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS -AC_ARG_PROGRAM +dnl AC_ARG_PROGRAM dnl We need this at some places. libgtop_top_builddir=`pwd` @@ -87,27 +87,28 @@ AM_PROG_LIBTOOL dnl Let the user enable compiler warnings GNOME_COMPILE_WARNINGS -GNOME_INIT_HOOK(gnome_found=yes) +dnl GNOME_INIT_HOOK(gnome_found=yes) -if test "x$gnome_found" != xyes; then - if test "x$want_gnome" != xno ; then - AC_MSG_ERROR([ -*** GNOME was not found on this system. *** - -*** If you want to use LibGTop without GNOME, you need -*** to give configure the --without-gnome parameter. -]) - else - AC_DEFINE(WITHOUT_GNOME) - fi - GNOME_SUPPORT_CHECKS -else - if test "x$want_gnome" != xno ; then - AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false) - else - GNOME_SUPPORT_CHECKS - fi -fi +dnl if test "x$gnome_found" != xyes; then +dnl if test "x$want_gnome" != xno ; then +dnl AC_MSG_ERROR([ +dnl *** GNOME was not found on this system. *** +dnl +dnl *** If you want to use LibGTop without GNOME, you need +dnl *** to give configure the --without-gnome parameter. +dnl ]) +dnl else +dnl AC_DEFINE(WITHOUT_GNOME) +dnl fi +dnl GNOME_SUPPORT_CHECKS +dnl else +dnl if test "x$want_gnome" != xno ; then +dnl AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false) +dnl else +dnl GNOME_SUPPORT_CHECKS +dnl fi +dnl fi +AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false) AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) @@ -178,11 +179,17 @@ AC_SUBST(guile_subdirs) AM_PROG_LIBTOOL -AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop)) +GLIB_REQUIRED=1.3.10 + +PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + +dnl AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop)) dnl You need to uncomment the following line if you want to use dnl libGTop without Gnome. -dnl GNOME_SUPPORT_CHECKS +GNOME_SUPPORT_CHECKS dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -278,7 +285,7 @@ AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname) dnl ## all 'es_??' are only needed for format numbers different of 'es' ALL_LINGUAS="az ca da de el es es_DO es_GT es_HN es_MX es_PA es_PE es_SV fi fr ga gl hu ja ko nl no pl pt pt_BR ru sk sl sv tr uk zh_CN.GB2312 zh_TW" -AM_GNOME_GETTEXT +AM_GLIB_GNU_GETTEXT AC_PATH_XTRA @@ -322,7 +329,7 @@ if test "x$gnome_found" = xyes ; then LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport" SUPPORTINCS="$GNOME_INCLUDEDIR" else - LIBSUPPORT='$(top_builddir)/support/libgnomesupport.la' + LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la' SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' fi @@ -338,7 +345,7 @@ AC_SUBST(SUPPORTINCS) dnl These definitions are expanded in make. LIBGTOP_LIBS='-L$(libdir)' -LIBGTOP_INCS='-I$(includedir)/libgtop-1.0' +LIBGTOP_INCS='-I$(includedir)/libgtop-2.0' if test x$libgtop_use_machine_h = xyes ; then LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H" @@ -367,7 +374,7 @@ sysdeps_dir="$libgtop_sysdeps_dir" AC_SUBST(sysdeps_dir) if test x$ac_cv_guile_found = xyes ; then - LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile" + LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile-2.0" libgtop_guile_found=yes else libgtop_guile_found=no @@ -383,11 +390,11 @@ fi LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS" -LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_sysdeps -lgtop_common" -LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop -lgtop_sysdeps -lgtop_common" +LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0" +LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0" -LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names" -LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names -lgtop_names" +LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0" +LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0" LIBGTOP_LIBS="$LIBGTOP_LIBS" LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS" @@ -416,7 +423,7 @@ INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(to AC_SUBST(INCLUDES) AC_SUBST(LIBGTOP_EXTRA_LIBS) - +AC_SUBST(GLIB_LIBS) AC_SUBST(LIBGTOP_LIBS) AC_SUBST(LIBGTOP_INCS) AC_SUBST(LIBGTOP_NAMES_LIBS) @@ -429,7 +436,7 @@ AC_SUBST(LIBGTOP_BINDIR) AC_SUBST(LIBGTOP_SERVER) if test x$libgtop_need_server = xyes ; then - sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la" + sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid-2.0.la" server_programs='libgtop_server' else sysdeps_suid_lib= @@ -442,7 +449,6 @@ AC_OUTPUT([ Makefile libgtop.spec po/Makefile.in -intl/Makefile misc/Makefile include/Makefile include/glibtop/Makefile @@ -466,4 +472,5 @@ lib/Makefile examples/Makefile doc/Makefile support/Makefile -macros/Makefile]) +libgtop-2.0.pc +]) diff --git a/doc/.cvsignore b/doc/.cvsignore new file mode 100644 index 00000000..5bee9400 --- /dev/null +++ b/doc/.cvsignore @@ -0,0 +1,10 @@ +texinfo.tex +*.info +Makefile.in +Makefile +*.log *.toc *.dvi *.aux *.cp *.fn *.vr *.tp *.ky *.pg +*.ps +auto-macros.texi +version.texi +stamp-vti +*.html *.pdf diff --git a/doc/ChangeLog b/doc/ChangeLog new file mode 100644 index 00000000..e078c5e1 --- /dev/null +++ b/doc/ChangeLog @@ -0,0 +1,38 @@ +1999-10-18 Martin Baulig + + * about.texi: Added a note about LibGTop and GNOME. + + * reference.texi (glibtop_proc_state): Fix description of the `state' + field for LibGTop 1.0.x. + +1999-09-29 Martin Baulig + + * Makefile.am (MAKEINFO): Add `-I @libgtop_top_builddir@/doc' here. + +1999-05-16 Martin Baulig + + * main.texi: This is now the main file which will @include all + chapter files so we can use `texinfo-multiple-files-update'. + + * reference.texi: Added all missing sections with a "not yet written" + notice. + +1999-05-16 Martin Baulig + + * white-paper.texi: Initial version of the LibGTop White Paper. + + * Makefile.am: Create `auto-macros.texi' from `auto-macros.texi.in' + which will contain some `@set' commands for the LibGTop version etc. + + * auto-macros.texi.in: New file. This is a template for + `auto-macros.texi' which will be automatically generated. + +1999-05-09 Martin Baulig + + * about.texi: Split the `libgtop.texi' into one file pro chapter, + this is the "About LibGTop". + + * reference.texi: The "LibGTop Reference Manual". + + * libgtop.texi: Initial version of the new LibGTop Manual. + diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..4fedf0c6 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,45 @@ +info_TEXINFOS = libgtop.texi + +libgtop_TEXINFOS = libgtop.texi about.texi reference.texi \ + auto-macros.texi version.texi main.texi \ + white-paper.texi + +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)#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_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \ + -e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#g' \ + -e 's#\%LIBGTOP_GUILE_LIBS\%#$(LIBGTOP_GUILE_LIBS)#g' \ + -e 's#\%LIBGTOP_GUILE_INCS\%#$(LIBGTOP_GUILE_INCS)#g' \ + -e 's#\%LIBGTOP_GUILE_NAMES_LIBS\%#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \ + -e 's#\%LIBGTOP_GUILE_NAMES_INCS\%#$(LIBGTOP_GUILE_NAMES_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_guile_found\%#$(libgtop_guile_found)#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 diff --git a/doc/auto-macros.texi.in b/doc/auto-macros.texi.in new file mode 100644 index 00000000..eab55b77 --- /dev/null +++ b/doc/auto-macros.texi.in @@ -0,0 +1,12 @@ +@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% + diff --git a/doc/libgtop.texi b/doc/libgtop.texi new file mode 100644 index 00000000..89f683c8 --- /dev/null +++ b/doc/libgtop.texi @@ -0,0 +1,80 @@ +\input texinfo @c -*-texinfo-*- +@c %**start of header +@setfilename libgtop.info +@settitle LibGTop Reference Manual +@setchapternewpage odd +@c %**end of header + +@include auto-macros.texi +@include version.texi + +@ifinfo +This is the LibGTop Reference Manual version @value{VERSION} +(last modified @value{UPDATED}). + +Copyright 1999 Free Software Foundation, Inc. + +Permission is granted to make and distribute verbatim +copies of this manual provided the copyright notice and +this permission notice are preserved on all copies. + +@ignore +Permission is granted to process this file through TeX +and print the results, provided the printed document +carries a copying permission notice identical to this +one except for the removal of this paragraph (this +paragraph not being relevant to the printed manual). + +@end ignore +Permission is granted to copy and distribute modified +versions of this manual under the conditions for +verbatim copying, provided also that the sections +entitled ``Copying'' and ``GNU General Public License'' +are included exactly as in the original, and provided +that the entire resulting derived work is distributed +under the terms of a permission notice identical to this +one. + +Permission is granted to copy and distribute +translations of this manual into another language, +under the above conditions for modified versions, +except that this permission notice may be stated in a +translation approved by the Free Software Foundation. + +@end ifinfo + +@titlepage +@title LibGTop Reference Manual +@subtitle Version @value{VERSION} - @value{UPDATED} +@author Martin Baulig + +@page +@vskip 0pt plus 1filll +Copyright @copyright{} 1999 Free Software Foundation, Inc. + +Permission is granted to make and distribute verbatim +copies of this manual provided the copyright notice and +this permission notice are preserved on all copies. + +Permission is granted to copy and distribute modified +versions of this manual under the conditions for +verbatim copying, provided also that the sections +entitled ``Copying'' and ``GNU General Public License'' +are included exactly as in the original, and provided +that the entire resulting derived work is distributed +under the terms of a permission notice identical to this +one. + +Permission is granted to copy and distribute +translations of this manual into another language, +under the above conditions for modified versions, +except that this permission notice may be stated in a +translation approved by the Free Software Foundation. +@end titlepage + +@contents + +@include main.texi + +@bye + diff --git a/doc/white-paper.texi b/doc/white-paper.texi new file mode 100644 index 00000000..8c53c263 --- /dev/null +++ b/doc/white-paper.texi @@ -0,0 +1,90 @@ +@node White Paper, Reference Manual, About, Top +@chapter LibGTop White Paper + +@menu +* Introduction:: Introduction +* Overview:: Overview +@end menu + +@node Introduction, Overview, White Paper, White Paper +@section Introduction + +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. + +@itemize @bullet +@item +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. + +@item +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). + +@item +Linux has a very nice @file{/proc} filesystem, but reading and parsing +@file{/proc} is very slow and inefficient. + +@item +Solaris is a bit better, but you still need to be in the @code{sys} group or +even root to get some data. +@end itemize + +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. + +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. + +@node Overview, , Introduction, White Paper +@section Overview + +This section should give you a short overview on how LibGTop was developed, which +things needed to be considered and how it works. + +@menu +* Interface Design:: Things that need to be considered +* Server Implementation:: The LibGTop "server" +@end menu + +@node Interface Design, Server Implementation, Overview, Overview +@subsection Interface Design + +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. + +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. + +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. + +@node Server Implementation, , Interface Design, Overview +@subsection Server Implementation + +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. + +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. diff --git a/examples/Makefile.am b/examples/Makefile.am index cfd00fec..0abcfbb7 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -22,9 +22,9 @@ EXTRA_PROGRAMS = first_static second_static \ timings_static first_SOURCES = first.c -first_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +first_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ first_static_SOURCES = $(first_SOURCES) @@ -32,9 +32,9 @@ first_static_LDADD = $(first_LDADD) first_static_LDFLAGS = -static second_SOURCES = second.c -second_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +second_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ second_static_SOURCES = $(second_SOURCES) @@ -42,9 +42,9 @@ second_static_LDADD = $(second_LDADD) second_static_LDFLAGS = -static procmap_SOURCES = procmap.c -procmap_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +procmap_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ @@ -54,9 +54,9 @@ procmap_static_LDADD = $(procmap_LDADD) procmap_static_LDFLAGS = -static netload_SOURCES = netload.c -netload_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +netload_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ netload_static_SOURCES = $(netload_SOURCES) @@ -73,15 +73,15 @@ sysdeps_static_SOURCES = $(sysdeps_SOURCES) sysdeps_static_LDADD = $(sysdeps_LDADD) sysdeps_static_LDFLAGS = -static -third_guile_names_LIBS = $(top_builddir)/sysdeps/guile/names/libgtop_guile_names.la -third_names_LIBS = $(top_builddir)/sysdeps/names/libgtop_names.la +third_guile_names_LIBS = $(top_builddir)/sysdeps/guile/names/libgtop_guile_names-2.0.la +third_names_LIBS = $(top_builddir)/sysdeps/names/libgtop_names-2.0.la third_SOURCES = third.c -third_LDADD = $(top_builddir)/sysdeps/guile/libgtop_guile.la \ +third_LDADD = $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \ $(third_guile_names_LIBS) $(third_names_LIBS) \ - $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ + $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@ third_static_SOURCES = $(third_SOURCES) @@ -89,9 +89,9 @@ third_static_LDADD = $(third_LDADD) third_static_LDFLAGS = -static mountlist_SOURCES = mountlist.c -mountlist_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ mountlist_static_SOURCES= $(mountlist_SOURCES) @@ -100,9 +100,9 @@ mountlist_static_LDFLAGS= -static smp_SOURCES = smp.c -smp_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ smp_static_SOURCES = $(smp_SOURCES) @@ -110,9 +110,9 @@ smp_static_LDADD = $(smp_LDADD) smp_static_LDFLAGS = -static timings_SOURCES = timings.c -timings_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ timings_static_SOURCES = $(timings_SOURCES) diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am index 5b50f51b..6dc4ede6 100644 --- a/include/glibtop/Makefile.am +++ b/include/glibtop/Makefile.am @@ -1,4 +1,4 @@ -glibtopdir = $(includedir)/libgtop-1.0/glibtop +glibtopdir = $(includedir)/libgtop-2.0/glibtop glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h \ sem_limits.h uptime.h command.h mem.h proclist.h \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 7120f4ca..7a93f3d6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,13 +2,13 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop.la +lib_LTLIBRARIES = libgtop-2.0.la -libgtop_la_SOURCES = init.c open.c close.c command.c read.c \ +libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c \ read_data.c write.c lib.c parameter.c \ sysdeps.c -libgtop_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO) BUILT_SOURCES = lib.c diff --git a/libgtop-2.0.pc.in b/libgtop-2.0.pc.in new file mode 100644 index 00000000..11683466 --- /dev/null +++ b/libgtop-2.0.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libgtop +Description: Portable System Access Library +Requires: glib-2.0 +Version: @VERSION@ +Libs: -L${libdir} @LIBGTOP_LIBS@ +Cflags: -I${includedir}/libgtop-2.0 + + diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 45d897c6..871e73e9 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -14,43 +14,43 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -INCLUDES = @INCLUDES@ -D_BSD \ +INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \ -DLIBGTOP_COMPILE_SYSTEM=\"`uname -s`\" \ -DLIBGTOP_COMPILE_RELEASE=\"`uname -r`\" \ -DLIBGTOP_COMPILE_MACHINE=\"`uname -m`\" if NEED_LIBGTOP -suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la -suid_common = $(top_builddir)/sysdeps/common/libgtop_suid_common.la +suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la +suid_common = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la else suid_sysdeps = suid_common = endif -bin_PROGRAMS = libgtop_daemon @server_programs@ +bin_PROGRAMS = libgtop_daemon2 @server_programs@ -EXTRA_PROGRAMS = libgtop_server +EXTRA_PROGRAMS = libgtop_server2 -libgtop_daemon_SOURCES = gnuserv.c slave.c main.c io.c version.c \ +libgtop_daemon2_SOURCES = gnuserv.c slave.c main.c io.c version.c \ daemon.h server_config.h -libgtop_daemon_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @sysdeps_suid_lib@ \ $(suid_sysdeps) $(suid_common)\ - $(GLIB_LIBS)\ + $(LIBGTOP_LIBS)\ @LIBSUPPORT@ @INTLLIBS@ @libs_xauth@ if ENABLE_STATIC -libgtop_daemon_LDFLAGS = -static +libgtop_daemon2_LDFLAGS = -static endif -libgtop_server_SOURCES = server.c slave.c io.c version.c daemon.h -libgtop_server_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \ - $(top_builddir)/sysdeps/common/libgtop_suid_common.la +libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h +libgtop_server2_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la if ENABLE_STATIC -libgtop_server_LDFLAGS = -static +libgtop_server2_LDFLAGS = -static endif EXTRA_DIST = server_config.h.in server_config.pl diff --git a/src/inodedb/Makefile.am b/src/inodedb/Makefile.am index 41115ed1..52b6375c 100644 --- a/src/inodedb/Makefile.am +++ b/src/inodedb/Makefile.am @@ -1,15 +1,15 @@ -bin_PROGRAMS = mkinodedb file_by_inode +bin_PROGRAMS = mkinodedb2 file_by_inode2 INCLUDES = @INCLUDES@ -mkinodedb_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +mkinodedb2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ -file_by_inode_LDADD = $(top_builddir)/lib/libgtop.la \ - $(top_builddir)/sysdeps/common/libgtop_common.la \ - $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps.la \ +file_by_inode2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ + $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ @LIBSUPPORT@ @INTLLIBS@ EXTRA_DIST = README.inodedb diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am index 8ba26000..a472f0e9 100644 --- a/sysdeps/common/Makefile.am +++ b/sysdeps/common/Makefile.am @@ -12,17 +12,17 @@ endif CFLAGS = @CFLAGS@ $(inodedb_DEFS) -lib_LTLIBRARIES = libgtop_common.la libgtop_suid_common.la +lib_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la -libgtop_common_la_SOURCES = xmalloc.c error.c gnuslib.c \ +libgtop_common_2_0_la_SOURCES = xmalloc.c error.c gnuslib.c \ fsusage.c fsusage.h mountlist.c mountlist.h \ $(inodedb_SRCLIST) -libgtop_common_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_common_la_LIBADD = $(LIBGTOP_EXTRA_LIBS) +libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_common_2_0_la_LIBADD = $(LIBGTOP_EXTRA_LIBS) -libgtop_suid_common_la_SOURCES = xmalloc.c error.c sysdeps_suid.c +libgtop_suid_common_2_0_la_SOURCES = xmalloc.c error.c sysdeps_suid.c -libgtop_suid_common_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_suid_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) EXTRA_DIST = inodedb.c diff --git a/sysdeps/freebsd/Makefile.am b/sysdeps/freebsd/Makefile.am index a3f6c7ba..b955e6ff 100644 --- a/sysdeps/freebsd/Makefile.am +++ b/sysdeps/freebsd/Makefile.am @@ -2,22 +2,22 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la -libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c +libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_suid_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ +libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procargs.c procmap.c netload.c \ ppp.c -libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ glibtop_suid.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 diff --git a/sysdeps/guile/Makefile.am b/sysdeps/guile/Makefile.am index 53c06703..518180e9 100644 --- a/sysdeps/guile/Makefile.am +++ b/sysdeps/guile/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = @INCLUDES@ BUILT_SOURCES = guile.c guile.x -lib_LTLIBRARIES = libgtop_guile.la +lib_LTLIBRARIES = libgtop_guile-2.0.la -libgtop_guile_la_SOURCES = $(BUILT_SOURCES) +libgtop_guile_2_0_la_SOURCES = $(BUILT_SOURCES) -libgtop_guile_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_guile_2_0_la_LDFLAGS = $(LT_VERSION_INFO) Makefile: $(BUILT_SOURCES) diff --git a/sysdeps/guile/names/Makefile.am b/sysdeps/guile/names/Makefile.am index 1e64cbb1..a5dcf077 100644 --- a/sysdeps/guile/names/Makefile.am +++ b/sysdeps/guile/names/Makefile.am @@ -2,13 +2,13 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_guile_names.la +lib_LTLIBRARIES = libgtop_guile_names-2.0.la BUILT_SOURCES = guile-names.c guile-names.x -libgtop_guile_names_la_SOURCES = $(BUILT_SOURCES) +libgtop_guile_names_2_0_la_SOURCES = $(BUILT_SOURCES) -libgtop_guile_names_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_guile_names_2_0_la_LDFLAGS = $(LT_VERSION_INFO) Makefile: $(BUILT_SOURCES) diff --git a/sysdeps/kernel/Makefile.am b/sysdeps/kernel/Makefile.am index 9c318cf8..d632d1d0 100644 --- a/sysdeps/kernel/Makefile.am +++ b/sysdeps/kernel/Makefile.am @@ -2,19 +2,19 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la -libgtop_sysdeps_la_SOURCES = open.c close.c kernel.s cpu.c mem.c swap.c \ +libgtop_sysdeps_2_0_la_SOURCES = open.c close.c kernel.s cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c siglist.c procargs.c procmap.c \ netload.c ppp.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtopinclude_HEADERS = glibtop_server.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 noinst_HEADERS = kernel.h diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am index 1d8ac1ed..8ce5fee7 100644 --- a/sysdeps/linux/Makefile.am +++ b/sysdeps/linux/Makefile.am @@ -2,17 +2,17 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la -libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ +libgtop_sysdeps_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procargs.c procmap.c siglist.c \ sysinfo.c netload.c ppp.c -libgtop_sysdeps_la_LIBADD = @GLIB_LIBS@ +libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@ -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 diff --git a/sysdeps/names/Makefile.am b/sysdeps/names/Makefile.am index b8b04ed6..1a784dd5 100644 --- a/sysdeps/names/Makefile.am +++ b/sysdeps/names/Makefile.am @@ -2,9 +2,9 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_names.la +lib_LTLIBRARIES = libgtop_names-2.0.la -libgtop_names_la_SOURCES = cpu.c mem.c swap.c uptime.c loadavg.c \ +libgtop_names_2_0_la_SOURCES = cpu.c mem.c swap.c uptime.c loadavg.c \ shm_limits.c msg_limits.c sem_limits.c \ proclist.c sysdeps.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c \ @@ -12,5 +12,5 @@ libgtop_names_la_SOURCES = cpu.c mem.c swap.c uptime.c loadavg.c \ mountlist.c procargs.c procmap.c netload.c \ ppp.c -libgtop_names_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_names_2_0_la_LDFLAGS = $(LT_VERSION_INFO) diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am index 71e3b924..2cccd0aa 100644 --- a/sysdeps/osf1/Makefile.am +++ b/sysdeps/osf1/Makefile.am @@ -2,22 +2,22 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la -libgtop_sysdeps_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ +libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c ppp.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_la_LIBADD = -lmach +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LIBADD = -lmach -libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c proclist.c \ +libgtop_sysdeps_suid_2_0_la_SOURCES = open_suid.c close_suid.c proclist.c \ procstate.c procuid.c proctime.c procmem.c \ procsignal.c prockernel.c procsegment.c \ procmap.c procargs.c netload.c -libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_suid_la_LIBADD = -lmach +libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_suid_2_0_la_LIBADD = -lmach libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 noinst_HEADERS = glibtop_suid.h diff --git a/sysdeps/solaris/Makefile.am b/sysdeps/solaris/Makefile.am index b210470e..1459140e 100644 --- a/sysdeps/solaris/Makefile.am +++ b/sysdeps/solaris/Makefile.am @@ -2,27 +2,27 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la -libgtop_sysdeps_la_SOURCES = open.c close.c siglist.c cpu.c mem.c \ +libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c \ safeio.c swap.c uptime.c loadavg.c \ proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c \ prockernel.c procsegment.c procargs.c \ procmap.c netload.c ppp.c procdata.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_la_LIBADD = @DL_LIB@ +libgtop_sysdeps_2_0_la_LIBADD = @DL_LIB@ -libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c \ +libgtop_sysdeps_suid_2_0_la_SOURCES = open_suid.c close_suid.c \ shm_limits.c msg_limits.c sem_limits.c -libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 noinst_HEADERS = glibtop_private.h glibtop_suid.h safeio.h diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am index a64fa05f..8e18f2cb 100644 --- a/sysdeps/stub/Makefile.am +++ b/sysdeps/stub/Makefile.am @@ -2,16 +2,16 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la -libgtop_sysdeps_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ +libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procargs.c procmap.c netload.c \ ppp.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtopinclude_HEADERS = glibtop_server.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 diff --git a/sysdeps/stub_suid/Makefile.am b/sysdeps/stub_suid/Makefile.am index 614adb7f..3842ad14 100644 --- a/sysdeps/stub_suid/Makefile.am +++ b/sysdeps/stub_suid/Makefile.am @@ -2,22 +2,22 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la -libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c +libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_suid_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ +libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procargs.c procmap.c netload.c \ ppp.c -libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 noinst_HEADERS = glibtop_suid.h diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am index 785f97cc..87ac8c74 100644 --- a/sysdeps/sun4/Makefile.am +++ b/sysdeps/sun4/Makefile.am @@ -2,21 +2,21 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la +lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la -libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c -libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_la_LIBADD = -lkvm +libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c +libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_2_0_la_LIBADD = -lkvm -libgtop_sysdeps_suid_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ +libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c ppp.c -libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_sysdeps_suid_la_LIBADD = -lkvm +libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) +libgtop_sysdeps_suid_2_0_la_LIBADD = -lkvm libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h -libgtopincludedir = $(includedir)/libgtop-1.0 +libgtopincludedir = $(includedir)/libgtop-2.0 noinst_HEADERS = glibtop_suid.h