diff options
author | Benoît Dejean <bdejean@src.gnome.org> | 2005-08-03 22:47:19 +0000 |
---|---|---|
committer | Benoît Dejean <bdejean@src.gnome.org> | 2005-08-03 22:47:19 +0000 |
commit | 03bcc48da6f02fb612d8fbd84db62c4a7fd98edc (patch) | |
tree | 64b5b2dc76b0ebe75fa4782cc15b3e668c8ae3a7 | |
parent | 708285f0d2deb7557ad2ce14d85594e88aca369d (diff) | |
download | libgtop-03bcc48da6f02fb612d8fbd84db62c4a7fd98edc.tar.gz |
Removed static examples.
* configure.in:
* examples/Makefile.am:
Removed static examples.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.in | 21 | ||||
-rw-r--r-- | examples/Makefile.am | 71 |
3 files changed, 8 insertions, 91 deletions
@@ -1,3 +1,10 @@ +2005-08-04 Benoît Dejean <TazForEver@dlfp.org> + + * configure.in: + * examples/Makefile.am: + + Removed static examples. + 2005-08-02 Benoît Dejean <TazForEver@dlfp.org> * configure.in: diff --git a/configure.in b/configure.in index 23c04ae6..ea02667e 100644 --- a/configure.in +++ b/configure.in @@ -112,27 +112,6 @@ if test x$build_inodedb = xyes ; then AC_DEFINE(GLIBTOP_INODEDB) fi - -if test x$libgtop_smp = xyes ; then - smp_examples='smp' - smp_static_examples='smp_static' -else - smp_examples= - smp_static_examples= -fi - -if test "x$enable_static" != xno; then - static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples pprint_static procargs_static df_static netlist netlist_static openfiles_static" -else - static_targets="" -fi - -AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes) -AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes) - -AC_SUBST(static_targets) -AC_SUBST(smp_examples) - GLIB_REQUIRED=2.6.0 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) diff --git a/examples/Makefile.am b/examples/Makefile.am index a748f224..698692fc 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -8,112 +8,43 @@ DEFS = @DEFS@ noinst_PROGRAMS = first second pprint procargs df netlist \ mountlist procmap netload sysdeps timings \ - openfiles \ - @static_targets@ @smp_examples@ - -EXTRA_PROGRAMS = first_static second_static \ - mountlist_static procmap_static \ - smp smp_static openfiles_static \ - netload_static sysdeps_static \ - timings_static pprint_static procargs_static \ - df_static netlist_static + openfiles smp first_SOURCES = first.c 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 -lm -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 -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 -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 -sysdeps_static_SOURCES = $(sysdeps_SOURCES) -sysdeps_static_LDADD = $(sysdeps_LDADD) -sysdeps_static_LDFLAGS = -static - - mountlist_SOURCES = mountlist.c mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la -mountlist_static_SOURCES= $(mountlist_SOURCES) -mountlist_static_LDADD = $(mountlist_LDADD) -mountlist_static_LDFLAGS= -static - - smp_SOURCES = smp.c smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la -lm -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 -timings_static_SOURCES = $(timings_SOURCES) -timings_static_LDADD = $(timings_LDADD) -timings_static_LDFLAGS = -static - - pprint_SOURCES = pprint.c pprint_LDADD = $(top_builddir)/lib/libgtop-2.0.la -pprint_static_SOURCES = $(pprint_SOURCES) -pprint_static_LDADD = $(pprint_LDADD) -pprint_static_LDFLAGS = -static - - procargs_SOURCES = procargs.c procargs_LDADD = $(top_builddir)/lib/libgtop-2.0.la -procargs_static_SOURCES = $(procargs_SOURCES) -procargs_static_LDADD = $(procargs_LDADD) -procargs_static_LDFLAGS = -static - - df_SOURCES = df.c df_LDADD = $(top_builddir)/lib/libgtop-2.0.la -df_static_SOURCES = $(df_SOURCES) -df_static_LDADD = $(df_LDADD) -df_static_LDFLAGS = -static - - netlist_SOURCES = netlist.c netlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la -netlist_static_SOURCES = $(netlist_SOURCES) -netlist_static_LDADD = $(netlist_LDADD) -netlist_static_LDFLAGS = -static - - openfiles_SOURCES = openfiles.c openfiles_LDADD = $(top_builddir)/lib/libgtop-2.0.la - -openfiles_static_SOURCES = $(openfiles_SOURCES) -openfiles_static_LDADD = $(openfiles_LDADD) -openfiles_static_LDFLAGS = -static - - |