diff options
author | Bastien Nocera <hadess@hadess.net> | 2003-10-21 21:21:28 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@src.gnome.org> | 2003-10-21 21:21:28 +0000 |
commit | 31133cc3dc92cb25f53b7bee28e5e12bd0be77aa (patch) | |
tree | 183a8ebf627fd25d7604c6aa43593b1541c8c61e /examples | |
parent | 58b323cfab34a79a6b66ffc00b24af2a71e9d9c5 (diff) | |
download | libgtop-31133cc3dc92cb25f53b7bee28e5e12bd0be77aa.tar.gz |
install only one library, libgtop-2.0 Fix build-time warnings due to the
2003-10-21 Bastien Nocera <hadess@hadess.net>
* 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
Diffstat (limited to 'examples')
-rw-r--r-- | examples/ChangeLog | 8 | ||||
-rw-r--r-- | examples/Makefile.am | 41 | ||||
-rw-r--r-- | examples/smp.c | 4 | ||||
-rw-r--r-- | examples/sysdeps.c | 3 |
4 files changed, 23 insertions, 33 deletions
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 <hadess@hadess.net> + + * 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 <hadess@hadess.net> * 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 <config.h> + #include <locale.h> #include <math.h> #include <glibtop.h> #include <glibtop/cpu.h> +#include <libgnome/gnome-i18n.h> + 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 <glibtop.h> #include <glibtop/open.h> #include <glibtop/close.h> +#include <glibtop/sysdeps.h> #include <glibtop/parameter.h> @@ -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" |