diff options
| author | Bastien Nocera <hadess@hadess.net> | 2003-10-20 13:14:53 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2003-10-20 13:14:53 +0000 |
| commit | af8478ca5fb759bd9e22ead29d83be5634b8fc87 (patch) | |
| tree | 0b9545a019dfbe8e2f46ab0c37d2b16b8d15b369 | |
| parent | 532aec1891ef6c91dbf3540239c514290d9b935b (diff) | |
| download | libgtop-af8478ca5fb759bd9e22ead29d83be5634b8fc87.tar.gz | |
removed traces of guile, intllibs and libgnomesupport
2003-10-20 Bastien Nocera <hadess@hadess.net>
* lib/Makefile.am:
* libgtop-config.in:
* libgtop.spec.in:
* libgtopConf.sh.in:
* src/inodedb/Makefile.am: removed traces of guile, intllibs and
libgnomesupport
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | backends/server/ChangeLog | 4 | ||||
| -rw-r--r-- | backends/server/Makefile.am | 3 | ||||
| -rw-r--r-- | doc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 | ||||
| -rw-r--r-- | examples/ChangeLog | 4 | ||||
| -rw-r--r-- | examples/Makefile.am | 34 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | libgtop-config.in | 46 | ||||
| -rw-r--r-- | libgtop.spec.in | 6 | ||||
| -rw-r--r-- | libgtopConf.sh.in | 44 | ||||
| -rw-r--r-- | src/daemon/ChangeLog | 4 | ||||
| -rw-r--r-- | src/daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/inodedb/Makefile.am | 6 |
14 files changed, 44 insertions, 129 deletions
@@ -1,5 +1,14 @@ 2003-10-20 Bastien Nocera <hadess@hadess.net> + * lib/Makefile.am: + * libgtop-config.in: + * libgtop.spec.in: + * libgtopConf.sh.in: + * src/inodedb/Makefile.am: removed traces of guile, intllibs and + libgnomesupport + +2003-10-20 Bastien Nocera <hadess@hadess.net> + * .cvsignore: updated * configure.in: removed all traces of guile stuff * sysdeps/guile/.cvsignore: removed diff --git a/backends/server/ChangeLog b/backends/server/ChangeLog index 717656a6..8c9f2133 100644 --- a/backends/server/ChangeLog +++ b/backends/server/ChangeLog @@ -1,3 +1,7 @@ +2003-10-20 Bastien Nocera <hadess@hadess.net> + + * Makefile.am: removed traces of guile, intllibs and libgnomesupport + 2000-11-27 Martin Baulig <martin@home-of-linux.org> * backend-server.c (backend_server_quark): New global variable. diff --git a/backends/server/Makefile.am b/backends/server/Makefile.am index 5b72fa05..ef446f45 100644 --- a/backends/server/Makefile.am +++ b/backends/server/Makefile.am @@ -50,8 +50,7 @@ libgtop_server_SOURCES = \ libgtop_server_LDADD = \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \ - $(top_builddir)/sysdeps/common/libgtop_suid_common.la \ - @LIBSUPPORT@ + $(top_builddir)/sysdeps/common/libgtop_suid_common.la if ENABLE_STATIC libgtop_server_LDFLAGS = -static diff --git a/doc/ChangeLog b/doc/ChangeLog index cbb8d46e..39fdedbf 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2003-10-20 Bastien Nocera <hadess@hadess.net> + + * Makefile.am: removed traces of guile, intllibs and libgnomesupport + 2002-03-12 James Henstridge <james@daa.com.au> * Makefile.am (MAKEINFO): using += seems to screw up the build diff --git a/doc/Makefile.am b/doc/Makefile.am index 03554c73..9b9cd055 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -18,10 +18,6 @@ auto-macros.texi: auto-macros.texi.in Makefile -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' \ @@ -33,7 +29,6 @@ auto-macros.texi: auto-macros.texi.in Makefile -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 diff --git a/examples/ChangeLog b/examples/ChangeLog index b3378fe2..bfd088c6 100644 --- a/examples/ChangeLog +++ b/examples/ChangeLog @@ -1,3 +1,7 @@ +2003-10-20 Bastien Nocera <hadess@hadess.net> + + * Makefile.am: removed traces of guile, intllibs and libgnomesupport + 2001-01-14 Abel Cheung <maddog@linux.org.hk> * \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE. diff --git a/examples/Makefile.am b/examples/Makefile.am index be8d3a4c..a7e687ff 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -13,7 +13,7 @@ libgtopdir = $(libexecdir)/libgtop libgtop_PROGRAMS = first second\ mountlist procmap netload sysdeps timings \ - @static_targets@ @guile_examples@ @smp_examples@ + @static_targets@ @smp_examples@ EXTRA_PROGRAMS = first_static second_static \ mountlist_static procmap_static \ @@ -24,8 +24,7 @@ EXTRA_PROGRAMS = first_static second_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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la first_static_SOURCES = $(first_SOURCES) first_static_LDADD = $(first_LDADD) @@ -34,8 +33,7 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la second_static_SOURCES = $(second_SOURCES) second_static_LDADD = $(second_LDADD) @@ -44,10 +42,7 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ - - + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la procmap_static_SOURCES = $(procmap_SOURCES) procmap_static_LDADD = $(procmap_LDADD) @@ -56,8 +51,7 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la netload_static_SOURCES = $(netload_SOURCES) netload_static_LDADD = $(netload_LDADD) @@ -66,23 +60,20 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la 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-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-2.0.la \ - $(third_guile_names_LIBS) $(third_names_LIBS) \ +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 \ - @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@ + @INTLLIBS@ third_static_SOURCES = $(third_SOURCES) third_static_LDADD = $(third_LDADD) @@ -91,8 +82,7 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la mountlist_static_SOURCES= $(mountlist_SOURCES) mountlist_static_LDADD = $(mountlist_LDADD) @@ -102,8 +92,7 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la smp_static_SOURCES = $(smp_SOURCES) smp_static_LDADD = $(smp_LDADD) @@ -112,8 +101,7 @@ 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 \ - @LIBSUPPORT@ @INTLLIBS@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la timings_static_SOURCES = $(timings_SOURCES) timings_static_LDADD = $(timings_LDADD) diff --git a/lib/Makefile.am b/lib/Makefile.am index a1942003..cc1183cc 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -9,7 +9,7 @@ libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c \ sysdeps.c libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -libgtop_2_0_la_LIBADD = $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib) $(INTLLIBS) +libgtop_2_0_la_LIBADD = $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib) BUILT_SOURCES = lib.c diff --git a/libgtop-config.in b/libgtop-config.in deleted file mode 100644 index 9f1904f7..00000000 --- a/libgtop-config.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -usage="\ -Usage: libgtop-config [--version] [--config] [--features-def-file] [--cflags] [--libs] [--extra-libs]" - -config_file="@LIBGTOP_LIBDIR@/libgtopConf.sh" -. $config_file - -features_def_file="@LIBGTOP_LIBDIR@/libgtop-features.def" - -if test $# -eq 0; then - echo "${usage}" 1>&2 - exit 1 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --version) - echo $LIBGTOP_VERSION - ;; - --config) - echo $config_file - ;; - --features-def-file) - echo $features_def_file - ;; - --cflags) - echo $LIBGTOP_INCS - ;; - --libs) - echo $LIBGTOP_LIBS - ;; - --extra-libs) - echo $LIBGTOP_EXTRA_LIBS - ;; - *) - echo "${usage}" 1>&2 - exit 1 - esac - shift -done diff --git a/libgtop.spec.in b/libgtop.spec.in index 3584b987..450ff0c9 100644 --- a/libgtop.spec.in +++ b/libgtop.spec.in @@ -59,12 +59,12 @@ Examples for LibGTop. %build # Needed for snapshot releases. if [ ! -f configure ]; then - CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile --with-libgtop-smp + CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp else %ifarch alpha - CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile --with-libgtop-smp + CFLAGS="$RPM_OPT_FLAGS" ./configure --host=alpha-redhat-linux --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp %else - CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-guile --with-libgtop-smp + CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp %endif fi diff --git a/libgtopConf.sh.in b/libgtopConf.sh.in deleted file mode 100644 index 3439ffdb..00000000 --- a/libgtopConf.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -# -# Configuration of the libgtop package -# - -LIBGTOP_LIBDIR="@LIBGTOP_LIBDIR@" -LIBGTOP_INCLUDEDIR="@LIBGTOP_INCLUDEDIR@" - -LIBGTOP_DATADIR="@LIBGTOP_DATADIR@" - -LIBGTOP_EXTRA_LIBS="@LIBGTOP_EXTRA_LIBS@" - -LIBGTOP_LIBS="@LIBGTOP_LIBS@" -LIBGTOP_INCS="@LIBGTOP_INCS@" - -LIBGTOP_NAMES_LIBS="@LIBGTOP_NAMES_LIBS@" -LIBGTOP_NAMES_INCS="@LIBGTOP_NAMES_INCS@" - -LIBGTOP_GUILE_LIBS="@LIBGTOP_GUILE_LIBS@" -LIBGTOP_GUILE_INCS="@LIBGTOP_GUILE_INCS@" - -LIBGTOP_GUILE_NAMES_LIBS="@LIBGTOP_GUILE_NAMES_LIBS@" -LIBGTOP_GUILE_NAMES_INCS="@LIBGTOP_GUILE_NAMES_INCS@" - -LIBGTOP_BINDIR="@LIBGTOP_BINDIR@" -LIBGTOP_SERVER="@LIBGTOP_SERVER@" - -LIBGTOP_MAJOR_VERSION="@LIBGTOP_MAJOR_VERSION@" -LIBGTOP_MINOR_VERSION="@LIBGTOP_MINOR_VERSION@" -LIBGTOP_MICRO_VERSION="@LIBGTOP_MICRO_VERSION@" - -LIBGTOP_VERSION="@LIBGTOP_VERSION@" -LIBGTOP_VERSION_CODE="@LIBGTOP_VERSION_CODE@" - -MODULE_VERSION="libgtop-@LIBGTOP_VERSION@" - -LIBGTOP_SERVER_VERSION="@LIBGTOP_SERVER_VERSION@" - -libgtop_sysdeps_dir="@libgtop_sysdeps_dir@" -libgtop_need_server="@libgtop_need_server@" -libgtop_use_machine_h="@libgtop_use_machine_h@" - -libgtop_guile_found="@libgtop_guile_found@" - -libgtop_want_examples="@libgtop_want_examples@" diff --git a/src/daemon/ChangeLog b/src/daemon/ChangeLog index 51f37e04..36c5efd4 100644 --- a/src/daemon/ChangeLog +++ b/src/daemon/ChangeLog @@ -1,5 +1,9 @@ 2003-10-20 Bastien Nocera <hadess@hadess.net> + * Makefile.am: removed traces of guile, intllibs and libgnomesupport + +2003-10-20 Bastien Nocera <hadess@hadess.net> + * Makefile.am: * gnuserv.c: remove guile and libgnome-support stuff diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 47ec0f22..6ed0de74 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -40,7 +40,7 @@ libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ @sysdeps_suid_lib@ \ $(suid_sysdeps) $(suid_common)\ $(LIBGTOP_LIBS)\ - @INTLLIBS@ @libs_xauth@ -lpopt + @libs_xauth@ 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 \ diff --git a/src/inodedb/Makefile.am b/src/inodedb/Makefile.am index 52b6375c..19923e80 100644 --- a/src/inodedb/Makefile.am +++ b/src/inodedb/Makefile.am @@ -4,12 +4,10 @@ INCLUDES = @INCLUDES@ 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@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.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@ + $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la EXTRA_DIST = README.inodedb |