oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed traces of guile, intllibs and libgnomesupport

Browse Source 
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
This commit is contained in:
Bastien Nocera
2003-10-20 13:14:53 +00:00
committed by Bastien Nocera
parent 532aec1891
commit af8478ca5f
14 changed files with 44 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
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> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* .cvsignore: updated * .cvsignore: updated

4
backends/server/ChangeLog
View File

@@ -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> 2000-11-27 Martin Baulig <martin@home-of-linux.org>
* backend-server.c (backend_server_quark): New global variable. * backend-server.c (backend_server_quark): New global variable.

3
backends/server/Makefile.am
View File

@@ -50,8 +50,7 @@ libgtop_server_SOURCES = \
libgtop_server_LDADD = \ libgtop_server_LDADD = \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
$(top_builddir)/sysdeps/common/libgtop_suid_common.la \ $(top_builddir)/sysdeps/common/libgtop_suid_common.la
@LIBSUPPORT@
if ENABLE_STATIC if ENABLE_STATIC
libgtop_server_LDFLAGS = -static libgtop_server_LDFLAGS = -static

4
doc/ChangeLog
View File

@@ -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> 2002-03-12 James Henstridge <james@daa.com.au>
* Makefile.am (MAKEINFO): using += seems to screw up the build * Makefile.am (MAKEINFO): using += seems to screw up the build

5
doc/Makefile.am
View File

@@ -18,10 +18,6 @@ auto-macros.texi: auto-macros.texi.in Makefile
-e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \ -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
-e 's#\%LIBGTOP_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \ -e 's#\%LIBGTOP_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \
-e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#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_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
-e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \ -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
-e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#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_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
-e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \ -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
-e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#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' \ -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
< $(srcdir)/auto-macros.texi.in > auto-macros.tmp < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp

4
examples/ChangeLog
View File

@@ -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> 2001-01-14 Abel Cheung <maddog@linux.org.hk>
* \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE. * \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE.

34
examples/Makefile.am
View File

@@ -13,7 +13,7 @@ libgtopdir = $(libexecdir)/libgtop
libgtop_PROGRAMS = first second\ libgtop_PROGRAMS = first second\
mountlist procmap netload sysdeps timings \ mountlist procmap netload sysdeps timings \
@static_targets@ @guile_examples@ @smp_examples@ @static_targets@ @smp_examples@
EXTRA_PROGRAMS = first_static second_static \ EXTRA_PROGRAMS = first_static second_static \
mountlist_static procmap_static \ mountlist_static procmap_static \
@@ -24,8 +24,7 @@ EXTRA_PROGRAMS = first_static second_static \
first_SOURCES = first.c first_SOURCES = first.c
first_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ first_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
first_static_SOURCES = $(first_SOURCES) first_static_SOURCES = $(first_SOURCES)
first_static_LDADD = $(first_LDADD) first_static_LDADD = $(first_LDADD)
@@ -34,8 +33,7 @@ first_static_LDFLAGS = -static
second_SOURCES = second.c second_SOURCES = second.c
second_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ second_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
second_static_SOURCES = $(second_SOURCES) second_static_SOURCES = $(second_SOURCES)
second_static_LDADD = $(second_LDADD) second_static_LDADD = $(second_LDADD)
@@ -44,10 +42,7 @@ second_static_LDFLAGS = -static
procmap_SOURCES = procmap.c procmap_SOURCES = procmap.c
procmap_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ procmap_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
procmap_static_SOURCES = $(procmap_SOURCES) procmap_static_SOURCES = $(procmap_SOURCES)
procmap_static_LDADD = $(procmap_LDADD) procmap_static_LDADD = $(procmap_LDADD)
@@ -56,8 +51,7 @@ procmap_static_LDFLAGS = -static
netload_SOURCES = netload.c netload_SOURCES = netload.c
netload_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ netload_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
netload_static_SOURCES = $(netload_SOURCES) netload_static_SOURCES = $(netload_SOURCES)
netload_static_LDADD = $(netload_LDADD) netload_static_LDADD = $(netload_LDADD)
@@ -66,23 +60,20 @@ netload_static_LDFLAGS = -static
sysdeps_SOURCES = sysdeps.c sysdeps_SOURCES = sysdeps.c
sysdeps_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ sysdeps_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
sysdeps_static_SOURCES = $(sysdeps_SOURCES) sysdeps_static_SOURCES = $(sysdeps_SOURCES)
sysdeps_static_LDADD = $(sysdeps_LDADD) sysdeps_static_LDADD = $(sysdeps_LDADD)
sysdeps_static_LDFLAGS = -static 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_names_LIBS = $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
third_SOURCES = third.c third_SOURCES = third.c
third_LDADD = $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \ third_LDADD = $(third_names_LIBS) \
$(third_guile_names_LIBS) $(third_names_LIBS) \
$(top_builddir)/lib/libgtop-2.0.la \ $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-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_SOURCES = $(third_SOURCES)
third_static_LDADD = $(third_LDADD) third_static_LDADD = $(third_LDADD)
@@ -91,8 +82,7 @@ third_static_LDFLAGS = -static
mountlist_SOURCES = mountlist.c mountlist_SOURCES = mountlist.c
mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
mountlist_static_SOURCES= $(mountlist_SOURCES) mountlist_static_SOURCES= $(mountlist_SOURCES)
mountlist_static_LDADD = $(mountlist_LDADD) mountlist_static_LDADD = $(mountlist_LDADD)
@@ -102,8 +92,7 @@ mountlist_static_LDFLAGS= -static
smp_SOURCES = smp.c smp_SOURCES = smp.c
smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
smp_static_SOURCES = $(smp_SOURCES) smp_static_SOURCES = $(smp_SOURCES)
smp_static_LDADD = $(smp_LDADD) smp_static_LDADD = $(smp_LDADD)
@@ -112,8 +101,7 @@ smp_static_LDFLAGS = -static
timings_SOURCES = timings.c timings_SOURCES = timings.c
timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
timings_static_SOURCES = $(timings_SOURCES) timings_static_SOURCES = $(timings_SOURCES)
timings_static_LDADD = $(timings_LDADD) timings_static_LDADD = $(timings_LDADD)

2
lib/Makefile.am
View File

@@ -9,7 +9,7 @@ libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c \
sysdeps.c sysdeps.c
libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO) 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 BUILT_SOURCES = lib.c

46
libgtop-config.in
View File

@@ -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

6
libgtop.spec.in
View File

@@ -59,12 +59,12 @@ Examples for LibGTop.
%build %build
# Needed for snapshot releases. # Needed for snapshot releases.
if [ ! -f configure ]; then 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 else
%ifarch alpha %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 %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 %endif
fi fi

44
libgtopConf.sh.in
View File

@@ -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@"

4
src/daemon/ChangeLog
View File

@@ -1,3 +1,7 @@
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> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* Makefile.am: * Makefile.am:

2
src/daemon/Makefile.am
View File

@@ -40,7 +40,7 @@ libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
@sysdeps_suid_lib@ \ @sysdeps_suid_lib@ \
$(suid_sysdeps) $(suid_common)\ $(suid_sysdeps) $(suid_common)\
$(LIBGTOP_LIBS)\ $(LIBGTOP_LIBS)\
@INTLLIBS@ @libs_xauth@ -lpopt @libs_xauth@
libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h 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 \ libgtop_server2_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \

6
src/inodedb/Makefile.am
View File

@@ -4,12 +4,10 @@ INCLUDES = @INCLUDES@
mkinodedb2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \ mkinodedb2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \ $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
file_by_inode2_LDADD = $(top_builddir)/lib/libgtop-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/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \ $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
@LIBSUPPORT@ @INTLLIBS@
EXTRA_DIST = README.inodedb EXTRA_DIST = README.inodedb