diff --git a/debian/changelog b/debian/changelog index 9998efa1..23437cbc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libgtop2 (2.6.0-4) unstable; urgency=low + + * debian/patches/10_relibtoolize.patch: + - remade patch to fix problems with dpkg-shlibdeps + + -- Gustavo Noronha Silva Sat, 29 May 2004 01:23:53 -0300 + libgtop2 (2.6.0-3) unstable; urgency=low * GNOME Team upload. @@ -259,6 +266,4 @@ libgtop2 (1.90.2-1) unstable; urgency=low -- Noel Koethe Sat, 16 Feb 2002 13:16:00 +0100 -Local variables: -mode: debian-changelog -End: + diff --git a/debian/libgtop2-2.shlibs b/debian/libgtop2-2.shlibs deleted file mode 100644 index a8d78036..00000000 --- a/debian/libgtop2-2.shlibs +++ /dev/null @@ -1 +0,0 @@ -libgtop2.0 2 libgtop2-2 (>= 2.5.2) diff --git a/debian/patches/10_relibtoolize.patch b/debian/patches/10_relibtoolize.patch index 38c2ba23..fe80ed47 100644 --- a/debian/patches/10_relibtoolize.patch +++ b/debian/patches/10_relibtoolize.patch @@ -1,6 +1,6 @@ -diff -u libgtop2-2.6.0/aclocal.m4 libgtop2-2.6.0-libtoolized/aclocal.m4 ---- libgtop2-2.6.0/aclocal.m4 2004-04-07 12:19:35.000000000 +0200 -+++ libgtop2-2.6.0-libtoolized/aclocal.m4 2004-04-18 16:34:04.000000000 +0200 +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-*- @@ -113,15 +113,15 @@ diff -u libgtop2-2.6.0/aclocal.m4 libgtop2-2.6.0-libtoolized/aclocal.m4 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 -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess ---- libgtop2-2.6.0/config.guess 2004-04-06 07:57:07.000000000 +0200 -+++ libgtop2-2.6.0-libtoolized/config.guess 2004-04-18 16:33:48.000000000 +0200 +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-01-05' ++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 @@ -139,7 +139,26 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in -@@ -228,6 +221,9 @@ +@@ -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 ;; @@ -149,7 +168,48 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; -@@ -314,6 +310,9 @@ +@@ -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 ;; @@ -159,7 +219,17 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; -@@ -741,7 +740,7 @@ +@@ -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:*:*) @@ -168,7 +238,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -@@ -749,6 +748,11 @@ +@@ -749,6 +772,11 @@ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; @@ -180,7 +250,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; -@@ -758,7 +762,7 @@ +@@ -758,7 +786,7 @@ *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; @@ -189,7 +259,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess # Determine whether the default compiler uses glibc. eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c -@@ -770,7 +774,10 @@ +@@ -770,7 +798,10 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` @@ -201,7 +271,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin -@@ -803,8 +810,13 @@ +@@ -803,8 +834,13 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) @@ -215,16 +285,19 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; -@@ -815,7 +827,7 @@ +@@ -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 +871,10 @@ +@@ -859,10 +898,10 @@ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) @@ -237,7 +310,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in -@@ -890,7 +902,7 @@ +@@ -890,7 +929,7 @@ echo hppa64-unknown-linux-gnu exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) @@ -246,7 +319,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess exit 0 ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -902,7 +914,7 @@ +@@ -902,7 +941,7 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; x86_64:Linux:*:*) @@ -255,7 +328,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so -@@ -952,9 +964,12 @@ +@@ -952,9 +991,12 @@ LIBC=gnuaout #endif #endif @@ -269,7 +342,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) -@@ -982,6 +997,9 @@ +@@ -982,6 +1024,9 @@ i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; @@ -279,7 +352,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; -@@ -1053,7 +1071,7 @@ +@@ -1053,7 +1098,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; @@ -288,7 +361,7 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` -@@ -1168,7 +1186,7 @@ +@@ -1168,7 +1213,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; @@ -297,25 +370,1381 @@ diff -u libgtop2-2.6.0/config.guess libgtop2-2.6.0-libtoolized/config.guess echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) -@@ -1212,6 +1230,9 @@ +@@ -1212,6 +1257,9 @@ SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit 0 ;; -+ *:DRAGONFLY:*:*) -+ echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE} ++ *: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 -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub ---- libgtop2-2.6.0/config.sub 2004-04-06 07:57:07.000000000 +0200 -+++ libgtop2-2.6.0-libtoolized/config.sub 2004-04-18 16:33:48.000000000 +0200 +diff -urN libgtop2-2.6.0.orig/config.status libgtop2-2.6.0/config.status +--- libgtop2-2.6.0.orig/config.status 1969-12-31 21:00:00.000000000 -0300 ++++ libgtop2-2.6.0/config.status 2004-05-29 01:15:58.000000000 -0300 +@@ -0,0 +1,1352 @@ ++#! /bin/sh ++# Generated by configure. ++# Run this file to recreate the current configuration. ++# Compiler output produced by configure, useful for debugging ++# configure, is in config.log if it exists. ++ ++debug=false ++ac_cs_recheck=false ++ac_cs_silent=false ++SHELL=${CONFIG_SHELL-/bin/sh} ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then ++ set -o posix ++fi ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++$as_unset ENV MAIL MAILPATH ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)$' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } ++ /^X\/\(\/\/\)$/{ s//\1/; q; } ++ /^X\/\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ ++ ++# PATH needs CR, and LINENO needs CR and PATH. ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" || { ++ # Find who we are. Look in the path if we contain no path at all ++ # relative or not. ++ case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++ ++ ;; ++ esac ++ # We did not find ourselves, most probably we were run as `sh COMMAND' ++ # in which case we are not to be found in the path. ++ if test "x$as_myself" = x; then ++ as_myself=$0 ++ fi ++ if test ! -f "$as_myself"; then ++ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 ++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ case $CONFIG_SHELL in ++ '') ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for as_base in sh bash ksh sh5; do ++ case $as_dir in ++ /*) ++ if ("$as_dir/$as_base" -c ' ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then ++ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } ++ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } ++ CONFIG_SHELL=$as_dir/$as_base ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$0" ${1+"$@"} ++ fi;; ++ esac ++ done ++done ++;; ++ esac ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line before each line; the second 'sed' does the real ++ # work. The second script uses 'N' to pair each line-number line ++ # with the numbered line, and appends trailing '-' during ++ # substitution so that $LINENO is not a special case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) ++ sed '=' <$as_myself | ++ sed ' ++ N ++ s,$,-, ++ : loop ++ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, ++ t loop ++ s,-$,, ++ s,^['$as_cr_digits']*\n,, ++ ' >$as_me.lineno && ++ chmod +x $as_me.lineno || ++ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 ++echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensible to this). ++ . ./$as_me.lineno ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in ++ *c*,-n*) ECHO_N= ECHO_C=' ++' ECHO_T=' ' ;; ++ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; ++ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ # We could just check for DJGPP; but this test a) works b) is more generic ++ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). ++ if test -f conf$$.exe; then ++ # Don't use ln at all; we don't have any links ++ as_ln_s='cp -p' ++ else ++ as_ln_s='ln -s' ++ fi ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.file ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++as_executable_p="test -f" ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. ++as_nl=' ++' ++IFS=" $as_nl" ++ ++# CDPATH. ++$as_unset CDPATH ++ ++exec 6>&1 ++ ++# Open the log real soon, to keep \$[0] and so on meaningful, and to ++# report actual input values of CONFIG_FILES etc. instead of their ++# values after options handling. Logging --version etc. is OK. ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++} >&5 ++cat >&5 <<_CSEOF ++ ++This file was extended by $as_me, which was ++generated by GNU Autoconf 2.59. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++ CONFIG_LINKS = $CONFIG_LINKS ++ CONFIG_COMMANDS = $CONFIG_COMMANDS ++ $ $0 $@ ++ ++_CSEOF ++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 ++echo >&5 ++config_files=" Makefile libgtop.spec po/Makefile.in misc/Makefile include/Makefile include/glibtop/Makefile sysdeps/Makefile sysdeps/common/Makefile sysdeps/names/Makefile sysdeps/stub/Makefile sysdeps/stub_suid/Makefile sysdeps/sun4/Makefile sysdeps/osf1/Makefile sysdeps/linux/Makefile sysdeps/kernel/Makefile sysdeps/freebsd/Makefile sysdeps/solaris/Makefile sysdeps/aix/Makefile src/Makefile src/daemon/Makefile src/inodedb/Makefile lib/Makefile examples/Makefile doc/Makefile libgtop-2.0.pc" ++config_headers=" config.h" ++config_commands=" default-1 default-2" ++ ++ac_cs_usage="\ ++\`$as_me' instantiates files from templates according to the ++current configuration. ++ ++Usage: $0 [OPTIONS] [FILE]... ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ --recheck update $as_me by reconfiguring in the same conditions ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Configuration commands: ++$config_commands ++ ++Report bugs to ." ++ac_cs_version="\ ++config.status ++configured by ./configure, generated by GNU Autoconf 2.59, ++ with options \"'--enable-maintainer-mode' '--prefix=/usr'\" ++ ++Copyright (C) 2003 Free Software Foundation, Inc. ++This config.status script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it." ++srcdir=. ++INSTALL="/usr/bin/install -c" ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. ++ac_need_defaults=: ++while test $# != 0 ++do ++ case $1 in ++ --*=*) ++ ac_option=`expr "x$1" : 'x\([^=]*\)='` ++ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ++ ac_shift=: ++ ;; ++ -*) ++ ac_option=$1 ++ ac_optarg=$2 ++ ac_shift=shift ++ ;; ++ *) # This is not an option, so the user has probably given explicit ++ # arguments. ++ ac_option=$1 ++ ac_need_defaults=false;; ++ esac ++ ++ case $ac_option in ++ # Handling of the options. ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ ac_cs_recheck=: ;; ++ --version | --vers* | -V ) ++ echo "$ac_cs_version"; exit 0 ;; ++ --he | --h) ++ # Conflict between --help and --header ++ { { echo "$as_me:$LINENO: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&5 ++echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2;} ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ ac_need_defaults=false;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil | --si | --s) ++ ac_cs_silent=: ;; ++ ++ # This is an error. ++ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&5 ++echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2;} ++ { (exit 1); exit 1; }; } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ;; ++ ++ esac ++ shift ++done ++ ++ac_configure_extra_args= ++ ++if $ac_cs_silent; then ++ exec 6>/dev/null ++ ac_configure_extra_args="$ac_configure_extra_args --silent" ++fi ++ ++if $ac_cs_recheck; then ++ echo "running /bin/sh ./configure " '--enable-maintainer-mode' '--prefix=/usr' $ac_configure_extra_args " --no-create --no-recursion" >&6 ++ exec /bin/sh ./configure '--enable-maintainer-mode' '--prefix=/usr' $ac_configure_extra_args --no-create --no-recursion ++fi ++ ++# ++# INIT-COMMANDS section. ++# ++ ++ ++ ++ ++for ac_config_target in $ac_config_targets ++do ++ case "$ac_config_target" in ++ # Handling of arguments. ++ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "libgtop.spec" ) CONFIG_FILES="$CONFIG_FILES libgtop.spec" ;; ++ "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; ++ "misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;; ++ "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; ++ "include/glibtop/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/glibtop/Makefile" ;; ++ "sysdeps/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/Makefile" ;; ++ "sysdeps/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/common/Makefile" ;; ++ "sysdeps/names/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/names/Makefile" ;; ++ "sysdeps/stub/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/stub/Makefile" ;; ++ "sysdeps/stub_suid/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/stub_suid/Makefile" ;; ++ "sysdeps/sun4/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/sun4/Makefile" ;; ++ "sysdeps/osf1/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/osf1/Makefile" ;; ++ "sysdeps/linux/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/linux/Makefile" ;; ++ "sysdeps/kernel/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/kernel/Makefile" ;; ++ "sysdeps/freebsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/freebsd/Makefile" ;; ++ "sysdeps/solaris/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/solaris/Makefile" ;; ++ "sysdeps/aix/Makefile" ) CONFIG_FILES="$CONFIG_FILES sysdeps/aix/Makefile" ;; ++ "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; ++ "src/daemon/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/daemon/Makefile" ;; ++ "src/inodedb/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/inodedb/Makefile" ;; ++ "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; ++ "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; ++ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; ++ "libgtop-2.0.pc" ) CONFIG_FILES="$CONFIG_FILES libgtop-2.0.pc" ;; ++ "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; ++ "default-2" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;; ++ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++done ++ ++# If the user did not use the arguments to specify the items to instantiate, ++# then the envvar interface is used. Set only those that are not. ++# We use the long form for the default assignment because of an extremely ++# bizarre bug on SunOS 4.1.3. ++if $ac_need_defaults; then ++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands ++fi ++ ++# Have a temporary directory for convenience. Make it in the build tree ++# simply because there is no reason to put it here, and in addition, ++# creating and moving files from /tmp can sometimes cause problems. ++# Create a temporary directory, and hook for its removal unless debugging. ++$debug || ++{ ++ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 ++ trap '{ (exit 1); exit 1; }' 1 2 13 15 ++} ++ ++# Create a (secure) tmp directory for tmp files. ++ ++{ ++ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && ++ test -n "$tmp" && test -d "$tmp" ++} || ++{ ++ tmp=./confstat$$-$RANDOM ++ (umask 077 && mkdir $tmp) ++} || ++{ ++ echo "$me: cannot create a temporary directory in ." >&2 ++ { (exit 1); exit 1; } ++} ++ ++ ++# ++# CONFIG_FILES section. ++# ++ ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h ++if test -n "$CONFIG_FILES"; then ++ # Protect against being on the right side of a sed subst in config.status. ++ sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g; ++ s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF ++s,@SHELL@,/bin/sh,;t t ++s,@PATH_SEPARATOR@,:,;t t ++s,@PACKAGE_NAME@,,;t t ++s,@PACKAGE_TARNAME@,,;t t ++s,@PACKAGE_VERSION@,,;t t ++s,@PACKAGE_STRING@,,;t t ++s,@PACKAGE_BUGREPORT@,,;t t ++s,@exec_prefix@,${prefix},;t t ++s,@prefix@,/usr,;t t ++s,@program_transform_name@,s,x,x,,;t t ++s,@bindir@,${exec_prefix}/bin,;t t ++s,@sbindir@,${exec_prefix}/sbin,;t t ++s,@libexecdir@,${exec_prefix}/libexec,;t t ++s,@datadir@,${prefix}/share,;t t ++s,@sysconfdir@,${prefix}/etc,;t t ++s,@sharedstatedir@,${prefix}/com,;t t ++s,@localstatedir@,${prefix}/var,;t t ++s,@libdir@,${exec_prefix}/lib,;t t ++s,@includedir@,${prefix}/include,;t t ++s,@oldincludedir@,/usr/include,;t t ++s,@infodir@,${prefix}/info,;t t ++s,@mandir@,${prefix}/man,;t t ++s,@build_alias@,,;t t ++s,@host_alias@,,;t t ++s,@target_alias@,,;t t ++s,@DEFS@,-DHAVE_CONFIG_H,;t t ++s,@ECHO_C@,,;t t ++s,@ECHO_N@,-n,;t t ++s,@ECHO_T@,,;t t ++s,@LIBS@,,;t t ++s,@build@,i686-pc-linux-gnu,;t t ++s,@build_cpu@,i686,;t t ++s,@build_vendor@,pc,;t t ++s,@build_os@,linux-gnu,;t t ++s,@host@,i686-pc-linux-gnu,;t t ++s,@host_cpu@,i686,;t t ++s,@host_vendor@,pc,;t t ++s,@host_os@,linux-gnu,;t t ++s,@target@,i686-pc-linux-gnu,;t t ++s,@target_cpu@,i686,;t t ++s,@target_vendor@,pc,;t t ++s,@target_os@,linux-gnu,;t t ++s,@INSTALL_PROGRAM@,${INSTALL},;t t ++s,@INSTALL_SCRIPT@,${INSTALL},;t t ++s,@INSTALL_DATA@,${INSTALL} -m 644,;t t ++s,@PACKAGE@,libgtop,;t t ++s,@VERSION@,2.6.0,;t t ++s,@ACLOCAL@,aclocal-1.4,;t t ++s,@AUTOCONF@,autoconf,;t t ++s,@AUTOMAKE@,automake-1.4,;t t ++s,@AUTOHEADER@,autoheader,;t t ++s,@MAKEINFO@,makeinfo,;t t ++s,@SET_MAKE@,,;t t ++s,@LIBGTOP_MAJOR_VERSION@,2,;t t ++s,@LIBGTOP_MINOR_VERSION@,6,;t t ++s,@LIBGTOP_MICRO_VERSION@,0,;t t ++s,@LIBGTOP_INTERFACE_AGE@,,;t t ++s,@LIBGTOP_BINARY_AGE@,,;t t ++s,@LIBGTOP_SERVER_VERSION@,5,;t t ++s,@LIBGTOP_VERSION@,2.6.0,;t t ++s,@LIBGTOP_VERSION_CODE@,2006000,;t t ++s,@LIBGTOP_VERSION_SUFFIX@,,;t t ++s,@LT_VERSION_INFO@,-version-info 3:0:1,;t t ++s,@LT_RELEASE@,2.6,;t t ++s,@LT_CURRENT@,3,;t t ++s,@LT_REVISION@,0,;t t ++s,@LT_AGE@,1,;t t ++s,@CC@,gcc,;t t ++s,@CFLAGS@, -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -fno-strict-aliasing -g -O2,;t t ++s,@LDFLAGS@,,;t t ++s,@CPPFLAGS@,,;t t ++s,@ac_ct_CC@,gcc,;t t ++s,@EXEEXT@,,;t t ++s,@OBJEXT@,o,;t t ++s,@CPP@,gcc -E,;t t ++s,@EGREP@,grep -E,;t t ++s,@libgtop_top_builddir@,/home/kov/debian/packs/pkg-gnome/desktop/trunk/tarballs/libgtop2-2.6.0,;t t ++s,@AWK@,gawk,;t t ++s,@PERL@,perl,;t t ++s,@RANLIB@,ranlib,;t t ++s,@ac_ct_RANLIB@,ranlib,;t t ++s,@AS@,as,;t t ++s,@ac_ct_AS@,as,;t t ++s,@AR@,ar,;t t ++s,@ac_ct_AR@,ar,;t t ++s,@LN_S@,ln -s,;t t ++s,@ECHO@,echo,;t t ++s,@STRIP@,strip,;t t ++s,@ac_ct_STRIP@,strip,;t t ++s,@CXX@,g++,;t t ++s,@CXXFLAGS@,-g -O2,;t t ++s,@ac_ct_CXX@,g++,;t t ++s,@CXXCPP@,g++ -E,;t t ++s,@F77@,,;t t ++s,@FFLAGS@,,;t t ++s,@ac_ct_F77@,,;t t ++s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t ++s,@CROSS_COMPILING_TRUE@,#,;t t ++s,@CROSS_COMPILING_FALSE@,,;t t ++s,@libgtop_sysdeps_dir@,linux,;t t ++s,@libgtop_use_machine_h@,no,;t t ++s,@libgtop_need_server@,no,;t t ++s,@EXAMPLES_TRUE@,#,;t t ++s,@EXAMPLES_FALSE@,,;t t ++s,@HACKER_MODE_TRUE@,#,;t t ++s,@HACKER_MODE_FALSE@,,;t t ++s,@LINUX_TABLE_TRUE@,#,;t t ++s,@LINUX_TABLE_FALSE@,,;t t ++s,@LIBGTOP_SMP_TRUE@,,;t t ++s,@LIBGTOP_SMP_FALSE@,#,;t t ++s,@libgtop_postinstall@,:,;t t ++s,@libgtop_have_sysinfo@,yes,;t t ++s,@NEED_LIBGTOP_TRUE@,#,;t t ++s,@NEED_LIBGTOP_FALSE@,,;t t ++s,@INODEDB_TRUE@,#,;t t ++s,@INODEDB_FALSE@,,;t t ++s,@ENABLE_STATIC_TRUE@,,;t t ++s,@ENABLE_STATIC_FALSE@,#,;t t ++s,@ENABLE_SHARED_TRUE@,,;t t ++s,@ENABLE_SHARED_FALSE@,#,;t t ++s,@static_targets@,first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static smp_static,;t t ++s,@smp_examples@,smp,;t t ++s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t ++s,@GLIB_CFLAGS@,-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ,;t t ++s,@GLIB_LIBS@,-lglib-2.0 ,;t t ++s,@LIBOBJS@,,;t t ++s,@DL_LIB@,-ldl,;t t ++s,@ALLOCA@,,;t t ++s,@GETTEXT_PACKAGE@,libgtop-2.0,;t t ++s,@USE_NLS@,yes,;t t ++s,@MSGFMT@,/usr/bin/msgfmt,;t t ++s,@GMSGFMT@,/usr/bin/msgfmt,;t t ++s,@XGETTEXT@,/usr/bin/xgettext,;t t ++s,@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,;t t ++s,@CATOBJEXT@,.gmo,;t t ++s,@DATADIRNAME@,share,;t t ++s,@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,;t t ++s,@INSTOBJEXT@,.mo,;t t ++s,@INTLLIBS@,,;t t ++s,@PO_IN_DATADIR_TRUE@,,;t t ++s,@PO_IN_DATADIR_FALSE@,,;t t ++s,@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,;t t ++s,@POSUB@,po,;t t ++s,@MKINSTALLDIRS@,./mkinstalldirs,;t t ++s,@X_CFLAGS@, -I/usr/X11R6/include,;t t ++s,@X_PRE_LIBS@, -lSM -lICE,;t t ++s,@X_LIBS@, -L/usr/X11R6/lib,;t t ++s,@X_EXTRA_LIBS@,,;t t ++s,@libs_xauth@,-L/usr/X11R6/lib -lXau,;t t ++s,@sysdeps_dir@,linux,;t t ++s,@machine_incs@,-I$(top_srcdir)/sysdeps/linux,;t t ++s,@INCLUDES@,-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/sysdeps/linux -I$(top_srcdir)/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -fno-strict-aliasing -g -O2 -I/usr/X11R6/include -DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"2.6.0\" -DLIBGTOP_SERVER_VERSION=\"5\" -DLIBGTOP_VERSION_CODE=2006000 -DLIBGTOP_SERVER=\"$(bindir)/libgtop_server2\",;t t ++s,@LIBGTOP_EXTRA_LIBS@,-L/usr/X11R6/lib -lXau -lglib-2.0 ,;t t ++s,@LIBGTOP_LIBS@,-L$(libdir),;t t ++s,@LIBGTOP_INCS@,-I$(includedir)/libgtop-2.0 -DHAVE_LIBGTOP_SMP -DHAVE_LIBGTOP_SYSINFO -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include ,;t t ++s,@LIBGTOP_NAMES_LIBS@,-L$(libdir),;t t ++s,@LIBGTOP_NAMES_INCS@,-I$(includedir)/libgtop-2.0 -DHAVE_LIBGTOP_SMP -DHAVE_LIBGTOP_SYSINFO -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DGLIBTOP_NAMES,;t t ++s,@LIBGTOP_BINDIR@,$(bindir),;t t ++s,@LIBGTOP_SERVER@,$(bindir)/libgtop_server2,;t t ++s,@sysdeps_suid_lib@,,;t t ++s,@server_programs@,,;t t ++s,@LTLIBOBJS@,,;t t ++CEOF ++ ++ # Split the substitutions into bite-sized pieces for seds with ++ # small command number limits, like on Digital OSF/1 and HP-UX. ++ ac_max_sed_lines=48 ++ ac_sed_frag=1 # Number of current file. ++ ac_beg=1 # First line for current file. ++ ac_end=$ac_max_sed_lines # Line after last line for current file. ++ ac_more_lines=: ++ ac_sed_cmds= ++ while $ac_more_lines; do ++ if test $ac_beg -gt 1; then ++ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag ++ else ++ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag ++ fi ++ if test ! -s $tmp/subs.frag; then ++ ac_more_lines=false ++ else ++ # The purpose of the label and of the branching condition is to ++ # speed up the sed processing (if there are no `@' at all, there ++ # is no need to browse any of the substitutions). ++ # These are the two extra sed commands mentioned above. ++ (echo ':t ++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed ++ if test -z "$ac_sed_cmds"; then ++ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" ++ else ++ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" ++ fi ++ ac_sed_frag=`expr $ac_sed_frag + 1` ++ ac_beg=$ac_end ++ ac_end=`expr $ac_end + $ac_max_sed_lines` ++ fi ++ done ++ if test -z "$ac_sed_cmds"; then ++ ac_sed_cmds=cat ++ fi ++fi # test -n "$CONFIG_FILES" ++ ++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue ++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ case $ac_file in ++ - | *:- | *:-:* ) # input from stdin ++ cat >$tmp/stdin ++ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ * ) ac_file_in=$ac_file.in ;; ++ esac ++ ++ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. ++ ac_dir=`(dirname "$ac_file") 2>/dev/null || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ { if $as_mkdir_p; then ++ mkdir -p "$ac_dir" ++ else ++ as_dir="$ac_dir" ++ as_dirs= ++ while test ! -d "$as_dir"; do ++ as_dirs="$as_dir $as_dirs" ++ as_dir=`(dirname "$as_dir") 2>/dev/null || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ done ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ { (exit 1); exit 1; }; }; } ++ ++ ac_builddir=. ++ ++if test "$ac_dir" != .; then ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A "../" for each directory in $ac_dir_suffix. ++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` ++else ++ ac_dir_suffix= ac_top_builddir= ++fi ++ ++case $srcdir in ++ .) # No --srcdir option. We are building in place. ++ ac_srcdir=. ++ if test -z "$ac_top_builddir"; then ++ ac_top_srcdir=. ++ else ++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` ++ fi ;; ++ [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ;; ++ *) # Relative path. ++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_builddir$srcdir ;; ++esac ++ ++# Do not use `cd foo && pwd` to compute absolute paths, because ++# the directories may not exist. ++case `pwd` in ++.) ac_abs_builddir="$ac_dir";; ++*) ++ case "$ac_dir" in ++ .) ac_abs_builddir=`pwd`;; ++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ++ *) ac_abs_builddir=`pwd`/"$ac_dir";; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_builddir=${ac_top_builddir}.;; ++*) ++ case ${ac_top_builddir}. in ++ .) ac_abs_top_builddir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_srcdir=$ac_srcdir;; ++*) ++ case $ac_srcdir in ++ .) ac_abs_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_srcdir=$ac_top_srcdir;; ++*) ++ case $ac_top_srcdir in ++ .) ac_abs_top_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ++ esac;; ++esac ++ ++ ++ case $INSTALL in ++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ++ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; ++ esac ++ ++ # 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. */ ++ if test x"$ac_file" = x-; then ++ configure_input= ++ else ++ configure_input="$ac_file. " ++ fi ++ configure_input=$configure_input"Generated from `echo $ac_file_in | ++ sed 's,.*/,,'` by configure." ++ ++ # First look for the input files in the build tree, otherwise in the ++ # src tree. ++ ac_file_inputs=`IFS=: ++ for f in $ac_file_in; do ++ case $f in ++ -) echo $tmp/stdin ;; ++ [\\/$]*) ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ echo "$f";; ++ *) # Relative ++ if test -f "$f"; then ++ # Build tree ++ echo "$f" ++ elif test -f "$srcdir/$f"; then ++ # Source tree ++ echo "$srcdir/$f" ++ else ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ 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 ++ sed "/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/; ++s/:*\${srcdir}:*/:/; ++s/:*@srcdir@:*/:/; ++s/^\([^=]*=[ ]*\):*/\1/; ++s/:*$//; ++s/^[^=]*=[ ]*$//; ++} ++ ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s,@configure_input@,$configure_input,;t t ++s,@srcdir@,$ac_srcdir,;t t ++s,@abs_srcdir@,$ac_abs_srcdir,;t t ++s,@top_srcdir@,$ac_top_srcdir,;t t ++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t ++s,@builddir@,$ac_builddir,;t t ++s,@abs_builddir@,$ac_abs_builddir,;t t ++s,@top_builddir@,$ac_top_builddir,;t t ++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t ++s,@INSTALL@,$ac_INSTALL,;t t ++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out ++ rm -f $tmp/stdin ++ if test x"$ac_file" != x-; then ++ mv $tmp/out $ac_file ++ else ++ cat $tmp/out ++ rm -f $tmp/out ++ fi ++ ++done ++ ++# ++# CONFIG_HEADER section. ++# ++ ++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where ++# NAME is the cpp macro being defined and VALUE is the value it is being given. ++# ++# ac_d sets the value in "#define NAME VALUE" lines. ++ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' ++ac_dB='[ ].*$,\1#\2' ++ac_dC=' ' ++ac_dD=',;t' ++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". ++ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' ++ac_uB='$,\1#\2define\3' ++ac_uC=' ' ++ac_uD=',;t' ++ ++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue ++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". ++ case $ac_file in ++ - | *:- | *:-:* ) # input from stdin ++ cat >$tmp/stdin ++ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; ++ * ) ac_file_in=$ac_file.in ;; ++ esac ++ ++ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ ++ # First look for the input files in the build tree, otherwise in the ++ # src tree. ++ ac_file_inputs=`IFS=: ++ for f in $ac_file_in; do ++ case $f in ++ -) echo $tmp/stdin ;; ++ [\\/$]*) ++ # Absolute (can't be DOS-style, as IFS=:) ++ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ # Do quote $f, to prevent DOS paths from being IFS'd. ++ echo "$f";; ++ *) # Relative ++ if test -f "$f"; then ++ # Build tree ++ echo "$f" ++ elif test -f "$srcdir/$f"; then ++ # Source tree ++ echo "$srcdir/$f" ++ else ++ # /dev/null tree ++ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 ++echo "$as_me: error: cannot find input file: $f" >&2;} ++ { (exit 1); exit 1; }; } ++ fi;; ++ esac ++ done` || { (exit 1); exit 1; } ++ # Remove the trailing spaces. ++ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in ++ ++ # Handle all the #define templates only if necessary. ++ if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then ++ # If there are no defines, we may have an empty if/fi ++ : ++ cat >$tmp/defines.sed <$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++ ++ cat >$tmp/defines.sed <$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++ ++ cat >$tmp/defines.sed <$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++ ++ fi # grep ++ ++ # Handle all the #undef templates ++ cat >$tmp/undefs.sed <$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++ ++ cat >$tmp/undefs.sed <$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++ ++ cat >$tmp/undefs.sed <$tmp/out ++ rm -f $tmp/in ++ mv $tmp/out $tmp/in ++ ++ # 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. */ ++ if test x"$ac_file" = x-; then ++ echo "/* Generated by configure. */" >$tmp/config.h ++ else ++ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h ++ fi ++ cat $tmp/in >>$tmp/config.h ++ rm -f $tmp/in ++ if test x"$ac_file" != x-; then ++ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ ac_dir=`(dirname "$ac_file") 2>/dev/null || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ { if $as_mkdir_p; then ++ mkdir -p "$ac_dir" ++ else ++ as_dir="$ac_dir" ++ as_dirs= ++ while test ! -d "$as_dir"; do ++ as_dirs="$as_dir $as_dirs" ++ as_dir=`(dirname "$as_dir") 2>/dev/null || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ done ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ { (exit 1); exit 1; }; }; } ++ ++ rm -f $ac_file ++ mv $tmp/config.h $ac_file ++ fi ++ else ++ cat $tmp/config.h ++ rm -f $tmp/config.h ++ fi ++done ++ ++# ++# CONFIG_COMMANDS section. ++# ++for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue ++ ac_dest=`echo "$ac_file" | sed 's,:.*,,'` ++ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` ++ ac_dir=`(dirname "$ac_dest") 2>/dev/null || ++$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_dest" : 'X\(//\)[^/]' \| \ ++ X"$ac_dest" : 'X\(//\)$' \| \ ++ X"$ac_dest" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$ac_dest" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ { if $as_mkdir_p; then ++ mkdir -p "$ac_dir" ++ else ++ as_dir="$ac_dir" ++ as_dirs= ++ while test ! -d "$as_dir"; do ++ as_dirs="$as_dir $as_dirs" ++ as_dir=`(dirname "$as_dir") 2>/dev/null || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| \ ++ . : '\(.\)' 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } ++ /^X\(\/\/\)[^/].*/{ s//\1/; q; } ++ /^X\(\/\/\)$/{ s//\1/; q; } ++ /^X\(\/\).*/{ s//\1/; q; } ++ s/.*/./; q'` ++ done ++ test ! -n "$as_dirs" || mkdir $as_dirs ++ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 ++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ++ { (exit 1); exit 1; }; }; } ++ ++ ac_builddir=. ++ ++if test "$ac_dir" != .; then ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A "../" for each directory in $ac_dir_suffix. ++ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` ++else ++ ac_dir_suffix= ac_top_builddir= ++fi ++ ++case $srcdir in ++ .) # No --srcdir option. We are building in place. ++ ac_srcdir=. ++ if test -z "$ac_top_builddir"; then ++ ac_top_srcdir=. ++ else ++ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` ++ fi ;; ++ [\\/]* | ?:[\\/]* ) # Absolute path. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ;; ++ *) # Relative path. ++ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_builddir$srcdir ;; ++esac ++ ++# Do not use `cd foo && pwd` to compute absolute paths, because ++# the directories may not exist. ++case `pwd` in ++.) ac_abs_builddir="$ac_dir";; ++*) ++ case "$ac_dir" in ++ .) ac_abs_builddir=`pwd`;; ++ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; ++ *) ac_abs_builddir=`pwd`/"$ac_dir";; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_builddir=${ac_top_builddir}.;; ++*) ++ case ${ac_top_builddir}. in ++ .) ac_abs_top_builddir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; ++ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_srcdir=$ac_srcdir;; ++*) ++ case $ac_srcdir in ++ .) ac_abs_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; ++ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; ++ esac;; ++esac ++case $ac_abs_builddir in ++.) ac_abs_top_srcdir=$ac_top_srcdir;; ++*) ++ case $ac_top_srcdir in ++ .) ac_abs_top_srcdir=$ac_abs_builddir;; ++ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; ++ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; ++ esac;; ++esac ++ ++ ++ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 ++echo "$as_me: executing $ac_dest commands" >&6;} ++ case $ac_dest in ++ default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;; ++ default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac ;; ++ esac ++done ++ ++{ (exit 0); exit 0; } +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-01-05' ++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 @@ -329,7 +1758,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; -@@ -228,13 +229,14 @@ +@@ -228,14 +229,15 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ @@ -341,10 +1770,12 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ +- | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ - | m32r | m68000 | m68k | m88k | mcore \ ++ | m32r | m32rle | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ + | mips64 | mips64el \ @@ -247,6 +249,7 @@ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ @@ -353,23 +1784,29 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ -@@ -257,7 +260,6 @@ +@@ -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 \ -@@ -305,7 +307,7 @@ +- | 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-* \ ++ | 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-* \ @@ -378,7 +1815,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ -@@ -330,7 +333,6 @@ +@@ -330,11 +333,10 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ @@ -386,7 +1823,22 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ -@@ -378,6 +380,9 @@ +- | 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 ;; @@ -396,7 +1848,28 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub amdahl) basic_machine=580-amdahl os=-sysv -@@ -742,6 +747,10 @@ +@@ -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 ;; @@ -407,7 +1880,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose -@@ -833,6 +842,12 @@ +@@ -833,6 +853,12 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; @@ -420,7 +1893,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub sa29200) basic_machine=a29k-amd os=-udi -@@ -956,6 +971,10 @@ +@@ -956,6 +982,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; @@ -431,13 +1904,24 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub udi29k) basic_machine=a29k-amd os=-udi -@@ -1124,19 +1143,19 @@ +@@ -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* \ -+ | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ +- | -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* \ @@ -454,7 +1938,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) -@@ -1160,6 +1179,9 @@ +@@ -1160,6 +1191,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; @@ -464,7 +1948,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -@@ -1172,6 +1194,9 @@ +@@ -1172,6 +1206,9 @@ -opened*) os=-openedition ;; @@ -474,7 +1958,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub -wince*) os=-wince ;; -@@ -1193,6 +1218,9 @@ +@@ -1193,6 +1230,9 @@ -atheos*) os=-atheos ;; @@ -484,7 +1968,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub -386bsd) os=-bsd ;; -@@ -1215,6 +1243,9 @@ +@@ -1215,6 +1255,9 @@ -sinix*) os=-sysv4 ;; @@ -494,7 +1978,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub -triton*) os=-sysv3 ;; -@@ -1282,9 +1313,9 @@ +@@ -1282,9 +1325,9 @@ arm*-semi) os=-aout ;; @@ -507,7 +1991,7 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub # This must come before the *-dec entry. pdp10-*) os=-tops20 -@@ -1463,9 +1494,15 @@ +@@ -1463,9 +1506,15 @@ -mvs* | -opened*) vendor=ibm ;; @@ -523,9 +2007,9 @@ diff -u libgtop2-2.6.0/config.sub libgtop2-2.6.0-libtoolized/config.sub -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -diff -u libgtop2-2.6.0/configure libgtop2-2.6.0-libtoolized/configure ---- libgtop2-2.6.0/configure 2004-04-07 12:19:43.000000000 +0200 -+++ libgtop2-2.6.0-libtoolized/configure 2004-04-18 16:35:21.000000000 +0200 +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 @@ -2522,13 +4006,863 @@ diff -u libgtop2-2.6.0/configure libgtop2-2.6.0-libtoolized/configure _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub -Subdirectorios comunes: libgtop2-2.6.0/doc y libgtop2-2.6.0-libtoolized/doc -Subdirectorios comunes: libgtop2-2.6.0/examples y libgtop2-2.6.0-libtoolized/examples -Subdirectorios comunes: libgtop2-2.6.0/include y libgtop2-2.6.0-libtoolized/include -Subdirectorios comunes: libgtop2-2.6.0/lib y libgtop2-2.6.0-libtoolized/lib -diff -u libgtop2-2.6.0/ltmain.sh libgtop2-2.6.0-libtoolized/ltmain.sh ---- libgtop2-2.6.0/ltmain.sh 2004-04-06 07:57:07.000000000 +0200 -+++ libgtop2-2.6.0-libtoolized/ltmain.sh 2004-04-18 16:33:48.000000000 +0200 +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" @@ -2589,7 +4923,3293 @@ diff -u libgtop2-2.6.0/ltmain.sh libgtop2-2.6.0-libtoolized/ltmain.sh *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 -Subdirectorios comunes: libgtop2-2.6.0/misc y libgtop2-2.6.0-libtoolized/misc -Subdirectorios comunes: libgtop2-2.6.0/po y libgtop2-2.6.0-libtoolized/po -Subdirectorios comunes: libgtop2-2.6.0/src y libgtop2-2.6.0-libtoolized/src -Subdirectorios comunes: libgtop2-2.6.0/sysdeps y libgtop2-2.6.0-libtoolized/sysdeps +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.