diff --git a/ChangeLog b/ChangeLog index 8da013a9..cd0d120a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: + * configure.in: + * src/inodedb/.cvsignore: + * sysdeps/names/Makefile.am: + install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * lib/read.c: (glibtop_read_l): diff --git a/Makefile.am b/Makefile.am index 58e99d52..674af636 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,5 @@ -## Process this file with automake to produce Makefile.in. -if EXAMPLES -examples_SUBDIRS = examples -else -examples_SUBDIRS = -endif - -SUBDIRS = . po misc include sysdeps lib src \ - $(examples_SUBDIRS) doc +SUBDIRS = po misc include sysdeps lib src examples doc libgtopinclude_HEADERS = glibtop.h libgtopincludedir = $(includedir)/libgtop-2.0 @@ -20,9 +12,6 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \ dist-hook: cp libgtop.spec $(distdir) -release: - $(MAKE) dist distdir=$(PACKAGE)-$(VERSION) - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libgtop-2.0.pc diff --git a/configure.in b/configure.in index 98a55f91..58491d19 100644 --- a/configure.in +++ b/configure.in @@ -317,7 +317,7 @@ fi LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS" -LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0" +LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0" LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0" LIBGTOP_LIBS="$LIBGTOP_LIBS" diff --git a/examples/ChangeLog b/examples/ChangeLog index 7882a04f..075e4664 100644 --- a/examples/ChangeLog +++ b/examples/ChangeLog @@ -1,3 +1,11 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: + * smp.c: + * sysdeps.c: (main): install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + Fix building smp.c and sysdeps.c + 2003-10-20 Bastien Nocera * first.c: diff --git a/examples/Makefile.am b/examples/Makefile.am index a7e687ff..1b8c85fc 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -6,12 +6,7 @@ INCLUDES = @INCLUDES@ DEFS = @DEFS@ -# We install it in `libexec' since this will make it more easy -# to put the examples into an extra RPM package. - -libgtopdir = $(libexecdir)/libgtop - -libgtop_PROGRAMS = first second\ +noinst_PROGRAMS = first second\ mountlist procmap netload sysdeps timings \ @static_targets@ @smp_examples@ @@ -22,45 +17,35 @@ EXTRA_PROGRAMS = first_static second_static \ timings_static first_SOURCES = first.c -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 +first_LDADD = $(top_builddir)/lib/libgtop-2.0.la first_static_SOURCES = $(first_SOURCES) first_static_LDADD = $(first_LDADD) first_static_LDFLAGS = -static second_SOURCES = second.c -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 +second_LDADD = $(top_builddir)/lib/libgtop-2.0.la second_static_SOURCES = $(second_SOURCES) second_static_LDADD = $(second_LDADD) second_static_LDFLAGS = -static procmap_SOURCES = procmap.c -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 +procmap_LDADD = $(top_builddir)/lib/libgtop-2.0.la procmap_static_SOURCES = $(procmap_SOURCES) procmap_static_LDADD = $(procmap_LDADD) procmap_static_LDFLAGS = -static netload_SOURCES = netload.c -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 +netload_LDADD = $(top_builddir)/lib/libgtop-2.0.la netload_static_SOURCES = $(netload_SOURCES) netload_static_LDADD = $(netload_LDADD) netload_static_LDFLAGS = -static sysdeps_SOURCES = sysdeps.c -sysdeps_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_LDADD = $(top_builddir)/lib/libgtop-2.0.la sysdeps_static_SOURCES = $(sysdeps_SOURCES) sysdeps_static_LDADD = $(sysdeps_LDADD) @@ -71,8 +56,6 @@ third_names_LIBS = $(top_builddir)/sysdeps/names/libgtop_names-2.0.la third_SOURCES = third.c third_LDADD = $(third_names_LIBS) \ $(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 \ @INTLLIBS@ third_static_SOURCES = $(third_SOURCES) @@ -80,9 +63,7 @@ third_static_LDADD = $(third_LDADD) third_static_LDFLAGS = -static mountlist_SOURCES = mountlist.c -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 +mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la mountlist_static_SOURCES= $(mountlist_SOURCES) mountlist_static_LDADD = $(mountlist_LDADD) @@ -90,18 +71,14 @@ mountlist_static_LDFLAGS= -static smp_SOURCES = smp.c -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 +smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la smp_static_SOURCES = $(smp_SOURCES) smp_static_LDADD = $(smp_LDADD) smp_static_LDFLAGS = -static timings_SOURCES = timings.c -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 +timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la timings_static_SOURCES = $(timings_SOURCES) timings_static_LDADD = $(timings_LDADD) diff --git a/examples/smp.c b/examples/smp.c index 501cde91..46036c37 100644 --- a/examples/smp.c +++ b/examples/smp.c @@ -21,12 +21,16 @@ Boston, MA 02111-1307, USA. */ +#include + #include #include #include #include +#include + int main (int argc, char *argv []) { diff --git a/examples/sysdeps.c b/examples/sysdeps.c index a8370f17..f7aec4df 100644 --- a/examples/sysdeps.c +++ b/examples/sysdeps.c @@ -26,6 +26,7 @@ #include #include #include +#include #include @@ -68,7 +69,7 @@ main (int argc, char *argv []) glibtop_get_sysdeps (&sysdeps); -#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0) +#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f)) ? 1 : 0) printf ("Sysdeps (0x%08lx):\n\n" "\tfeatures:\t\t0x%08lx\n\n" diff --git a/src/inodedb/.cvsignore b/src/inodedb/.cvsignore index 80d8556f..fc061c31 100644 --- a/src/inodedb/.cvsignore +++ b/src/inodedb/.cvsignore @@ -1,5 +1,5 @@ Makefile.in Makefile -mkinodedb -file_by_inode +mkinodedb2 +file_by_inode2 .deps diff --git a/sysdeps/aix/ChangeLog b/sysdeps/aix/ChangeLog index 8ce5859b..624cd116 100644 --- a/sysdeps/aix/ChangeLog +++ b/sysdeps/aix/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * procsignal.c: (glibtop_get_proc_signal_s): s/u_int64_t/guint64/ diff --git a/sysdeps/aix/Makefile.am b/sysdeps/aix/Makefile.am index e0c6c2f6..e354bff7 100644 --- a/sysdeps/aix/Makefile.am +++ b/sysdeps/aix/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la libgtop_sysdeps_2_0_la_SOURCES = siglist.c nosuid.c diff --git a/sysdeps/common/ChangeLog b/sysdeps/common/ChangeLog index f341214b..a2260308 100644 --- a/sysdeps/common/ChangeLog +++ b/sysdeps/common/ChangeLog @@ -1,3 +1,10 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: + * fsusage.h: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + Include glib.h for the definition of guint64 + 2003-10-20 Bastien Nocera * inodedb.c: (glibtop_inodedb_close_s): fix compilation, thanks Jeff diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am index b6b56a93..c10cd4ca 100644 --- a/sysdeps/common/Makefile.am +++ b/sysdeps/common/Makefile.am @@ -1,4 +1,3 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ @@ -12,7 +11,7 @@ endif CFLAGS = @CFLAGS@ $(inodedb_DEFS) -lib_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la +noinst_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la libgtop_common_2_0_la_SOURCES = error.c gnuslib.c \ fsusage.c fsusage.h mountlist.c mountlist.h \ diff --git a/sysdeps/common/fsusage.h b/sysdeps/common/fsusage.h index 35cc8ef3..1da61953 100644 --- a/sysdeps/common/fsusage.h +++ b/sysdeps/common/fsusage.h @@ -15,6 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + /* Space usage statistics for a filesystem. Blocks are 512-byte. */ struct fs_usage { diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog index 87fd08a1..48c0a7a4 100644 --- a/sysdeps/freebsd/ChangeLog +++ b/sysdeps/freebsd/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * mem.c: (glibtop_get_mem_p): diff --git a/sysdeps/freebsd/Makefile.am b/sysdeps/freebsd/Makefile.am index b955e6ff..b959d33b 100644 --- a/sysdeps/freebsd/Makefile.am +++ b/sysdeps/freebsd/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c diff --git a/sysdeps/kernel/ChangeLog b/sysdeps/kernel/ChangeLog index 02f779c6..125cdf3c 100644 --- a/sysdeps/kernel/ChangeLog +++ b/sysdeps/kernel/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * glibtop_private.h: s/u_int64_t/guint64/ diff --git a/sysdeps/kernel/Makefile.am b/sysdeps/kernel/Makefile.am index d632d1d0..e3e68267 100644 --- a/sysdeps/kernel/Makefile.am +++ b/sysdeps/kernel/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la 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 \ diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog index d1d1b3bf..ae221dd3 100644 --- a/sysdeps/linux/ChangeLog +++ b/sysdeps/linux/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * glibtop_server.h: diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am index 8ce5fee7..139b6811 100644 --- a/sysdeps/linux/Makefile.am +++ b/sysdeps/linux/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la 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 \ diff --git a/sysdeps/names/Makefile.am b/sysdeps/names/Makefile.am index 1a784dd5..8cbc4501 100644 --- a/sysdeps/names/Makefile.am +++ b/sysdeps/names/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_names-2.0.la +noinst_LTLIBRARIES = libgtop_names-2.0.la 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 \ diff --git a/sysdeps/osf1/ChangeLog b/sysdeps/osf1/ChangeLog index bc26b330..e0d7aea9 100644 --- a/sysdeps/osf1/ChangeLog +++ b/sysdeps/osf1/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * glibtop_server.h: diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am index 2cccd0aa..ddae0c13 100644 --- a/sysdeps/osf1/Makefile.am +++ b/sysdeps/osf1/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la 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 \ diff --git a/sysdeps/solaris/ChangeLog b/sysdeps/solaris/ChangeLog index 849be399..907f441b 100644 --- a/sysdeps/solaris/ChangeLog +++ b/sysdeps/solaris/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * shm_limits.c: (glibtop_get_shm_limits_p): Apply patch by diff --git a/sysdeps/solaris/Makefile.am b/sysdeps/solaris/Makefile.am index 1459140e..f65247fb 100644 --- a/sysdeps/solaris/Makefile.am +++ b/sysdeps/solaris/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c \ safeio.c swap.c uptime.c loadavg.c \ diff --git a/sysdeps/stub/ChangeLog b/sysdeps/stub/ChangeLog index deb0ce78..4a6ddfc7 100644 --- a/sysdeps/stub/ChangeLog +++ b/sysdeps/stub/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * glibtop_server.h: diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am index 8e18f2cb..69ec9c1c 100644 --- a/sysdeps/stub/Makefile.am +++ b/sysdeps/stub/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la 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 \ diff --git a/sysdeps/stub_suid/ChangeLog b/sysdeps/stub_suid/ChangeLog index 71717038..2c4199eb 100644 --- a/sysdeps/stub_suid/ChangeLog +++ b/sysdeps/stub_suid/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * glibtop_machine.h: diff --git a/sysdeps/stub_suid/Makefile.am b/sysdeps/stub_suid/Makefile.am index 3842ad14..e0bb1629 100644 --- a/sysdeps/stub_suid/Makefile.am +++ b/sysdeps/stub_suid/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c diff --git a/sysdeps/sun4/ChangeLog b/sysdeps/sun4/ChangeLog index 525fc80b..56e3e62b 100644 --- a/sysdeps/sun4/ChangeLog +++ b/sysdeps/sun4/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Bastien Nocera + + * Makefile.am: install only one library, libgtop-2.0 + Fix build-time warnings due to the redefinition of guint64 + 2003-10-20 Bastien Nocera * glibtop_machine.h: diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am index 87ac8c74..d1aa20e4 100644 --- a/sysdeps/sun4/Makefile.am +++ b/sysdeps/sun4/Makefile.am @@ -1,8 +1,7 @@ -LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ INCLUDES = @INCLUDES@ -lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la +noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)