From 81e0cb5a9253392bb3d973c7622b30afcc700b51 Mon Sep 17 00:00:00 2001 From: Sebastien Bacher Date: Sat, 9 Apr 2005 13:45:49 +0000 Subject: [PATCH] libgtop2 (2.10.0-1) experimental; urgency=low * New upstream version. * Update for the soname changes. * debian/control.in: - dropped libgtop2-daemon to follow upstream changes. - updated for the soname change. * debian/patches/10_relibtoolize.patch: - dropped, the new version is fine. * debian/rules: - updated the shlibs. * debian/watch: - updated. -- Sebastien Bacher Sat, 9 Apr 2005 15:31:19 +0200 --- debian/changelog | 15 +- debian/control | 23 +- debian/control.in | 29 +- debian/patches/10_relibtoolize.patch | 6859 -------------------------- debian/rules | 1 + debian/watch | 2 +- 6 files changed, 27 insertions(+), 6902 deletions(-) delete mode 100644 debian/patches/10_relibtoolize.patch diff --git a/debian/changelog b/debian/changelog index 6e83eb35..012a5cba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,18 @@ -libgtop2 (2.6.0-5) UNRELEASED; urgency=low +libgtop2 (2.10.0-1) experimental; urgency=low + * New upstream version. + * Update for the soname changes. * debian/control.in: - + Updated description to use GNOME instead of Gnome. + - dropped libgtop2-daemon to follow upstream changes. + - updated for the soname change. + * debian/patches/10_relibtoolize.patch: + - dropped, the new version is fine. + * debian/rules: + - updated the shlibs. + * debian/watch: + - updated. - -- Marc 'HE' Brockschmidt Thu, 10 Jun 2004 14:43:35 +0200 + -- Sebastien Bacher Sat, 9 Apr 2005 15:31:19 +0200 libgtop2 (2.6.0-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 89789cc0..7a1d9c7a 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,16 @@ Source: libgtop2 Section: libs Priority: optional Maintainer: Sebastien Bacher -Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Ondřej Surý , Rob Bradford , Rob Taylor , Robert McQueen , Ross Burton , Takuo KITAME +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sjoerd Simons , Takuo KITAME Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo Standards-Version: 3.6.1.0 -Package: libgtop2-2 +Package: libgtop2-5 Architecture: any Section: libs Depends: ${shlibs:Depends} -Conflicts: libgtop2 -Replaces: libgtop2 +Conflicts: libgtop2, libgtop2-2, libgtop2-4 +Replaces: libgtop2, libgtop2-2, libgtop2-4 Description: Libraries for gtop system monitoring library (part of Gnome 2) Gnome is the "GNU Network Object Model Environment" . @@ -24,7 +24,7 @@ Description: Libraries for gtop system monitoring library (part of Gnome 2) Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-2 (= ${Source-Version}), libglib2.0-dev +Depends: libgtop2-5 (= ${Source-Version}), libglib2.0-dev Description: Dev libraries for gtop system monitoring library (part of Gnome 2) Gnome is the "GNU Network Object Model Environment" . @@ -34,16 +34,3 @@ Description: Dev libraries for gtop system monitoring library (part of Gnome 2) This package contains the include files and static library for the gtop libraries which read information about processes and the running systems. - -Package: libgtop2-daemon -Architecture: any -Section: utils -Depends: ${shlibs:Depends} -Description: gtop daemon for monitoring remote machines (part of Gnome 2) - Gnome is the "GNU Network Object Model Environment" - . - It is a project to build a complete, user-friendly desktop based - entirely on free software. - . - This package contains the libgtop_daemon which can be used to monitor - the processes on remote systems. diff --git a/debian/control.in b/debian/control.in index b1140b4d..507c9ece 100644 --- a/debian/control.in +++ b/debian/control.in @@ -6,14 +6,14 @@ Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 4.0), gettext, pkg-config, libpopt-dev, xlibs-dev, libglib2.0-dev, gnome-pkg-tools, cdbs, texinfo Standards-Version: 3.6.1.0 -Package: libgtop2-2 +Package: libgtop2-5 Architecture: any Section: libs Depends: ${shlibs:Depends} -Conflicts: libgtop2 -Replaces: libgtop2 -Description: Libraries for gtop system monitoring library (part of GNOME 2) - GNOME is the "GNU Network Object Model Environment" +Conflicts: libgtop2, libgtop2-2, libgtop2-4 +Replaces: libgtop2, libgtop2-2, libgtop2-4 +Description: Libraries for gtop system monitoring library (part of Gnome 2) + Gnome is the "GNU Network Object Model Environment" . It is a project to build a complete, user-friendly desktop based entirely on free software. @@ -24,9 +24,9 @@ Description: Libraries for gtop system monitoring library (part of GNOME 2) Package: libgtop2-dev Architecture: any Section: libdevel -Depends: libgtop2-2 (= ${Source-Version}), libglib2.0-dev -Description: Dev libraries for gtop system monitoring library (part of GNOME 2) - GNOME is the "GNU Network Object Model Environment" +Depends: libgtop2-5 (= ${Source-Version}), libglib2.0-dev +Description: Dev libraries for gtop system monitoring library (part of Gnome 2) + Gnome is the "GNU Network Object Model Environment" . It is a project to build a complete, user-friendly desktop based entirely on free software. @@ -34,16 +34,3 @@ Description: Dev libraries for gtop system monitoring library (part of GNOME 2) This package contains the include files and static library for the gtop libraries which read information about processes and the running systems. - -Package: libgtop2-daemon -Architecture: any -Section: utils -Depends: ${shlibs:Depends} -Description: gtop daemon for monitoring remote machines (part of GNOME 2) - GNOME is the "GNU Network Object Model Environment" - . - It is a project to build a complete, user-friendly desktop based - entirely on free software. - . - This package contains the libgtop_daemon which can be used to monitor - the processes on remote systems. diff --git a/debian/patches/10_relibtoolize.patch b/debian/patches/10_relibtoolize.patch deleted file mode 100644 index 5104bf23..00000000 --- a/debian/patches/10_relibtoolize.patch +++ /dev/null @@ -1,6859 +0,0 @@ -diff -urN libgtop2-2.6.0.orig/aclocal.m4 libgtop2-2.6.0/aclocal.m4 ---- libgtop2-2.6.0.orig/aclocal.m4 2004-05-29 01:12:17.000000000 -0300 -+++ libgtop2-2.6.0/aclocal.m4 2004-05-29 01:13:43.000000000 -0300 -@@ -1898,6 +1898,7 @@ - # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - - # serial 47 AC_PROG_LIBTOOL -+# Debian $Rev: 203 $ - - - # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -@@ -3316,27 +3317,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -- if AC_TRY_EVAL(ac_compile); then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -4075,19 +4059,10 @@ - - # This must be Linux ELF. - linux*) -- case $host_cpu in -- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else -@@ -5081,7 +5056,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -6571,7 +6546,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | knetbsd*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -6882,6 +6857,9 @@ - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; -+ linux*) -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no -+ ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -7011,7 +6989,7 @@ - fi - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -7069,6 +7047,7 @@ - else - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds" - fi -+ _LT_AC_TAGVAR(link_all_deplibs, $1)=no - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi -@@ -7428,7 +7407,7 @@ - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -diff -urN libgtop2-2.6.0.orig/config.guess libgtop2-2.6.0/config.guess ---- libgtop2-2.6.0.orig/config.guess 2004-05-29 01:12:17.000000000 -0300 -+++ libgtop2-2.6.0/config.guess 2004-05-29 01:13:45.000000000 -0300 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-06-17' -+timestamp='2004-03-12' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -136,13 +136,6 @@ - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - --## for Red Hat Linux --if test -f /etc/redhat-release ; then -- VENDOR=redhat ; --else -- VENDOR= ; --fi -- - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -204,12 +197,18 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit 0 ;; -+ amd64:OpenBSD:*:*) -+ echo x86_64-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ cats:OpenBSD:*:*) -+ echo arm-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -228,6 +227,9 @@ - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ pegasos:OpenBSD:*:*) -+ echo powerpc-unknown-openbsd${UNAME_RELEASE} -+ exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -@@ -243,10 +245,24 @@ - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; -+ *:ekkoBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} -+ exit 0 ;; -+ macppc:MirBSD:*:*) -+ echo powerppc-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; -+ *:MirBSD:*:*) -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} -+ exit 0 ;; - alpha:OSF1:*:*) -- if test $UNAME_RELEASE = "V4.0"; then -+ case $UNAME_RELEASE in -+ *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` -- fi -+ ;; -+ *5.*) -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ ;; -+ esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU -@@ -284,11 +300,12 @@ - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac -+ # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. -- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; - Alpha*:OpenVMS:*:*) - echo alpha-hp-vms -@@ -314,6 +331,9 @@ - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; -+ *:OS400:*:*) -+ echo powerpc-ibm-os400 -+ exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; -@@ -406,6 +426,9 @@ - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; -+ m68k:machten:*:*) -+ echo m68k-apple-machten${UNAME_RELEASE} -+ exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; -@@ -741,7 +764,7 @@ - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - *:UNICOS/mp:*:*) -- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' -+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -@@ -749,6 +772,11 @@ - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; -+ 5000:UNIX_System_V:4.*:*) -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit 0 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; -@@ -758,7 +786,7 @@ - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; -- *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) -+ *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -@@ -770,7 +798,10 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} -+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using -+ # FreeBSD's kernel, but not the complete OS. -+ case ${LIBC} in gnu) kernel_only='k' ;; esac -+ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin -@@ -803,8 +834,13 @@ - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) -+ # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; -+ *:GNU/*:*:*) -+ # other systems with GNU libc and userland -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ exit 0 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; -@@ -815,7 +851,10 @@ - echo cris-axis-linux-gnu - exit 0 ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR:-unknown}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit 0 ;; -+ m32r*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -859,10 +898,10 @@ - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - ppc:Linux:*:*) -- echo powerpc-${VENDOR:-unknown}-linux-gnu -+ echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) -- echo powerpc64-${VENDOR:-unknown}-linux-gnu -+ echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -890,7 +929,7 @@ - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR:-ibm}-linux-gnu -+ echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -902,7 +941,7 @@ - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) -- echo x86_64-${VENDOR:-unknown}-linux-gnu -+ echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so -@@ -952,9 +991,12 @@ - LIBC=gnuaout - #endif - #endif -+ #ifdef __dietlibc__ -+ LIBC=dietlibc -+ #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` -- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR:-pc}-linux-${LIBC}" && exit 0 -+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; - i*86:DYNIX/ptx:4*:*) -@@ -982,6 +1024,9 @@ - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; -+ i*86:syllable:*:*) -+ echo ${UNAME_MACHINE}-pc-syllable -+ exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; -@@ -1053,7 +1098,7 @@ - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; -- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) -+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -@@ -1168,7 +1213,7 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; -- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) -+ NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) -@@ -1212,6 +1257,9 @@ - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; -+ *:DragonFly:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ exit 0 ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -diff -urN libgtop2-2.6.0.orig/config.sub libgtop2-2.6.0/config.sub ---- libgtop2-2.6.0.orig/config.sub 2004-05-29 01:12:17.000000000 -0300 -+++ libgtop2-2.6.0/config.sub 2004-05-29 01:13:45.000000000 -0300 -@@ -3,7 +3,7 @@ - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - # 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - --timestamp='2003-06-18' -+timestamp='2004-03-12' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -118,7 +118,8 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) -+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ -+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -@@ -228,14 +229,15 @@ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ -+ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ -- | ip2k \ -- | m32r | m68000 | m68k | m88k | mcore \ -+ | ip2k | iq2000 \ -+ | m32r | m32rle | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -247,6 +249,7 @@ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ -+ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ -@@ -257,10 +260,9 @@ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ -- | s390 | s390x \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ -- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ -+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ -@@ -305,8 +307,8 @@ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ -- | ip2k-* \ -- | m32r-* \ -+ | ip2k-* | iq2000-* \ -+ | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ -@@ -320,6 +322,7 @@ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ -+ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ -@@ -330,11 +333,10 @@ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ -- | s390-* | s390x-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ -@@ -361,6 +363,9 @@ - basic_machine=a29k-amd - os=-udi - ;; -+ abacus) -+ basic_machine=abacus-unknown -+ ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout -@@ -378,6 +383,9 @@ - amd64) - basic_machine=x86_64-pc - ;; -+ amd64-*) -+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - amdahl) - basic_machine=580-amdahl - os=-sysv -@@ -437,12 +445,20 @@ - basic_machine=j90-cray - os=-unicos - ;; -+ cr16c) -+ basic_machine=cr16c-unknown -+ os=-elf -+ ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; -+ crx) -+ basic_machine=crx-unknown -+ os=-elf -+ ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; -@@ -742,6 +758,10 @@ - basic_machine=or32-unknown - os=-coff - ;; -+ os400) -+ basic_machine=powerpc-ibm -+ os=-os400 -+ ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose -@@ -833,6 +853,12 @@ - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; -+ s390 | s390-*) -+ basic_machine=s390-ibm -+ ;; -+ s390x | s390x-*) -+ basic_machine=s390x-ibm -+ ;; - sa29200) - basic_machine=a29k-amd - os=-udi -@@ -956,6 +982,10 @@ - tower | tower-32) - basic_machine=m68k-ncr - ;; -+ tpf) -+ basic_machine=s390x-ibm -+ os=-tpf -+ ;; - udi29k) - basic_machine=a29k-amd - os=-udi -@@ -1051,7 +1081,7 @@ - sh64) - basic_machine=sh64-unknown - ;; -- sparc | sparcv9 | sparcv9b) -+ sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) -@@ -1124,19 +1154,20 @@ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ -- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ -- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ -+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ -+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ -+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ -+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ -- | -powermax* | -dnix* | -nx6 | -nx7 | -sei*) -+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) -@@ -1160,6 +1191,9 @@ - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; -+ -linux-dietlibc) -+ os=-linux-dietlibc -+ ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; -@@ -1172,6 +1206,9 @@ - -opened*) - os=-openedition - ;; -+ -os400*) -+ os=-os400 -+ ;; - -wince*) - os=-wince - ;; -@@ -1193,6 +1230,9 @@ - -atheos*) - os=-atheos - ;; -+ -syllable*) -+ os=-syllable -+ ;; - -386bsd) - os=-bsd - ;; -@@ -1215,6 +1255,9 @@ - -sinix*) - os=-sysv4 - ;; -+ -tpf*) -+ os=-tpf -+ ;; - -triton*) - os=-sysv3 - ;; -@@ -1282,9 +1325,9 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 -@@ -1463,9 +1506,15 @@ - -mvs* | -opened*) - vendor=ibm - ;; -+ -os400*) -+ vendor=ibm -+ ;; - -ptx*) - vendor=sequent - ;; -+ -tpf*) -+ vendor=ibm -+ ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; -diff -urN libgtop2-2.6.0.orig/configure libgtop2-2.6.0/configure ---- libgtop2-2.6.0.orig/configure 2004-05-29 01:12:18.000000000 -0300 -+++ libgtop2-2.6.0/configure 2004-05-29 01:14:37.000000000 -0300 -@@ -1158,7 +1158,7 @@ - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -2497,8 +2497,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2556,8 +2555,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2673,8 +2671,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2728,8 +2725,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2774,8 +2770,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2819,8 +2814,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2899,8 +2893,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3298,8 +3291,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3357,8 +3349,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3474,8 +3465,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3529,8 +3519,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3575,8 +3564,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3620,8 +3608,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3943,8 +3930,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5008,19 +4994,10 @@ - - # This must be Linux ELF. - linux*) -- case $host_cpu in -- alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*) -- lt_cv_deplibs_check_method=pass_all ;; -- *) -- # glibc up to 2.1.1 does not perform some relocations on ARM -- # this will be overridden with pass_all, but let us keep it just in case -- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; -- esac -- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - lt_cv_deplibs_check_method=pass_all - ;; - --netbsd*) -+netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else -@@ -5136,7 +5113,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 5139 "configure"' > conftest.$ac_ext -+ echo '#line 5116 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -5256,8 +5233,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5336,8 +5312,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5404,8 +5379,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5665,8 +5639,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5724,8 +5697,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5796,8 +5768,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5841,8 +5812,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6198,7 +6168,7 @@ - - - # Provide some information about the compiler. --echo "$as_me:6201:" \ -+echo "$as_me:6171:" \ - "checking for Fortran 77 compiler version" >&5 - ac_compiler=`set X $ac_compile; echo $2` - { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 -@@ -6244,8 +6214,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6294,8 +6263,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7232,11 +7200,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7235: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7203: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7239: \$? = $ac_status" >&5 -+ echo "$as_me:7207: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -7465,11 +7433,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7468: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7436: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:7472: \$? = $ac_status" >&5 -+ echo "$as_me:7440: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -7525,11 +7493,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7528: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:7496: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:7532: \$? = $ac_status" >&5 -+ echo "$as_me:7500: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -7702,7 +7670,7 @@ - fi - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -7760,6 +7728,7 @@ - else - archive_expsym_cmds="$tmp_archive_cmds" - fi -+ link_all_deplibs=no - else - ld_shlibs=no - fi -@@ -7916,8 +7885,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7977,8 +7945,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8221,7 +8188,7 @@ - link_all_deplibs=yes - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -8855,31 +8822,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 8862 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -9190,8 +9136,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9294,8 +9239,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9360,8 +9304,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9454,8 +9397,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9520,8 +9462,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9587,8 +9528,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9654,8 +9594,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9730,7 +9669,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10962,8 +10900,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11341,7 +11278,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= -@@ -11896,7 +11833,7 @@ - ;; - esac - ;; -- netbsd*) -+ netbsd* | knetbsd*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in -@@ -12007,11 +11944,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:12010: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:11947: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:12014: \$? = $ac_status" >&5 -+ echo "$as_me:11951: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -12067,11 +12004,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:12070: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:12007: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:12074: \$? = $ac_status" >&5 -+ echo "$as_me:12011: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12137,6 +12074,9 @@ - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; -+ linux*) -+ link_all_deplibs_CXX=no -+ ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; -@@ -12574,31 +12514,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 12581 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -12909,8 +12828,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13013,8 +12931,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13079,8 +12996,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13173,8 +13089,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13239,8 +13154,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13306,8 +13220,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13373,8 +13286,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13449,7 +13361,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <&5) -+ (eval echo "\"\$as_me:14289: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:14381: \$? = $ac_status" >&5 -+ echo "$as_me:14293: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -14434,11 +14346,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:14437: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:14349: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:14441: \$? = $ac_status" >&5 -+ echo "$as_me:14353: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -14611,7 +14523,7 @@ - fi - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -14669,6 +14581,7 @@ - else - archive_expsym_cmds_F77="$tmp_archive_cmds" - fi -+ link_all_deplibs_F77=no - else - ld_shlibs_F77=no - fi -@@ -14815,8 +14728,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14866,8 +14778,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_f77_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15110,7 +15021,7 @@ - link_all_deplibs_F77=yes - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -15744,31 +15655,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 15751 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -16489,11 +16379,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16492: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16382: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16496: \$? = $ac_status" >&5 -+ echo "$as_me:16386: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -16722,11 +16612,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16725: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16615: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:16729: \$? = $ac_status" >&5 -+ echo "$as_me:16619: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings -@@ -16782,11 +16672,11 @@ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:16785: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:16675: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:16789: \$? = $ac_status" >&5 -+ echo "$as_me:16679: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -16959,7 +16849,7 @@ - fi - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= -@@ -17017,6 +16907,7 @@ - else - archive_expsym_cmds_GCJ="$tmp_archive_cmds" - fi -+ link_all_deplibs_GCJ=no - else - ld_shlibs_GCJ=no - fi -@@ -17173,8 +17064,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17234,8 +17124,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17478,7 +17367,7 @@ - link_all_deplibs_GCJ=yes - ;; - -- netbsd*) -+ netbsd* | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else -@@ -18112,31 +18001,10 @@ - # before this can be enabled. - hardcode_into_libs=yes - -- # find out which ABI we are using -- libsuff= -- case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '#line 18119 "configure"' > conftest.$ac_ext -- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- case `/usr/bin/file conftest.$ac_objext` in -- *64-bit*) -- libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -- ;; -- esac -- fi -- rm -rf conftest* -- ;; -- esac -- - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on -@@ -18447,8 +18315,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18551,8 +18418,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18617,8 +18483,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18711,8 +18576,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18777,8 +18641,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18844,8 +18707,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18911,8 +18773,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18987,7 +18848,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < conftest.$ac_ext <&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -20552,8 +20412,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -20715,8 +20574,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -20792,8 +20650,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -20875,8 +20732,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21100,8 +20956,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21268,8 +21123,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21493,8 +21347,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21693,8 +21546,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21754,8 +21606,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21828,8 +21679,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21894,8 +21744,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -21960,8 +21809,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22026,8 +21874,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22070,8 +21917,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22143,8 +21989,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22206,8 +22051,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22309,8 +22153,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22377,8 +22220,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22528,8 +22370,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22713,8 +22554,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22827,8 +22667,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22897,8 +22736,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -22965,8 +22803,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23064,8 +22901,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23180,8 +23016,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23246,8 +23081,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23408,8 +23242,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23481,8 +23314,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23586,8 +23418,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23654,8 +23485,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23809,8 +23639,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23871,8 +23700,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -23948,8 +23776,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24035,8 +23862,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24140,8 +23966,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24196,8 +24021,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24334,8 +24158,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24477,8 +24300,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24544,8 +24366,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24626,8 +24447,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24768,8 +24588,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -24907,8 +24726,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25092,8 +24910,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25339,8 +25156,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25438,8 +25254,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25508,8 +25323,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25620,8 +25434,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25698,8 +25511,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25844,8 +25656,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -25916,8 +25727,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26061,8 +25871,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26158,8 +25967,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26237,8 +26045,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26302,8 +26109,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26378,8 +26184,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26491,8 +26296,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26658,8 +26462,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26792,8 +26595,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -26878,8 +26680,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27034,9 +26835,12 @@ - < $srcdir/po/POTFILES.in > po/POTFILES - - --echo "$as_me:$LINENO: checking for X" >&5 -+ -+if test "x$ac_path_x_has_been_run" != xyes; then -+ echo "$as_me:$LINENO: checking for X" >&5 - echo $ECHO_N "checking for X... $ECHO_C" >&6 - -+ac_path_x_has_been_run=yes - - # Check whether --with-x or --without-x was given. - if test "${with_x+set}" = set; then -@@ -27129,7 +26933,7 @@ - /usr/openwin/share/include' - - if test "$ac_x_includes" = no; then -- # Guess where to find include files, by looking for Intrinsic.h. -+ # Guess where to find include files, by looking for a specified header file. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -27203,8 +27007,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27264,10 +27067,15 @@ - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" -- echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 --echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 -+ # It might be that x_includes is empty (headers are found in the -+ # standard search path. Then output the corresponding message -+ ac_out_x_includes=$x_includes -+ test "x$x_includes" = x && ac_out_x_includes="in standard search path" -+ echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -+echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 - fi - -+fi - if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -@@ -27315,8 +27123,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27367,8 +27174,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27444,8 +27250,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27500,8 +27305,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27569,8 +27373,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27678,8 +27481,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27743,8 +27545,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27812,8 +27613,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27917,8 +27717,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -27982,8 +27781,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28080,8 +27878,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28145,8 +27942,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28243,8 +28039,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28308,8 +28103,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28388,8 +28182,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28488,8 +28281,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28555,8 +28347,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28657,8 +28448,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28724,8 +28514,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28826,8 +28615,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28893,8 +28681,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -28964,8 +28751,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29116,8 +28902,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29211,8 +28996,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29416,8 +29200,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29513,8 +29296,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29580,8 +29362,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29647,8 +29428,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29750,8 +29530,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -29944,8 +29723,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -30295,8 +30073,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -30736,8 +30513,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -31821,11 +31597,6 @@ - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -@@ -31864,6 +31635,12 @@ - fi;; - esac - done` || { (exit 1); exit 1; } -+ -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -diff -urN libgtop2-2.6.0.orig/doc/Makefile.in libgtop2-2.6.0/doc/Makefile.in ---- libgtop2-2.6.0.orig/doc/Makefile.in 2004-05-29 01:12:27.000000000 -0300 -+++ libgtop2-2.6.0/doc/Makefile.in 2004-05-29 01:14:28.000000000 -0300 -@@ -146,9 +146,7 @@ - - info_TEXINFOS = libgtop2.texi - --libgtop2_TEXINFOS = libgtop2.texi about.texi reference.texi \ -- auto-macros.texi version.texi main.texi \ -- white-paper.texi -+libgtop2_TEXINFOS = libgtop2.texi about.texi reference.texi auto-macros.texi version.texi main.texi white-paper.texi - - - MAKEINFO = @MAKEINFO@ -I @libgtop_top_builddir@/doc -@@ -167,15 +165,15 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - .SUFFIXES: .dvi .info .ps .texi .texinfo .txi - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -329,6 +327,11 @@ - subdir = doc - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/examples/Makefile.in libgtop2-2.6.0/examples/Makefile.in ---- libgtop2-2.6.0.orig/examples/Makefile.in 2004-05-29 01:12:27.000000000 -0300 -+++ libgtop2-2.6.0/examples/Makefile.in 2004-05-29 01:14:28.000000000 -0300 -@@ -150,16 +150,10 @@ - - DEFS = @DEFS@ - --noinst_PROGRAMS = first second\ -- mountlist procmap netload sysdeps timings \ -- @static_targets@ @smp_examples@ -+noinst_PROGRAMS = first second mountlist procmap netload sysdeps timings @static_targets@ @smp_examples@ - - --EXTRA_PROGRAMS = first_static second_static \ -- mountlist_static procmap_static \ -- third third_static smp smp_static \ -- netload_static sysdeps_static \ -- timings_static -+EXTRA_PROGRAMS = first_static second_static mountlist_static procmap_static third third_static smp smp_static netload_static sysdeps_static timings_static - - - first_SOURCES = first.c -@@ -200,9 +194,7 @@ - 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 \ -- @INTLLIBS@ -+third_LDADD = $(third_names_LIBS) $(top_builddir)/lib/libgtop-2.0.la @INTLLIBS@ - - - third_static_SOURCES = $(third_SOURCES) -@@ -301,8 +293,11 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/first.P .deps/mountlist.P .deps/netload.P \ -+.deps/procmap.P .deps/second.P .deps/smp.P .deps/sysdeps.P \ -+.deps/third.P .deps/timings.P - SOURCES = $(first_static_SOURCES) $(second_static_SOURCES) $(mountlist_static_SOURCES) $(procmap_static_SOURCES) $(third_SOURCES) $(third_static_SOURCES) $(smp_SOURCES) $(smp_static_SOURCES) $(netload_static_SOURCES) $(sysdeps_static_SOURCES) $(timings_static_SOURCES) $(first_SOURCES) $(second_SOURCES) $(mountlist_SOURCES) $(procmap_SOURCES) $(netload_SOURCES) $(sysdeps_SOURCES) $(timings_SOURCES) - OBJECTS = $(first_static_OBJECTS) $(second_static_OBJECTS) $(mountlist_static_OBJECTS) $(procmap_static_OBJECTS) $(third_OBJECTS) $(third_static_OBJECTS) $(smp_OBJECTS) $(smp_static_OBJECTS) $(netload_static_OBJECTS) $(sysdeps_static_OBJECTS) $(timings_static_OBJECTS) $(first_OBJECTS) $(second_OBJECTS) $(mountlist_OBJECTS) $(procmap_OBJECTS) $(netload_OBJECTS) $(sysdeps_OBJECTS) $(timings_OBJECTS) - -@@ -310,9 +305,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps examples/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -326,9 +321,6 @@ - - maintainer-clean-noinstPROGRAMS: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -351,9 +343,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -460,7 +449,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -476,6 +465,11 @@ - subdir = examples - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu examples/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -486,88 +480,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --first.o: first.c ../glibtop.h ../include/glibtop/global.h ../config.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/open.h \ -- ../include/glibtop/read.h ../include/glibtop/error.h \ -- ../include/glibtop/close.h ../include/glibtop/parameter.h \ -- ../include/glibtop/union.h ../include/glibtop/cpu.h \ -- ../include/glibtop/mem.h ../include/glibtop/swap.h \ -- ../include/glibtop/uptime.h ../include/glibtop/loadavg.h \ -- ../include/glibtop/shm_limits.h ../include/glibtop/msg_limits.h \ -- ../include/glibtop/sem_limits.h ../include/glibtop/proclist.h \ -- ../include/glibtop/procstate.h ../include/glibtop/procuid.h \ -- ../include/glibtop/procmem.h ../include/glibtop/proctime.h \ -- ../include/glibtop/procsignal.h ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h --mountlist.o: mountlist.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/close.h \ -- ../include/glibtop/parameter.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h --netload.o: netload.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/close.h \ -- ../include/glibtop/parameter.h ../include/glibtop/netload.h --procmap.o: procmap.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/close.h \ -- ../include/glibtop/parameter.h ../include/glibtop/procmap.h --second.o: second.c ../glibtop.h ../include/glibtop/global.h ../config.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/open.h \ -- ../include/glibtop/read.h ../include/glibtop/error.h \ -- ../include/glibtop/close.h ../include/glibtop/union.h \ -- ../include/glibtop/cpu.h ../include/glibtop/mem.h \ -- ../include/glibtop/swap.h ../include/glibtop/uptime.h \ -- ../include/glibtop/loadavg.h ../include/glibtop/shm_limits.h \ -- ../include/glibtop/msg_limits.h ../include/glibtop/sem_limits.h \ -- ../include/glibtop/proclist.h ../include/glibtop/procstate.h \ -- ../include/glibtop/procuid.h ../include/glibtop/procmem.h \ -- ../include/glibtop/proctime.h ../include/glibtop/procsignal.h \ -- ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h --smp.o: smp.c ../config.h ../glibtop.h ../include/glibtop/global.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/cpu.h \ -- ../include/libgtop-i18n.h --sysdeps.o: sysdeps.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/close.h \ -- ../include/glibtop/parameter.h --timings.o: timings.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/close.h \ -- ../include/glibtop/parameter.h ../include/glibtop/union.h \ -- ../include/glibtop/cpu.h ../include/glibtop/mem.h \ -- ../include/glibtop/swap.h ../include/glibtop/uptime.h \ -- ../include/glibtop/loadavg.h ../include/glibtop/shm_limits.h \ -- ../include/glibtop/msg_limits.h ../include/glibtop/sem_limits.h \ -- ../include/glibtop/proclist.h ../include/glibtop/procstate.h \ -- ../include/glibtop/procuid.h ../include/glibtop/procmem.h \ -- ../include/glibtop/proctime.h ../include/glibtop/procsignal.h \ -- ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -604,27 +548,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -+ clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstPROGRAMS distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -635,12 +579,14 @@ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ --dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ --install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all installdirs \ --mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+distclean-tags clean-tags maintainer-clean-tags distdir \ -+mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ -+install-data-am install-data install-am install uninstall-am uninstall \ -+all-redirect all-am all installdirs mostlyclean-generic \ -+distclean-generic clean-generic maintainer-clean-generic clean \ -+mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/include/glibtop/Makefile.in libgtop2-2.6.0/include/glibtop/Makefile.in ---- libgtop2-2.6.0.orig/include/glibtop/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/include/glibtop/Makefile.in 2004-05-29 01:14:22.000000000 -0300 -@@ -147,14 +147,7 @@ - - glibtopdir = $(includedir)/libgtop-2.0/glibtop - --glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h \ -- sem_limits.h uptime.h command.h mem.h proclist.h \ -- proctime.h shm_limits.h version.h cpu.h msg_limits.h \ -- procmem.h procuid.h swap.h write.h error.h open.h \ -- procsegment.h read.h sysdeps.h global.h \ -- procsignal.h read_data.h union.h types.h gnuserv.h \ -- parameter.h mountlist.h fsusage.h procmap.h signal.h \ -- inodedb.h sysinfo.h ppp.h procargs.h netload.h -+glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h sem_limits.h uptime.h command.h mem.h proclist.h proctime.h shm_limits.h version.h cpu.h msg_limits.h procmem.h procuid.h swap.h write.h error.h open.h procsegment.h read.h sysdeps.h global.h procsignal.h read_data.h union.h types.h gnuserv.h parameter.h mountlist.h fsusage.h procmap.h signal.h inodedb.h sysinfo.h ppp.h procargs.h netload.h - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../config.h -@@ -166,14 +159,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/glibtop/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu include/glibtop/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -211,7 +204,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -227,6 +220,11 @@ - subdir = include/glibtop - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/glibtop/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/include/Makefile.in libgtop2-2.6.0/include/Makefile.in ---- libgtop2-2.6.0.orig/include/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/include/Makefile.in 2004-05-29 01:14:22.000000000 -0300 -@@ -156,14 +156,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -180,7 +180,7 @@ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -200,7 +200,7 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -@@ -246,7 +246,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -262,6 +262,11 @@ - subdir = include - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/lib/Makefile.in libgtop2-2.6.0/lib/Makefile.in ---- libgtop2-2.6.0.orig/lib/Makefile.in 2004-05-29 01:12:26.000000000 -0300 -+++ libgtop2-2.6.0/lib/Makefile.in 2004-05-29 01:14:27.000000000 -0300 -@@ -148,9 +148,7 @@ - - lib_LTLIBRARIES = libgtop-2.0.la - --libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c \ -- read_data.c write.c lib.c parameter.c \ -- sysdeps.c -+libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c read_data.c write.c lib.c parameter.c sysdeps.c - - - libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -190,8 +188,11 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/command.P .deps/init.P .deps/lib.P \ -+.deps/open.P .deps/parameter.P .deps/read.P .deps/read_data.P \ -+.deps/sysdeps.P .deps/write.P - SOURCES = $(libgtop_2_0_la_SOURCES) - OBJECTS = $(libgtop_2_0_la_OBJECTS) - -@@ -199,9 +200,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -231,9 +232,6 @@ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ - done - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -256,9 +254,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -296,7 +291,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -312,6 +307,11 @@ - subdir = lib - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu lib/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -322,121 +322,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --close.lo close.o : close.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/close.h \ -- ../include/glibtop/command.h ../include/glibtop/union.h \ -- ../include/glibtop/cpu.h ../include/glibtop/mem.h \ -- ../include/glibtop/swap.h ../include/glibtop/uptime.h \ -- ../include/glibtop/loadavg.h ../include/glibtop/shm_limits.h \ -- ../include/glibtop/msg_limits.h ../include/glibtop/sem_limits.h \ -- ../include/glibtop/proclist.h ../include/glibtop/procstate.h \ -- ../include/glibtop/procuid.h ../include/glibtop/procmem.h \ -- ../include/glibtop/proctime.h ../include/glibtop/procsignal.h \ -- ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h --command.lo command.o : command.c ../include/glibtop/read.h ../glibtop.h \ -- ../include/glibtop/global.h ../config.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/error.h \ -- ../include/glibtop/write.h ../include/glibtop/read_data.h \ -- ../include/glibtop/command.h ../include/glibtop/union.h \ -- ../include/glibtop/cpu.h ../include/glibtop/mem.h \ -- ../include/glibtop/swap.h ../include/glibtop/uptime.h \ -- ../include/glibtop/loadavg.h ../include/glibtop/shm_limits.h \ -- ../include/glibtop/msg_limits.h ../include/glibtop/sem_limits.h \ -- ../include/glibtop/proclist.h ../include/glibtop/procstate.h \ -- ../include/glibtop/procuid.h ../include/glibtop/procmem.h \ -- ../include/glibtop/proctime.h ../include/glibtop/procsignal.h \ -- ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h --init.lo init.o : init.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/parameter.h ../include/glibtop/open.h \ -- ../include/glibtop/read.h ../include/glibtop/error.h --lib.lo lib.o : lib.c ../config.h ../glibtop.h \ -- ../include/glibtop/global.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/union.h \ -- ../include/glibtop/cpu.h ../include/glibtop/mem.h \ -- ../include/glibtop/swap.h ../include/glibtop/uptime.h \ -- ../include/glibtop/loadavg.h ../include/glibtop/shm_limits.h \ -- ../include/glibtop/msg_limits.h ../include/glibtop/sem_limits.h \ -- ../include/glibtop/proclist.h ../include/glibtop/procstate.h \ -- ../include/glibtop/procuid.h ../include/glibtop/procmem.h \ -- ../include/glibtop/proctime.h ../include/glibtop/procsignal.h \ -- ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h ../include/libgtop-i18n.h \ -- ../include/glibtop/command.h --open.lo open.o : open.c ../glibtop.h ../include/glibtop/global.h \ -- ../config.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h ../include/glibtop/version.h \ -- ../include/glibtop/union.h ../include/glibtop/cpu.h \ -- ../include/glibtop/mem.h ../include/glibtop/swap.h \ -- ../include/glibtop/uptime.h ../include/glibtop/loadavg.h \ -- ../include/glibtop/shm_limits.h ../include/glibtop/msg_limits.h \ -- ../include/glibtop/sem_limits.h ../include/glibtop/proclist.h \ -- ../include/glibtop/procstate.h ../include/glibtop/procuid.h \ -- ../include/glibtop/procmem.h ../include/glibtop/proctime.h \ -- ../include/glibtop/procsignal.h ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h ../include/glibtop/command.h \ -- ../include/glibtop/gnuserv.h --parameter.lo parameter.o : parameter.c ../glibtop.h \ -- ../include/glibtop/global.h ../config.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/parameter.h \ -- ../include/glibtop/open.h ../include/glibtop/read.h \ -- ../include/glibtop/error.h --read.lo read.o : read.c ../config.h ../include/glibtop/read.h \ -- ../glibtop.h ../include/glibtop/global.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/error.h \ -- ../include/libgtop-i18n.h --read_data.lo read_data.o : read_data.c ../config.h \ -- ../include/glibtop/read_data.h ../glibtop.h \ -- ../include/glibtop/global.h ../sysdeps/linux/glibtop_server.h \ -- ../include/glibtop/types.h ../include/glibtop/sysdeps.h \ -- ../include/glibtop/error.h ../include/libgtop-i18n.h --sysdeps.lo sysdeps.o : sysdeps.c ../glibtop.h \ -- ../include/glibtop/global.h ../config.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/union.h \ -- ../include/glibtop/cpu.h ../include/glibtop/mem.h \ -- ../include/glibtop/swap.h ../include/glibtop/uptime.h \ -- ../include/glibtop/loadavg.h ../include/glibtop/shm_limits.h \ -- ../include/glibtop/msg_limits.h ../include/glibtop/sem_limits.h \ -- ../include/glibtop/proclist.h ../include/glibtop/procstate.h \ -- ../include/glibtop/procuid.h ../include/glibtop/procmem.h \ -- ../include/glibtop/proctime.h ../include/glibtop/procsignal.h \ -- ../include/glibtop/prockernel.h \ -- ../include/glibtop/procsegment.h ../include/glibtop/procargs.h \ -- ../include/glibtop/procmap.h ../include/glibtop/mountlist.h \ -- ../include/glibtop/fsusage.h ../include/glibtop/netload.h \ -- ../include/glibtop/ppp.h --write.lo write.o : write.c ../config.h ../include/glibtop/write.h \ -- ../glibtop.h ../include/glibtop/global.h \ -- ../sysdeps/linux/glibtop_server.h ../include/glibtop/types.h \ -- ../include/glibtop/sysdeps.h ../include/glibtop/error.h \ -- ../include/libgtop-i18n.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -476,27 +393,27 @@ - maintainer-clean-generic: - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -+ clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-libLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -508,12 +425,13 @@ - distclean-compile clean-compile maintainer-clean-compile \ - mostlyclean-libtool distclean-libtool clean-libtool \ - maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - lib.c: lib.pl $(top_builddir)/config.h $(top_srcdir)/features.def -diff -urN libgtop2-2.6.0.orig/libgtop.spec libgtop2-2.6.0/libgtop.spec ---- libgtop2-2.6.0.orig/libgtop.spec 2004-05-29 01:12:28.000000000 -0300 -+++ libgtop2-2.6.0/libgtop.spec 1969-12-31 21:00:00.000000000 -0300 -@@ -1,126 +0,0 @@ --# Note that this is NOT a relocatable package --%define ver 2.6.0 --%define RELEASE SNAP --%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} --%define prefix /usr -- --Summary: LibGTop library --Name: libgtop --Version: %ver --Release: %rel --License: GPL --Group: X11/Libraries --Source: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/libgtop-%{ver}.tar.gz --BuildRoot: /tmp/libgtop-root --Packager: Martin Baulig --URL: http://www.home-of-linux.org/gnome/libgtop/ --Prereq: /sbin/install-info --Docdir: %{prefix}/doc -- --%description -- --A library that fetches information about the running system such as --cpu and memory usage, active processes etc. -- --On Linux systems, these information are taken directly from the /proc --filesystem while on other systems a server is used to read those --information from /dev/kmem or whatever. -- --%package devel --Summary: Libraries, includes, etc to develop LibGTop applications --Group: X11/libraries --Requires: libgtop -- --%description devel --Libraries, include files, etc you can use to develop GNOME applications. -- --%package examples --Summary: Examples for LibGTop --Group: X11/libraries --Requires: libgtop -- --%description examples --Examples for LibGTop. -- -- --%changelog -- --* Tue Aug 19 1998 Martin Baulig -- --- released LibGTop 0.25.0 -- --* Sun Aug 16 1998 Martin Baulig -- --- first version of the RPM -- --%prep --%setup -- --%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-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-smp --%else -- CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%prefix --without-linux-table --with-libgtop-inodedb --with-libgtop-examples --with-libgtop-smp --%endif --fi -- --if [ "$SMP" != "" ]; then -- (make "MAKE=make -k -j $SMP"; exit 0) -- make --else -- make --fi -- --%install --rm -rf $RPM_BUILD_ROOT -- --make prefix=$RPM_BUILD_ROOT%{prefix} install -- --# --# msf - remove these as they are really supposed to come from gnome-libs --# --# martin - don't remove since they are no longer installed if build --# with GNOME --# --# rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.a --# rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.la --# rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.so.0 --# rm -f $RPM_BUILD_ROOT/%{prefix}/lib/libgnomesupport.so.0.0.0 -- --rm -fr $RPM_BUILD_ROOT/%{prefix}/include/libgtop -- --%clean --rm -rf $RPM_BUILD_ROOT -- --%post -p /sbin/ldconfig -- --%postun -p /sbin/ldconfig -- --%files --%defattr(-, root, root) -- --%doc RELNOTES-0.25 RELNOTES-1.0 AUTHORS ChangeLog NEWS README --%doc TODO NEWS.old copyright.txt --%doc src/inodedb/README.inodedb -- --%{prefix}/lib/lib*.so.* --%{prefix}/share/* --%{prefix}/bin/* -- --%files devel --%defattr(-, root, root) -- --%{prefix}/lib/lib*.so --%{prefix}/lib/*a --%{prefix}/lib/*.sh --%{prefix}/lib/*.def --%{prefix}/include/* -- --%files examples --%defattr(-,root,root) -- --%{prefix}/libexec/libgtop -diff -urN libgtop2-2.6.0.orig/ltmain.sh libgtop2-2.6.0/ltmain.sh ---- libgtop2-2.6.0.orig/ltmain.sh 2004-05-29 01:12:18.000000000 -0300 -+++ libgtop2-2.6.0/ltmain.sh 2004-05-29 01:13:45.000000000 -0300 -@@ -33,9 +33,6 @@ - # function. - progpath="$0" - --# RH: define SED for historic ltconfig's generated by Libtool 1.3 --[ -z "$SED" ] && SED=sed -- - # The name of this program: - progname=`echo "$progpath" | $SED $basename` - modename="$progname" -@@ -46,8 +43,8 @@ - - PROGRAM=ltmain.sh - PACKAGE=libtool --VERSION=1.5.4 --TIMESTAMP=" (1.1220.2.90 2004/04/03 14:10:19)" -+VERSION=1.5.6 -+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 203 $" - - - # Check that we have a working $echo. -@@ -1841,7 +1838,10 @@ - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; -- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; -+ link) -+ libs="$deplibs %DEPLIBS%" -+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" -+ ;; - esac - fi - if test "$pass" = dlopen; then -@@ -2944,7 +2944,7 @@ - - # Check that each of the things are valid numbers. - case $current in -- [0-9]*) ;; -+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2953,7 +2953,7 @@ - esac - - case $revision in -- [0-9]*) ;; -+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -@@ -2962,7 +2962,7 @@ - esac - - case $age in -- [0-9]*) ;; -+ 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -diff -urN libgtop2-2.6.0.orig/Makefile.in libgtop2-2.6.0/Makefile.in ---- libgtop2-2.6.0.orig/Makefile.in 2004-05-29 01:12:17.000000000 -0300 -+++ libgtop2-2.6.0/Makefile.in 2004-05-29 01:14:22.000000000 -0300 -@@ -150,10 +150,7 @@ - libgtopinclude_HEADERS = glibtop.h - libgtopincludedir = $(includedir)/libgtop-2.0 - --EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \ -- LIBGTOP-VERSION features.def \ -- libgtop-sysdeps.m4 README \ -- libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4 -+EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt LIBGTOP-VERSION features.def libgtop-sysdeps.m4 README libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4 - - - pkgconfigdir = $(libdir)/pkgconfig -@@ -175,14 +172,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -272,7 +269,7 @@ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -292,7 +289,7 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -@@ -338,7 +335,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) - - mostlyclean-tags: - -@@ -387,6 +384,11 @@ - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/misc/Makefile.in libgtop2-2.6.0/misc/Makefile.in ---- libgtop2-2.6.0.orig/misc/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/misc/Makefile.in 2004-05-29 01:14:22.000000000 -0300 -@@ -154,14 +154,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps misc/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu misc/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -174,6 +174,11 @@ - subdir = misc - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu misc/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/po/Makefile.in libgtop2-2.6.0/po/Makefile.in ---- libgtop2-2.6.0.orig/po/Makefile.in 1969-12-31 21:00:00.000000000 -0300 -+++ libgtop2-2.6.0/po/Makefile.in 2004-05-29 01:15:59.000000000 -0300 -@@ -0,0 +1,254 @@ -+# Makefile for program source directory in GNU NLS utilities package. -+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper -+# -+# This file file be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+# -+# - Modified by Owen Taylor to use GETTEXT_PACKAGE -+# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -+# -+# - Modified by jacob berkman to install -+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -+ -+GETTEXT_PACKAGE = libgtop-2.0 -+PACKAGE = libgtop -+VERSION = 2.6.0 -+ -+SHELL = /bin/sh -+ -+ -+srcdir = . -+top_srcdir = .. -+ -+ -+prefix = /usr -+exec_prefix = ${prefix} -+datadir = ${prefix}/share -+libdir = ${exec_prefix}/lib -+localedir = $(libdir)/locale -+gnulocaledir = $(datadir)/locale -+gettextsrcdir = $(datadir)/glib-2.0/gettext/po -+subdir = po -+ -+INSTALL = /usr/bin/install -c -+INSTALL_DATA = ${INSTALL} -m 644 -+MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs -+ -+CC = gcc -+GENCAT = @GENCAT@ -+GMSGFMT = /usr/bin/msgfmt -+MSGFMT = /usr/bin/msgfmt -+XGETTEXT = /usr/bin/xgettext -+MSGMERGE = msgmerge -+ -+DEFS = -DHAVE_CONFIG_H -+CFLAGS = -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -fno-strict-aliasing -g -O2 -+CPPFLAGS = -+ -+INCLUDES = -I.. -I$(top_srcdir)/intl -+ -+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -+ -+SOURCES = -+POFILES = am.po ar.po az.po be.po bg.po bn.po ca.po cs.po cy.po da.po de.po el.po en_CA.po en_GB.po es.po et.po fa.po fi.po fr.po ga.po gl.po he.po hi.po hr.po hu.po id.po it.po ja.po ko.po lt.po lv.po mk.po ml.po mn.po ms.po nl.po nn.po no.po pa.po pl.po pt.po pt_BR.po ro.po ru.po sk.po sl.po sq.po sr.po sr@Latn.po sv.po ta.po tr.po uk.po vi.po zh_CN.po zh_TW.po -+GMOFILES = am.gmo ar.gmo az.gmo be.gmo bg.gmo bn.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo el.gmo en_CA.gmo en_GB.gmo es.gmo et.gmo fa.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hi.gmo hr.gmo hu.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo ml.gmo mn.gmo ms.gmo nl.gmo nn.gmo no.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo zh_CN.gmo zh_TW.gmo -+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ -+$(POFILES) $(GMOFILES) $(SOURCES) -+ -+POTFILES = \ -+ -+CATALOGS = am.gmo ar.gmo az.gmo be.gmo bg.gmo bn.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo el.gmo en_CA.gmo en_GB.gmo es.gmo et.gmo fa.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hi.gmo hr.gmo hu.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo ml.gmo mn.gmo ms.gmo nl.gmo nn.gmo no.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo zh_CN.gmo zh_TW.gmo -+CATOBJEXT = .gmo -+INSTOBJEXT = .mo -+ -+.SUFFIXES: -+.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat -+ -+.c.o: -+ $(COMPILE) $< -+ -+.po.pox: -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox -+ -+.po.mo: -+ $(MSGFMT) -o $@ $< -+ -+.po.gmo: -+ file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ -+ && rm -f $$file && $(GMSGFMT) -o $$file $< -+ -+.po.cat: -+ sed -f ../intl/po2msg.sed < $< > $*.msg \ -+ && rm -f $@ && $(GENCAT) $@ $*.msg -+ -+ -+all: all-yes -+ -+all-yes: $(CATALOGS) -+all-no: -+ -+$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) -+ $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ -+ --add-comments --keyword=_ --keyword=N_ \ -+ --files-from=$(srcdir)/POTFILES.in \ -+ && test ! -f $(GETTEXT_PACKAGE).po \ -+ || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ -+ && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) -+ -+install: install-exec install-data -+install-exec: -+install-data: install-data-yes -+install-data-no: all -+install-data-yes: all -+ if test -r "$(MKINSTALLDIRS)"; then \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ -+ else \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ -+ fi -+ @catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ case "$$cat" in \ -+ *.gmo) destdir=$(gnulocaledir);; \ -+ *) destdir=$(localedir);; \ -+ esac; \ -+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ -+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ -+ if test -r "$(MKINSTALLDIRS)"; then \ -+ $(MKINSTALLDIRS) $$dir; \ -+ else \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ -+ fi; \ -+ if test -r $$cat; then \ -+ $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ -+ echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ -+ else \ -+ $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ -+ echo "installing $(srcdir)/$$cat as" \ -+ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ -+ fi; \ -+ if test -r $$cat.m; then \ -+ $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ -+ echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ -+ else \ -+ if test -r $(srcdir)/$$cat.m ; then \ -+ $(INSTALL_DATA) $(srcdir)/$$cat.m \ -+ $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ -+ echo "installing $(srcdir)/$$cat as" \ -+ "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ -+ else \ -+ true; \ -+ fi; \ -+ fi; \ -+ done -+ if test "$(PACKAGE)" = "glib"; then \ -+ if test -r "$(MKINSTALLDIRS)"; then \ -+ $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ -+ else \ -+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ -+ fi; \ -+ $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ -+ $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ -+ else \ -+ : ; \ -+ fi -+ -+# Define this as empty until I found a useful application. -+installcheck: -+ -+uninstall: -+ catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ -+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ -+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ -+ rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ -+ done -+ if test "$(PACKAGE)" = "glib"; then \ -+ rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ -+ fi -+ -+check: all -+ -+dvi info tags TAGS ID: -+ -+mostlyclean: -+ rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp -+ rm -fr *.o -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f $(GMOFILES) -+ -+distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: update-po $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ for file in $$dists; do \ -+ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ -+ || cp -p $(srcdir)/$$file $(distdir); \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ tmpdir=`pwd`; \ -+ cd $(srcdir); \ -+ catalogs='$(CATALOGS)'; \ -+ for cat in $$catalogs; do \ -+ cat=`basename $$cat`; \ -+ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ -+ echo "$$lang:"; \ -+ if $(MSGMERGE) $$lang.po $(GETTEXT_PACKAGE).pot -o $$tmpdir/$$lang.new.po; then \ -+ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$cat failed!"; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi; \ -+ done -+ -+# POTFILES is created from POTFILES.in by stripping comments, empty lines -+# and Intltool tags (enclosed in square brackets), and appending a full -+# relative path to them -+POTFILES: POTFILES.in -+ ( if test 'x$(srcdir)' != 'x.'; then \ -+ posrcprefix='$(top_srcdir)/'; \ -+ else \ -+ posrcprefix="../"; \ -+ fi; \ -+ rm -f $@-t $@ \ -+ && (sed -e '/^#/d' \ -+ -e "s/^\[.*\] +//" \ -+ -e '/^[ ]*$$/d' \ -+ -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ -+ | sed -e '$$s/\\$$//') > $@-t \ -+ && chmod a-w $@-t \ -+ && mv $@-t $@ ) -+ -+Makefile: Makefile.in.in ../config.status POTFILES -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ -+ $(SHELL) ./config.status -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -urN libgtop2-2.6.0.orig/src/daemon/Makefile.in libgtop2-2.6.0/src/daemon/Makefile.in ---- libgtop2-2.6.0.orig/src/daemon/Makefile.in 2004-05-29 01:12:27.000000000 -0300 -+++ libgtop2-2.6.0/src/daemon/Makefile.in 2004-05-29 01:14:27.000000000 -0300 -@@ -146,37 +146,24 @@ - - LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ - --INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD \ -- -DLIBGTOP_COMPILE_SYSTEM="\"`uname -s`\"" \ -- -DLIBGTOP_COMPILE_RELEASE="\"`uname -r`\"" \ -- -DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" \ -- -DLIBGTOP_COMPILE_MACHINE="\"`uname -m`\"" -+INCLUDES = $(LIBGTOP_CFLAGS) @INCLUDES@ -D_BSD -DLIBGTOP_COMPILE_SYSTEM="\"`uname -s`\"" -DLIBGTOP_COMPILE_RELEASE="\"`uname -r`\"" -DLIBGTOP_COMPILE_VERSION="\"`uname -v`\"" -DLIBGTOP_COMPILE_MACHINE="\"`uname -m`\"" - --@NEED_LIBGTOP_TRUE@suid_sysdeps = @NEED_LIBGTOP_TRUE@$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la -+@NEED_LIBGTOP_TRUE@suid_sysdeps = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la - @NEED_LIBGTOP_FALSE@suid_sysdeps = --@NEED_LIBGTOP_TRUE@suid_common = @NEED_LIBGTOP_TRUE@$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la -+@NEED_LIBGTOP_TRUE@suid_common = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la - @NEED_LIBGTOP_FALSE@suid_common = - - bin_PROGRAMS = libgtop_daemon2 @server_programs@ - - EXTRA_PROGRAMS = libgtop_server2 - --libgtop_daemon2_SOURCES = gnuserv.c slave.c main.c io.c version.c \ -- daemon.h server_config.h -+libgtop_daemon2_SOURCES = gnuserv.c slave.c main.c io.c version.c daemon.h server_config.h - --libgtop_daemon2_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_suid_lib@ \ -- $(suid_sysdeps) $(suid_common) \ -- $(LIBGTOP_LIBS) \ -- -lpopt \ -- @libs_xauth@ -+libgtop_daemon2_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_suid_lib@ $(suid_sysdeps) $(suid_common) $(LIBGTOP_LIBS) -lpopt @libs_xauth@ - - - libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h --libgtop_server2_LDADD = $(GLIB_LIBS) -lpopt $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \ -- $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la -+libgtop_server2_LDADD = $(GLIB_LIBS) -lpopt $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la - - - EXTRA_DIST = server_config.h.in server_config.pl -@@ -223,8 +210,10 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/gnuserv.P .deps/io.P .deps/main.P .deps/server.P \ -+.deps/slave.P .deps/version.P - SOURCES = $(libgtop_server2_SOURCES) $(libgtop_daemon2_SOURCES) - OBJECTS = $(libgtop_server2_OBJECTS) $(libgtop_daemon2_OBJECTS) - -@@ -232,9 +221,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/daemon/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/daemon/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -264,9 +253,6 @@ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -289,9 +275,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -334,7 +317,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -350,6 +333,11 @@ - subdir = src/daemon - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/daemon/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -360,131 +348,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --gnuserv.o: gnuserv.c ../../config.h ../../include/libgtop-i18n.h \ -- ../../glibtop.h ../../include/glibtop/global.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/open.h ../../include/glibtop/read.h \ -- ../../include/glibtop/error.h ../../include/glibtop/close.h \ -- ../../include/glibtop/command.h ../../include/glibtop/union.h \ -- ../../include/glibtop/cpu.h ../../include/glibtop/mem.h \ -- ../../include/glibtop/swap.h ../../include/glibtop/uptime.h \ -- ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h ../../include/glibtop/parameter.h \ -- server_config.h ../../include/glibtop/gnuserv.h daemon.h \ -- ../../include/glibtop/version.h --io.o: io.c daemon.h ../../glibtop.h ../../include/glibtop/global.h \ -- ../../config.h ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/gnuserv.h \ -- ../../include/glibtop/open.h ../../include/glibtop/read.h \ -- ../../include/glibtop/union.h ../../include/glibtop/cpu.h \ -- ../../include/glibtop/mem.h ../../include/glibtop/swap.h \ -- ../../include/glibtop/uptime.h ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h ../../include/glibtop/version.h \ -- ../../include/glibtop/command.h \ -- ../../include/glibtop/parameter.h --main.o: main.c daemon.h ../../glibtop.h ../../include/glibtop/global.h \ -- ../../config.h ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/gnuserv.h \ -- ../../include/glibtop/open.h ../../include/glibtop/read.h \ -- ../../include/glibtop/union.h ../../include/glibtop/cpu.h \ -- ../../include/glibtop/mem.h ../../include/glibtop/swap.h \ -- ../../include/glibtop/uptime.h ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h ../../include/glibtop/version.h \ -- ../../include/glibtop/command.h \ -- ../../include/glibtop/parameter.h --slave.o: slave.c daemon.h ../../glibtop.h ../../include/glibtop/global.h \ -- ../../config.h ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/gnuserv.h \ -- ../../include/glibtop/open.h ../../include/glibtop/read.h \ -- ../../include/glibtop/union.h ../../include/glibtop/cpu.h \ -- ../../include/glibtop/mem.h ../../include/glibtop/swap.h \ -- ../../include/glibtop/uptime.h ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h ../../include/glibtop/version.h \ -- ../../include/glibtop/command.h \ -- ../../include/glibtop/parameter.h --version.o: version.c ../../glibtop.h ../../include/glibtop/global.h \ -- ../../config.h ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/version.h \ -- ../../include/glibtop/union.h ../../include/glibtop/cpu.h \ -- ../../include/glibtop/mem.h ../../include/glibtop/swap.h \ -- ../../include/glibtop/uptime.h ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h ../../include/glibtop/command.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -524,26 +419,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -+ clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ -- distclean-tags distclean-generic clean-am -+ distclean-tags distclean-depend distclean-generic \ -+ clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -554,12 +450,14 @@ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ --dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ --install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all installdirs \ --mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+distclean-tags clean-tags maintainer-clean-tags distdir \ -+mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ -+install-data-am install-data install-am install uninstall-am uninstall \ -+all-redirect all-am all installdirs mostlyclean-generic \ -+distclean-generic clean-generic maintainer-clean-generic clean \ -+mostlyclean distclean maintainer-clean - - - install-exec-hook: -diff -urN libgtop2-2.6.0.orig/src/inodedb/Makefile.in libgtop2-2.6.0/src/inodedb/Makefile.in ---- libgtop2-2.6.0.orig/src/inodedb/Makefile.in 2004-05-29 01:12:27.000000000 -0300 -+++ libgtop2-2.6.0/src/inodedb/Makefile.in 2004-05-29 01:14:27.000000000 -0300 -@@ -148,15 +148,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 -+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 - - --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 \ -- $(top_builddir)/sysdeps/common/libgtop_suid_common-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 $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la - - - EXTRA_DIST = README.inodedb -@@ -198,8 +193,9 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/file_by_inode2.P .deps/mkinodedb2.P - SOURCES = mkinodedb2.c file_by_inode2.c - OBJECTS = mkinodedb2.$(OBJEXT) file_by_inode2.$(OBJEXT) - -@@ -207,9 +203,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/inodedb/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/inodedb/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -239,9 +235,6 @@ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -264,9 +257,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -309,7 +299,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -325,6 +315,11 @@ - subdir = src/inodedb - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/inodedb/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -336,6 +331,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -373,26 +399,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ -- clean-generic mostlyclean-am -+ clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ -- distclean-tags distclean-generic clean-am -+ distclean-tags distclean-depend distclean-generic \ -+ clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -403,12 +430,14 @@ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ --dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ --install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all installdirs \ --mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+distclean-tags clean-tags maintainer-clean-tags distdir \ -+mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ -+install-data-am install-data install-am install uninstall-am uninstall \ -+all-redirect all-am all installdirs mostlyclean-generic \ -+distclean-generic clean-generic maintainer-clean-generic clean \ -+mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/src/Makefile.in libgtop2-2.6.0/src/Makefile.in ---- libgtop2-2.6.0.orig/src/Makefile.in 2004-05-29 01:12:27.000000000 -0300 -+++ libgtop2-2.6.0/src/Makefile.in 2004-05-29 01:14:26.000000000 -0300 -@@ -144,7 +144,7 @@ - static_targets = @static_targets@ - sysdeps_dir = @sysdeps_dir@ - sysdeps_suid_lib = @sysdeps_suid_lib@ --@INODEDB_TRUE@inodedb_SUBDIRS = @INODEDB_TRUE@inodedb -+@INODEDB_TRUE@inodedb_SUBDIRS = inodedb - @INODEDB_FALSE@inodedb_SUBDIRS = - - SUBDIRS = daemon $(inodedb_SUBDIRS) -@@ -158,14 +158,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -182,7 +182,7 @@ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -202,7 +202,7 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -@@ -248,7 +248,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -264,6 +264,11 @@ - subdir = src - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/sysdeps/aix/Makefile.in libgtop2-2.6.0/sysdeps/aix/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/aix/Makefile.in 2004-05-29 01:12:26.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/aix/Makefile.in 2004-05-29 01:14:26.000000000 -0300 -@@ -152,12 +152,7 @@ - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ -- uptime.c loadavg.c shm_limits.c msg_limits.c \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c procargs.c procmap.c netload.c \ -- ppp.c utils.c utils.h sysinfo.c -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c utils.c utils.h sysinfo.c - - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -201,8 +196,15 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/loadavg.P .deps/mem.P \ -+.deps/msg_limits.P .deps/netload.P .deps/nosuid.P .deps/open.P \ -+.deps/ppp.P .deps/procargs.P .deps/prockernel.P .deps/proclist.P \ -+.deps/procmap.P .deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/siglist.P .deps/swap.P .deps/sysinfo.P \ -+.deps/uptime.P .deps/utils.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) $(libgtop_sysdeps_suid_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) $(libgtop_sysdeps_suid_2_0_la_OBJECTS) - -@@ -210,9 +212,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/aix/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/aix/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -226,9 +228,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -251,9 +250,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -309,7 +305,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -325,6 +321,11 @@ - subdir = sysdeps/aix - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/aix/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -336,6 +337,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -373,27 +405,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -405,12 +437,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/common/Makefile.in libgtop2-2.6.0/sysdeps/common/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/common/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/common/Makefile.in 2004-05-29 01:14:23.000000000 -0300 -@@ -145,19 +145,16 @@ - sysdeps_suid_lib = @sysdeps_suid_lib@ - - INCLUDES = @INCLUDES@ --@INODEDB_TRUE@inodedb_SRCLIST = @INODEDB_TRUE@inodedb.c -+@INODEDB_TRUE@inodedb_SRCLIST = inodedb.c - @INODEDB_FALSE@inodedb_SRCLIST = --@INODEDB_TRUE@inodedb_DEFS = @INODEDB_TRUE@-DSYSTEM_INODEDB=\"$(prefix)/var/libgtop/inodedb.db\" -+@INODEDB_TRUE@inodedb_DEFS = -DSYSTEM_INODEDB=\"$(prefix)/var/libgtop/inodedb.db\" - @INODEDB_FALSE@inodedb_DEFS = - - CFLAGS = @CFLAGS@ $(inodedb_DEFS) - - 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 fsusage-frontend.c \ -- mountlist.c mountlist.h \ -- $(inodedb_SRCLIST) -+libgtop_common_2_0_la_SOURCES = error.c gnuslib.c fsusage.c fsusage.h fsusage-frontend.c mountlist.c mountlist.h $(inodedb_SRCLIST) - - - libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -198,8 +195,10 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/error.P .deps/fsusage-frontend.P .deps/fsusage.P \ -+.deps/gnuslib.P .deps/inodedb.P .deps/mountlist.P .deps/sysdeps_suid.P - SOURCES = $(libgtop_common_2_0_la_SOURCES) $(libgtop_suid_common_2_0_la_SOURCES) - OBJECTS = $(libgtop_common_2_0_la_OBJECTS) $(libgtop_suid_common_2_0_la_OBJECTS) - -@@ -207,9 +206,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/common/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/common/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -223,9 +222,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -248,9 +244,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -291,7 +284,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -307,6 +300,11 @@ - subdir = sysdeps/common - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/common/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -317,52 +315,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --error.lo error.o : error.c ../../include/glibtop/error.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h --fsusage-frontend.lo fsusage-frontend.o : fsusage-frontend.c \ -- ../../config.h fsusage.h ../../glibtop.h \ -- ../../include/glibtop/global.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/fsusage.h --fsusage.lo fsusage.o : fsusage.c ../../config.h fsusage.h --gnuslib.lo gnuslib.o : gnuslib.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/gnuserv.h ../../include/glibtop/error.h --mountlist.lo mountlist.o : mountlist.c ../../config.h mountlist.h \ -- ../../glibtop.h ../../include/glibtop/global.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/mountlist.h --sysdeps_suid.lo sysdeps_suid.o : sysdeps_suid.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/open.h ../../include/glibtop/read.h \ -- ../../include/glibtop/error.h ../../include/glibtop/union.h \ -- ../../include/glibtop/cpu.h ../../include/glibtop/mem.h \ -- ../../include/glibtop/swap.h ../../include/glibtop/uptime.h \ -- ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -399,27 +383,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -430,12 +414,14 @@ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ --dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ --install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all installdirs \ --mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+distclean-tags clean-tags maintainer-clean-tags distdir \ -+mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ -+install-data-am install-data install-am install uninstall-am uninstall \ -+all-redirect all-am all installdirs mostlyclean-generic \ -+distclean-generic clean-generic maintainer-clean-generic clean \ -+mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/freebsd/Makefile.in libgtop2-2.6.0/sysdeps/freebsd/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/freebsd/Makefile.in 2004-05-29 01:12:25.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/freebsd/Makefile.in 2004-05-29 01:14:26.000000000 -0300 -@@ -152,18 +152,12 @@ - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ -- uptime.c loadavg.c shm_limits.c msg_limits.c \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c procargs.c procmap.c netload.c \ -- ppp.c -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c - - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ -- glibtop_suid.h -+libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h glibtop_suid.h - - - libgtopincludedir = $(includedir)/libgtop-2.0 -@@ -201,8 +195,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/loadavg.P .deps/mem.P \ -+.deps/msg_limits.P .deps/netload.P .deps/nosuid.P .deps/open.P \ -+.deps/ppp.P .deps/procargs.P .deps/prockernel.P .deps/proclist.P \ -+.deps/procmap.P .deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/siglist.P .deps/swap.P .deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) $(libgtop_sysdeps_suid_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) $(libgtop_sysdeps_suid_2_0_la_OBJECTS) - -@@ -210,9 +210,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/freebsd/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/freebsd/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -226,9 +226,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -251,9 +248,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -309,7 +303,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -325,6 +319,11 @@ - subdir = sysdeps/freebsd - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/freebsd/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -336,6 +335,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -373,27 +403,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -405,12 +435,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/kernel/Makefile.in libgtop2-2.6.0/sysdeps/kernel/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/kernel/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/kernel/Makefile.in 2004-05-29 01:14:25.000000000 -0300 -@@ -148,12 +148,7 @@ - - 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 \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c siglist.c procargs.c procmap.c \ -- netload.c ppp.c -+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 sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c siglist.c procargs.c procmap.c netload.c ppp.c - - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -194,8 +189,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/kernel.P .deps/loadavg.P \ -+.deps/mem.P .deps/msg_limits.P .deps/netload.P .deps/open.P .deps/ppp.P \ -+.deps/procargs.P .deps/prockernel.P .deps/proclist.P .deps/procmap.P \ -+.deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/siglist.P .deps/swap.P .deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) - -@@ -203,9 +204,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/kernel/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/kernel/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -219,9 +220,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -244,9 +242,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -299,7 +294,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -315,6 +310,11 @@ - subdir = sysdeps/kernel - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/kernel/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -326,6 +326,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -363,27 +394,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -395,12 +426,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - kernel.o kernel.lo: $(srcdir)/kernel.s -diff -urN libgtop2-2.6.0.orig/sysdeps/linux/Makefile.in libgtop2-2.6.0/sysdeps/linux/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/linux/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/linux/Makefile.in 2004-05-29 01:14:25.000000000 -0300 -@@ -148,12 +148,7 @@ - - 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 \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c procargs.c procmap.c siglist.c \ -- sysinfo.c netload.c ppp.c -+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 sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c siglist.c sysinfo.c netload.c ppp.c - - libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@ - -@@ -193,8 +188,15 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/loadavg.P .deps/mem.P \ -+.deps/msg_limits.P .deps/netload.P .deps/open.P .deps/ppp.P \ -+.deps/procargs.P .deps/prockernel.P .deps/proclist.P .deps/procmap.P \ -+.deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/siglist.P .deps/swap.P .deps/sysinfo.P \ -+.deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) - -@@ -202,9 +204,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/linux/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/linux/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -218,9 +220,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -243,9 +242,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -298,7 +294,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -314,6 +310,11 @@ - subdir = sysdeps/linux - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/linux/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -324,112 +325,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --close.lo close.o : close.c ../../include/glibtop/close.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h --cpu.lo cpu.o : cpu.c ../../config.h ../../include/glibtop/error.h \ -- ../../glibtop.h ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/cpu.h --loadavg.lo loadavg.o : loadavg.c ../../config.h \ -- ../../include/glibtop/error.h ../../glibtop.h \ -- ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/loadavg.h --mem.lo mem.o : mem.c ../../config.h ../../include/glibtop/error.h \ -- ../../glibtop.h ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/mem.h --msg_limits.lo msg_limits.o : msg_limits.c \ -- ../../include/glibtop/msg_limits.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h --netload.lo netload.o : netload.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/netload.h --open.lo open.o : open.c ../../glibtop.h ../../include/glibtop/global.h \ -- ../../config.h glibtop_server.h ../../include/glibtop/types.h \ -- ../../include/glibtop/sysdeps.h ../../include/glibtop/cpu.h \ -- ../../include/glibtop/open.h ../../include/glibtop/read.h \ -- ../../include/glibtop/error.h --ppp.lo ppp.o : ppp.c ../../glibtop.h ../../include/glibtop/global.h \ -- ../../config.h glibtop_server.h ../../include/glibtop/types.h \ -- ../../include/glibtop/sysdeps.h ../../include/glibtop/error.h \ -- ../../include/glibtop/ppp.h --procargs.lo procargs.o : procargs.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/procargs.h --prockernel.lo prockernel.o : prockernel.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h \ -- ../../include/glibtop/prockernel.h --proclist.lo proclist.o : proclist.c ../../config.h \ -- ../../include/glibtop/proclist.h ../../glibtop.h \ -- ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procuid.h \ -- ../../include/glibtop/procstate.h --procmap.lo procmap.o : procmap.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/procmap.h --procmem.lo procmem.o : procmem.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/procmem.h --procsegment.lo procsegment.o : procsegment.c ../../config.h \ -- ../../include/glibtop/error.h ../../glibtop.h \ -- ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procsegment.h --procsignal.lo procsignal.o : procsignal.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h \ -- ../../include/glibtop/procsignal.h --procstate.lo procstate.o : procstate.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/procstate.h --proctime.lo proctime.o : proctime.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/proctime.h \ -- ../../include/glibtop/cpu.h --procuid.lo procuid.o : procuid.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/error.h ../../include/glibtop/procuid.h --sem_limits.lo sem_limits.o : sem_limits.c \ -- ../../include/glibtop/sem_limits.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h --shm_limits.lo shm_limits.o : shm_limits.c \ -- ../../include/glibtop/shm_limits.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h --siglist.lo siglist.o : siglist.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/signal.h --swap.lo swap.o : swap.c ../../config.h ../../include/glibtop/error.h \ -- ../../glibtop.h ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/swap.h --sysinfo.lo sysinfo.o : sysinfo.c ../../config.h \ -- ../../include/glibtop/cpu.h ../../glibtop.h \ -- ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/sysinfo.h --uptime.lo uptime.o : uptime.c ../../config.h \ -- ../../include/glibtop/error.h ../../glibtop.h \ -- ../../include/glibtop/global.h glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/uptime.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -467,27 +394,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -499,12 +426,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/Makefile.in libgtop2-2.6.0/sysdeps/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/Makefile.in 2004-05-29 01:12:21.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/Makefile.in 2004-05-29 01:14:23.000000000 -0300 -@@ -147,8 +147,7 @@ - - SUBDIRS = common @sysdeps_dir@ names - --DIST_SUBDIRS = common linux kernel names osf1 \ -- stub stub_suid sun4 freebsd solaris aix -+DIST_SUBDIRS = common linux kernel names osf1 stub stub_suid sun4 freebsd solaris aix - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h -@@ -158,14 +157,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -182,7 +181,7 @@ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive info-recursive dvi-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ -@@ -202,7 +201,7 @@ - - mostlyclean-recursive clean-recursive distclean-recursive \ - maintainer-clean-recursive: -- @set fnord $$MAKEFLAGS; amf=$$2; \ -+ @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ -@@ -248,7 +247,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -264,6 +263,11 @@ - subdir = sysdeps - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -diff -urN libgtop2-2.6.0.orig/sysdeps/names/Makefile.in libgtop2-2.6.0/sysdeps/names/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/names/Makefile.in 2004-05-29 01:12:22.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/names/Makefile.in 2004-05-29 01:14:23.000000000 -0300 -@@ -148,13 +148,7 @@ - - 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 \ -- proclist.c sysdeps.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c \ -- prockernel.c procsegment.c fsusage.c \ -- mountlist.c procargs.c procmap.c netload.c \ -- ppp.c -+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 proclist.c sysdeps.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c fsusage.c mountlist.c procargs.c procmap.c netload.c ppp.c - - - libgtop_names_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -188,8 +182,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/cpu.P .deps/fsusage.P .deps/loadavg.P .deps/mem.P \ -+.deps/mountlist.P .deps/msg_limits.P .deps/netload.P .deps/ppp.P \ -+.deps/procargs.P .deps/prockernel.P .deps/proclist.P .deps/procmap.P \ -+.deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/swap.P .deps/sysdeps.P .deps/uptime.P - SOURCES = $(libgtop_names_2_0_la_SOURCES) - OBJECTS = $(libgtop_names_2_0_la_OBJECTS) - -@@ -197,9 +197,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/names/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/names/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -213,9 +213,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -238,9 +235,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -278,7 +272,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -294,6 +288,11 @@ - subdir = sysdeps/names - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/names/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -304,144 +303,38 @@ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done --cpu.lo cpu.o : cpu.c ../../include/glibtop/cpu.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --fsusage.lo fsusage.o : fsusage.c ../../include/glibtop/fsusage.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --loadavg.lo loadavg.o : loadavg.c ../../include/glibtop/loadavg.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --mem.lo mem.o : mem.c ../../include/glibtop/mem.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --mountlist.lo mountlist.o : mountlist.c ../../include/glibtop/mountlist.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --msg_limits.lo msg_limits.o : msg_limits.c \ -- ../../include/glibtop/msg_limits.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --netload.lo netload.o : netload.c ../../include/glibtop/netload.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --ppp.lo ppp.o : ppp.c ../../include/glibtop/ppp.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --procargs.lo procargs.o : procargs.c ../../include/glibtop/procargs.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --prockernel.lo prockernel.o : prockernel.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/prockernel.h ../../include/libgtop-i18n.h --proclist.lo proclist.o : proclist.c ../../include/glibtop/proclist.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --procmap.lo procmap.o : procmap.c ../../include/glibtop/procmap.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --procmem.lo procmem.o : procmem.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procmem.h ../../include/libgtop-i18n.h --procsegment.lo procsegment.o : procsegment.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/libgtop-i18n.h --procsignal.lo procsignal.o : procsignal.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procsignal.h ../../include/libgtop-i18n.h --procstate.lo procstate.o : procstate.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procstate.h ../../include/libgtop-i18n.h --proctime.lo proctime.o : proctime.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/proctime.h ../../include/glibtop/cpu.h \ -- ../../include/libgtop-i18n.h --procuid.lo procuid.o : procuid.c ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/procuid.h ../../include/libgtop-i18n.h --sem_limits.lo sem_limits.o : sem_limits.c \ -- ../../include/glibtop/sem_limits.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --shm_limits.lo shm_limits.o : shm_limits.c \ -- ../../include/glibtop/shm_limits.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --swap.lo swap.o : swap.c ../../include/glibtop/swap.h ../../glibtop.h \ -- ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h --sysdeps.lo sysdeps.o : sysdeps.c ../../config.h \ -- ../../include/glibtop/union.h ../../include/glibtop/cpu.h \ -- ../../glibtop.h ../../include/glibtop/global.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/glibtop/mem.h ../../include/glibtop/swap.h \ -- ../../include/glibtop/uptime.h ../../include/glibtop/loadavg.h \ -- ../../include/glibtop/shm_limits.h \ -- ../../include/glibtop/msg_limits.h \ -- ../../include/glibtop/sem_limits.h \ -- ../../include/glibtop/proclist.h \ -- ../../include/glibtop/procstate.h \ -- ../../include/glibtop/procuid.h ../../include/glibtop/procmem.h \ -- ../../include/glibtop/proctime.h \ -- ../../include/glibtop/procsignal.h \ -- ../../include/glibtop/prockernel.h \ -- ../../include/glibtop/procsegment.h \ -- ../../include/glibtop/procargs.h \ -- ../../include/glibtop/procmap.h \ -- ../../include/glibtop/mountlist.h \ -- ../../include/glibtop/fsusage.h ../../include/glibtop/netload.h \ -- ../../include/glibtop/ppp.h ../../include/libgtop-i18n.h --uptime.lo uptime.o : uptime.c ../../include/glibtop/uptime.h \ -- ../../glibtop.h ../../include/glibtop/global.h ../../config.h \ -- ../../sysdeps/linux/glibtop_server.h \ -- ../../include/glibtop/types.h ../../include/glibtop/sysdeps.h \ -- ../../include/libgtop-i18n.h - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -478,27 +371,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -509,12 +402,14 @@ - mostlyclean-compile distclean-compile clean-compile \ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ --distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ --dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ --install-exec install-data-am install-data install-am install \ --uninstall-am uninstall all-redirect all-am all installdirs \ --mostlyclean-generic distclean-generic clean-generic \ --maintainer-clean-generic clean mostlyclean distclean maintainer-clean -+distclean-tags clean-tags maintainer-clean-tags distdir \ -+mostlyclean-depend distclean-depend clean-depend \ -+maintainer-clean-depend info-am info dvi-am dvi check check-am \ -+installcheck-am installcheck install-exec-am install-exec \ -+install-data-am install-data install-am install uninstall-am uninstall \ -+all-redirect all-am all installdirs mostlyclean-generic \ -+distclean-generic clean-generic maintainer-clean-generic clean \ -+mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/osf1/Makefile.in libgtop2-2.6.0/sysdeps/osf1/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/osf1/Makefile.in 2004-05-29 01:12:22.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/osf1/Makefile.in 2004-05-29 01:14:24.000000000 -0300 -@@ -148,17 +148,12 @@ - - 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 \ -- sem_limits.c ppp.c -+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 sem_limits.c ppp.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtop_sysdeps_2_0_la_LIBADD = -lmach - --libgtop_sysdeps_suid_2_0_la_SOURCES = open_suid.c close_suid.c proclist.c \ -- procstate.c procuid.c proctime.c procmem.c \ -- procsignal.c prockernel.c procsegment.c \ -- procmap.c procargs.c netload.c -+libgtop_sysdeps_suid_2_0_la_SOURCES = open_suid.c close_suid.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procmap.c procargs.c netload.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtop_sysdeps_suid_2_0_la_LIBADD = -lmach -@@ -202,8 +197,15 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/close_suid.P .deps/cpu.P \ -+.deps/loadavg.P .deps/mem.P .deps/msg_limits.P .deps/netload.P \ -+.deps/open.P .deps/open_suid.P .deps/ppp.P .deps/procargs.P \ -+.deps/prockernel.P .deps/proclist.P .deps/procmap.P .deps/procmem.P \ -+.deps/procsegment.P .deps/procsignal.P .deps/procstate.P \ -+.deps/proctime.P .deps/procuid.P .deps/sem_limits.P .deps/shm_limits.P \ -+.deps/siglist.P .deps/swap.P .deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) $(libgtop_sysdeps_suid_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) $(libgtop_sysdeps_suid_2_0_la_OBJECTS) - -@@ -211,9 +213,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/osf1/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/osf1/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -227,9 +229,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -252,9 +251,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -310,7 +306,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -326,6 +322,11 @@ - subdir = sysdeps/osf1 - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/osf1/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -337,6 +338,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -374,27 +406,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -406,12 +438,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/solaris/Makefile.in libgtop2-2.6.0/sysdeps/solaris/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/solaris/Makefile.in 2004-05-29 01:12:26.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/solaris/Makefile.in 2004-05-29 01:14:26.000000000 -0300 -@@ -148,20 +148,14 @@ - - 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 \ -- proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c \ -- prockernel.c procsegment.c procargs.c \ -- procmap.c netload.c ppp.c procdata.c -+libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c safeio.c swap.c uptime.c loadavg.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c procdata.c - - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - - libgtop_sysdeps_2_0_la_LIBADD = @DL_LIB@ - --libgtop_sysdeps_suid_2_0_la_SOURCES = open_suid.c close_suid.c \ -- shm_limits.c msg_limits.c sem_limits.c -+libgtop_sysdeps_suid_2_0_la_SOURCES = open_suid.c close_suid.c shm_limits.c msg_limits.c sem_limits.c - - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -204,8 +198,16 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/close_suid.P .deps/cpu.P \ -+.deps/loadavg.P .deps/mem.P .deps/msg_limits.P .deps/netload.P \ -+.deps/open.P .deps/open_suid.P .deps/ppp.P .deps/procargs.P \ -+.deps/procdata.P .deps/prockernel.P .deps/proclist.P .deps/procmap.P \ -+.deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/safeio.P \ -+.deps/sem_limits.P .deps/shm_limits.P .deps/siglist.P .deps/swap.P \ -+.deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) $(libgtop_sysdeps_suid_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) $(libgtop_sysdeps_suid_2_0_la_OBJECTS) - -@@ -213,9 +215,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/solaris/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/solaris/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -229,9 +231,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -254,9 +253,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -312,7 +308,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -328,6 +324,11 @@ - subdir = sysdeps/solaris - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/solaris/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -339,6 +340,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -376,27 +408,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -408,12 +440,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/stub/Makefile.in libgtop2-2.6.0/sysdeps/stub/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/stub/Makefile.in 2004-05-29 01:12:23.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/stub/Makefile.in 2004-05-29 01:14:24.000000000 -0300 -@@ -148,12 +148,7 @@ - - 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 \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c procargs.c procmap.c netload.c \ -- ppp.c -+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 sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c - - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -192,8 +187,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/loadavg.P .deps/mem.P \ -+.deps/msg_limits.P .deps/netload.P .deps/open.P .deps/ppp.P \ -+.deps/procargs.P .deps/prockernel.P .deps/proclist.P .deps/procmap.P \ -+.deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/siglist.P .deps/swap.P .deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) - -@@ -201,9 +202,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/stub/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/stub/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -217,9 +218,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -242,9 +240,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -297,7 +292,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -313,6 +308,11 @@ - subdir = sysdeps/stub - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/stub/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -324,6 +324,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -361,27 +392,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -393,12 +424,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/stub_suid/Makefile.in libgtop2-2.6.0/sysdeps/stub_suid/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/stub_suid/Makefile.in 2004-05-29 01:12:23.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/stub_suid/Makefile.in 2004-05-29 01:14:24.000000000 -0300 -@@ -152,12 +152,7 @@ - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - --libgtop_sysdeps_suid_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 \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c procargs.c procmap.c netload.c \ -- ppp.c -+libgtop_sysdeps_suid_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 sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c procargs.c procmap.c netload.c ppp.c - - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -@@ -200,8 +195,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/loadavg.P .deps/mem.P \ -+.deps/msg_limits.P .deps/netload.P .deps/nosuid.P .deps/open.P \ -+.deps/ppp.P .deps/procargs.P .deps/prockernel.P .deps/proclist.P \ -+.deps/procmap.P .deps/procmem.P .deps/procsegment.P .deps/procsignal.P \ -+.deps/procstate.P .deps/proctime.P .deps/procuid.P .deps/sem_limits.P \ -+.deps/shm_limits.P .deps/siglist.P .deps/swap.P .deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) $(libgtop_sysdeps_suid_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) $(libgtop_sysdeps_suid_2_0_la_OBJECTS) - -@@ -209,9 +210,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/stub_suid/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/stub_suid/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -225,9 +226,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -250,9 +248,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -308,7 +303,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -324,6 +319,11 @@ - subdir = sysdeps/stub_suid - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/stub_suid/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -335,6 +335,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -372,27 +403,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -404,12 +435,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. -diff -urN libgtop2-2.6.0.orig/sysdeps/sun4/Makefile.in libgtop2-2.6.0/sysdeps/sun4/Makefile.in ---- libgtop2-2.6.0.orig/sysdeps/sun4/Makefile.in 2004-05-29 01:12:25.000000000 -0300 -+++ libgtop2-2.6.0/sysdeps/sun4/Makefile.in 2004-05-29 01:14:24.000000000 -0300 -@@ -152,11 +152,7 @@ - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtop_sysdeps_2_0_la_LIBADD = -lkvm - --libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ -- uptime.c loadavg.c shm_limits.c msg_limits.c \ -- sem_limits.c proclist.c procstate.c procuid.c \ -- proctime.c procmem.c procsignal.c prockernel.c \ -- procsegment.c ppp.c -+libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c uptime.c loadavg.c shm_limits.c msg_limits.c sem_limits.c proclist.c procstate.c procuid.c proctime.c procmem.c procsignal.c prockernel.c procsegment.c ppp.c - - libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - libgtop_sysdeps_suid_2_0_la_LIBADD = -lkvm -@@ -198,8 +194,14 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best -+DEP_FILES = .deps/close.P .deps/cpu.P .deps/loadavg.P .deps/mem.P \ -+.deps/msg_limits.P .deps/nosuid.P .deps/open.P .deps/ppp.P \ -+.deps/prockernel.P .deps/proclist.P .deps/procmem.P .deps/procsegment.P \ -+.deps/procsignal.P .deps/procstate.P .deps/proctime.P .deps/procuid.P \ -+.deps/sem_limits.P .deps/shm_limits.P .deps/siglist.P .deps/swap.P \ -+.deps/uptime.P - SOURCES = $(libgtop_sysdeps_2_0_la_SOURCES) $(libgtop_sysdeps_suid_2_0_la_SOURCES) - OBJECTS = $(libgtop_sysdeps_2_0_la_OBJECTS) $(libgtop_sysdeps_suid_2_0_la_OBJECTS) - -@@ -207,9 +209,9 @@ - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .obj .s - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps sysdeps/sun4/Makefile -+ cd $(top_srcdir) && $(AUTOMAKE) --gnu sysdeps/sun4/Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -@@ -223,9 +225,6 @@ - - maintainer-clean-noinstLTLIBRARIES: - --.c.o: -- $(COMPILE) -c $< -- - # FIXME: We should only use cygpath when building on Windows, - # and only if it is available. - .c.obj: -@@ -248,9 +247,6 @@ - - maintainer-clean-compile: - --.c.lo: -- $(LIBTOOL) --mode=compile $(COMPILE) -c $< -- - .s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -@@ -306,7 +302,7 @@ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ -- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS) -+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - - mostlyclean-tags: - -@@ -322,6 +318,11 @@ - subdir = sysdeps/sun4 - - distdir: $(DISTFILES) -+ here=`cd $(top_builddir) && pwd`; \ -+ top_distdir=`cd $(top_distdir) && pwd`; \ -+ distdir=`cd $(distdir) && pwd`; \ -+ cd $(top_srcdir) \ -+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu sysdeps/sun4/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -@@ -333,6 +334,37 @@ - fi; \ - done - -+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+ -+-include $(DEP_FILES) -+ -+mostlyclean-depend: -+ -+clean-depend: -+ -+distclean-depend: -+ -rm -rf .deps -+ -+maintainer-clean-depend: -+ -+%.o: %.c -+ @echo '$(COMPILE) -c $<'; \ -+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-cp .deps/$(*F).pp .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm .deps/$(*F).pp -+ -+%.lo: %.c -+ @echo '$(LTCOMPILE) -c $<'; \ -+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< -+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ -+ < .deps/$(*F).pp > .deps/$(*F).P; \ -+ tr ' ' '\012' < .deps/$(*F).pp \ -+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ -+ >> .deps/$(*F).P; \ -+ rm -f .deps/$(*F).pp - info-am: - info: info-am - dvi-am: -@@ -370,27 +402,27 @@ - - maintainer-clean-generic: - mostlyclean-am: mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ -- mostlyclean-libtool mostlyclean-tags \ -+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \ - mostlyclean-generic - - mostlyclean: mostlyclean-am - - clean-am: clean-noinstLTLIBRARIES clean-compile clean-libtool \ -- clean-tags clean-generic mostlyclean-am -+ clean-tags clean-depend clean-generic mostlyclean-am - - clean: clean-am - - distclean-am: distclean-noinstLTLIBRARIES distclean-compile \ -- distclean-libtool distclean-tags distclean-generic \ -- clean-am -+ distclean-libtool distclean-tags distclean-depend \ -+ distclean-generic clean-am - -rm -f libtool - - distclean: distclean-am - - maintainer-clean-am: maintainer-clean-noinstLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ -- maintainer-clean-tags maintainer-clean-generic \ -- distclean-am -+ maintainer-clean-tags maintainer-clean-depend \ -+ maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -@@ -402,12 +434,13 @@ - maintainer-clean-compile mostlyclean-libtool distclean-libtool \ - clean-libtool maintainer-clean-libtool uninstall-libgtopincludeHEADERS \ - install-libgtopincludeHEADERS tags mostlyclean-tags distclean-tags \ --clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ --check-am installcheck-am installcheck install-exec-am install-exec \ --install-data-am install-data install-am install uninstall-am uninstall \ --all-redirect all-am all installdirs mostlyclean-generic \ --distclean-generic clean-generic maintainer-clean-generic clean \ --mostlyclean distclean maintainer-clean -+clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -+distclean-depend clean-depend maintainer-clean-depend info-am info \ -+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -+install-exec install-data-am install-data install-am install \ -+uninstall-am uninstall all-redirect all-am all installdirs \ -+mostlyclean-generic distclean-generic clean-generic \ -+maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/debian/rules b/debian/rules index 53b65aad..ee9fe85a 100755 --- a/debian/rules +++ b/debian/rules @@ -7,3 +7,4 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk DEB_CONFIGURE_EXTRA_FLAGS := --without-xauth --with-x +DEB_DH_MAKESHLIBS_ARGS_ALL = -V 'libgtop2-5 (>= 2.9.4)' diff --git a/debian/watch b/debian/watch index e20ae129..d1df7bd6 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=2 -ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.8/ \ +ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.10/ \ libgtop-(.*)\.tar\.gz \ debian uupdate