perl -i -p -e s/linux-gnu/linux/g *

This commit is contained in:
albert 2002-05-29 05:43:24 +00:00
parent 33460c2b3c
commit ed7e78d7c2
8 changed files with 7379 additions and 2034 deletions

View File

@ -1,4 +1,4 @@
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@ -62,15 +62,17 @@ host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
LD = @LD@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
NCURSES_LIB = @NCURSES_LIB@
NM = @NM@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
SUBDIRS = proc ps
@ -111,6 +113,10 @@ EXTRA_DIST = man_MANS
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
bin_PROGRAMS = uptime$(EXEEXT) tload$(EXEEXT) free$(EXEEXT) w$(EXEEXT) \
top$(EXEEXT) vmstat$(EXEEXT) watch$(EXEEXT) pgrep$(EXEEXT)
myexecbin_PROGRAMS = kill$(EXEEXT)
sbin_PROGRAMS = sysctl$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(myexecbin_PROGRAMS) $(sbin_PROGRAMS)
@ -118,42 +124,42 @@ DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
uptime_OBJECTS = uptime.o
uptime_OBJECTS = uptime.$(OBJEXT)
uptime_LDADD = $(LDADD)
uptime_DEPENDENCIES = proc/libproc.la
uptime_LDFLAGS =
tload_OBJECTS = tload.o
tload_OBJECTS = tload.$(OBJEXT)
tload_LDADD = $(LDADD)
tload_DEPENDENCIES = proc/libproc.la
tload_LDFLAGS =
free_OBJECTS = free.o
free_OBJECTS = free.$(OBJEXT)
free_LDADD = $(LDADD)
free_DEPENDENCIES = proc/libproc.la
free_LDFLAGS =
w_OBJECTS = w.o
w_OBJECTS = w.$(OBJEXT)
w_LDADD = $(LDADD)
w_DEPENDENCIES = proc/libproc.la
w_LDFLAGS =
top_OBJECTS = top.o
top_OBJECTS = top.$(OBJEXT)
top_DEPENDENCIES = proc/libproc.la
top_LDFLAGS =
vmstat_OBJECTS = vmstat.o
vmstat_OBJECTS = vmstat.$(OBJEXT)
vmstat_LDADD = $(LDADD)
vmstat_DEPENDENCIES = proc/libproc.la
vmstat_LDFLAGS =
watch_OBJECTS = watch.o
watch_OBJECTS = watch.$(OBJEXT)
watch_DEPENDENCIES =
watch_LDFLAGS =
pgrep_OBJECTS = pgrep.o
pgrep_OBJECTS = pgrep.$(OBJEXT)
pgrep_LDADD = $(LDADD)
pgrep_DEPENDENCIES = proc/libproc.la
pgrep_LDFLAGS =
kill_OBJECTS = skill.o
kill_OBJECTS = skill.$(OBJEXT)
kill_LDADD = $(LDADD)
kill_DEPENDENCIES = proc/libproc.la
kill_LDFLAGS =
sysctl_SOURCES = sysctl.c
sysctl_OBJECTS = sysctl.o
sysctl_OBJECTS = sysctl.$(OBJEXT)
sysctl_LDADD = $(LDADD)
sysctl_DEPENDENCIES = proc/libproc.la
sysctl_LDFLAGS =
@ -180,15 +186,15 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
DEP_FILES = .deps/free.P .deps/pgrep.P .deps/skill.P \
.deps/sysctl.P .deps/tload.P .deps/top.P .deps/uptime.P .deps/vmstat.P \
.deps/w.P .deps/watch.P
DEP_FILES = .deps/free.P .deps/pgrep.P .deps/skill.P .deps/sysctl.P \
.deps/tload.P .deps/top.P .deps/uptime.P .deps/vmstat.P .deps/w.P \
.deps/watch.P
SOURCES = $(uptime_SOURCES) $(tload_SOURCES) $(free_SOURCES) $(w_SOURCES) $(top_SOURCES) $(vmstat_SOURCES) $(watch_SOURCES) $(pgrep_SOURCES) $(kill_SOURCES) sysctl.c
OBJECTS = $(uptime_OBJECTS) $(tload_OBJECTS) $(free_OBJECTS) $(w_OBJECTS) $(top_OBJECTS) $(vmstat_OBJECTS) $(watch_OBJECTS) $(pgrep_OBJECTS) $(kill_OBJECTS) sysctl.o
OBJECTS = $(uptime_OBJECTS) $(tload_OBJECTS) $(free_OBJECTS) $(w_OBJECTS) $(top_OBJECTS) $(vmstat_OBJECTS) $(watch_OBJECTS) $(pgrep_OBJECTS) $(kill_OBJECTS) sysctl.$(OBJEXT)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
@ -199,7 +205,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
$(ACLOCAL_M4): configure.in
cd $(srcdir) && $(ACLOCAL)
config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
@ -279,6 +285,11 @@ uninstall-sbinPROGRAMS:
rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.
.c.obj:
$(COMPILE) -c `cygpath -w $<`
.s.o:
$(COMPILE) -c $<
@ -287,6 +298,7 @@ uninstall-sbinPROGRAMS:
mostlyclean-compile:
-rm -f *.o core *.core
-rm -f *.$(OBJEXT)
clean-compile:
@ -311,45 +323,44 @@ distclean-libtool:
maintainer-clean-libtool:
uptime: $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
@rm -f uptime
uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES)
@rm -f uptime$(EXEEXT)
$(LINK) $(uptime_LDFLAGS) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
tload: $(tload_OBJECTS) $(tload_DEPENDENCIES)
@rm -f tload
tload$(EXEEXT): $(tload_OBJECTS) $(tload_DEPENDENCIES)
@rm -f tload$(EXEEXT)
$(LINK) $(tload_LDFLAGS) $(tload_OBJECTS) $(tload_LDADD) $(LIBS)
free: $(free_OBJECTS) $(free_DEPENDENCIES)
@rm -f free
free$(EXEEXT): $(free_OBJECTS) $(free_DEPENDENCIES)
@rm -f free$(EXEEXT)
$(LINK) $(free_LDFLAGS) $(free_OBJECTS) $(free_LDADD) $(LIBS)
w: $(w_OBJECTS) $(w_DEPENDENCIES)
@rm -f w
w$(EXEEXT): $(w_OBJECTS) $(w_DEPENDENCIES)
@rm -f w$(EXEEXT)
$(LINK) $(w_LDFLAGS) $(w_OBJECTS) $(w_LDADD) $(LIBS)
top: $(top_OBJECTS) $(top_DEPENDENCIES)
@rm -f top
top$(EXEEXT): $(top_OBJECTS) $(top_DEPENDENCIES)
@rm -f top$(EXEEXT)
$(LINK) $(top_LDFLAGS) $(top_OBJECTS) $(top_LDADD) $(LIBS)
vmstat: $(vmstat_OBJECTS) $(vmstat_DEPENDENCIES)
@rm -f vmstat
vmstat$(EXEEXT): $(vmstat_OBJECTS) $(vmstat_DEPENDENCIES)
@rm -f vmstat$(EXEEXT)
$(LINK) $(vmstat_LDFLAGS) $(vmstat_OBJECTS) $(vmstat_LDADD) $(LIBS)
watch: $(watch_OBJECTS) $(watch_DEPENDENCIES)
@rm -f watch
watch$(EXEEXT): $(watch_OBJECTS) $(watch_DEPENDENCIES)
@rm -f watch$(EXEEXT)
$(LINK) $(watch_LDFLAGS) $(watch_OBJECTS) $(watch_LDADD) $(LIBS)
pgrep: $(pgrep_OBJECTS) $(pgrep_DEPENDENCIES)
@rm -f pgrep
pgrep$(EXEEXT): $(pgrep_OBJECTS) $(pgrep_DEPENDENCIES)
@rm -f pgrep$(EXEEXT)
$(LINK) $(pgrep_LDFLAGS) $(pgrep_OBJECTS) $(pgrep_LDADD) $(LIBS)
kill: $(kill_OBJECTS) $(kill_DEPENDENCIES)
@rm -f kill
kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES)
@rm -f kill$(EXEEXT)
$(LINK) $(kill_LDFLAGS) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
sysctl: $(sysctl_OBJECTS) $(sysctl_DEPENDENCIES)
@rm -f sysctl
sysctl$(EXEEXT): $(sysctl_OBJECTS) $(sysctl_DEPENDENCIES)
@rm -f sysctl$(EXEEXT)
$(LINK) $(sysctl_LDFLAGS) $(sysctl_OBJECTS) $(sysctl_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)

3342
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

38
config.guess vendored
View File

@ -757,13 +757,13 @@ EOF
echo ${UNAME_MACHINE}-pc-minix
exit 0 ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
mips:Linux:*:*)
eval $set_cc_for_build
@ -783,13 +783,13 @@ EOF
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
rm -f $dummy.c
test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
test x"${CPU}" != x && echo "${CPU}-pc-linux" && exit 0
;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
echo powerpc-unknown-linux
exit 0 ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
echo powerpc64-unknown-linux
exit 0 ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@ -803,30 +803,30 @@ EOF
esac
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
echo ${UNAME_MACHINE}-unknown-linux${LIBC}
exit 0 ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
PA7*) echo hppa1.1-unknown-linux-gnu ;;
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
PA7*) echo hppa1.1-unknown-linux ;;
PA8*) echo hppa2.0-unknown-linux ;;
*) echo hppa-unknown-linux ;;
esac
exit 0 ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
echo hppa64-unknown-linux
exit 0 ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
echo x86_64-unknown-linux
exit 0 ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@ -841,18 +841,18 @@ EOF
p'`
case "$ld_supported_targets" in
elf32-i386)
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
TENTATIVE="${UNAME_MACHINE}-pc-linux"
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
echo "${UNAME_MACHINE}-pc-linuxaout"
exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
echo "${UNAME_MACHINE}-pc-linuxcoff"
exit 0 ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# Either a pre-BFD a.out linker (linuxoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
echo "${UNAME_MACHINE}-pc-linuxoldld"
exit 0 ;;
esac
# Determine whether the default compiler is a.out or elf

8
config.sub vendored
View File

@ -118,7 +118,7 @@ esac
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
nto-qnx* | linux* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@ -1066,7 +1066,7 @@ case $os in
os=-sysv4.2uw
;;
-gnu/linux*)
os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
os=`echo $os | sed -e 's|gnu/linux|linux|'`
;;
# First accept the basic system types.
# The portable systems comes first.
@ -1085,7 +1085,7 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@ -1113,7 +1113,7 @@ case $os in
os=`echo $os | sed -e 's|mac|macos|'`
;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
os=`echo $os | sed -e 's|linux|linux|'`
;;
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`

5866
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -12,37 +12,37 @@ AM_PROG_LIBTOOL
dnl Checks for libraries.
dnl Replace `main' with a function in -lc:
AC_CHECK_LIB(c, main)
#AC_CHECK_LIB(c, main)
dnl Replace `main' with a function in -lefence:
AC_CHECK_LIB(efence, main)
#AC_CHECK_LIB(efence, main)
dnl Replace `main' with a function in -lproc:
#AC_CHECK_LIB(proc, main)
dnl Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h)
#AC_HEADER_DIRENT
#AC_HEADER_STDC
#AC_HEADER_SYS_WAIT
#AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h sys/time.h unistd.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_UID_T
AC_C_INLINE
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_STRUCT_ST_RDEV
AC_HEADER_TIME
AC_STRUCT_TM
#AC_C_CONST
#AC_TYPE_UID_T
#AC_C_INLINE
#AC_TYPE_PID_T
#AC_TYPE_SIZE_T
#AC_STRUCT_ST_RDEV
#AC_HEADER_TIME
#AC_STRUCT_TM
dnl Checks for library functions.
AC_FUNC_GETPGRP
AC_PROG_GCC_TRADITIONAL
AC_HEADER_MAJOR
AC_FUNC_MMAP
AC_TYPE_SIGNAL
AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
AC_CHECK_FUNCS(gettimeofday regcomp select strcspn strdup strerror strspn strstr strtod strtol strtoul uname)
#AC_FUNC_GETPGRP
#AC_PROG_GCC_TRADITIONAL
#AC_HEADER_MAJOR
#AC_FUNC_MMAP
#AC_TYPE_SIGNAL
#AC_FUNC_STRFTIME
#AC_FUNC_VPRINTF
#AC_CHECK_FUNCS(gettimeofday regcomp select strcspn strdup strerror strspn strstr strtod strtol strtoul uname)
AC_SUBST(NCURSES_LIB)
AC_CHECK_LIB(ncurses, initscr,NCURSES_LIB="-lncurses",AC_MSG_ERROR(Need ncurses to compile this program))

View File

@ -447,9 +447,9 @@ else
host_alias=$host
fi
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
# Transform linux* to *-*-linux*, to support old configure scripts.
case "$host_os" in
linux-gnu*) ;;
linux*) ;;
linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
esac
@ -1910,12 +1910,12 @@ irix5* | irix6*)
;;
# No shared lib support for Linux oldld, aout, or coff.
linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
linuxoldld* | linuxaout* | linuxcoff*)
dynamic_linker=no
;;
# This must be Linux ELF.
linux-gnu*)
linux*)
version_type=linux
need_lib_prefix=no
need_version=no

View File

@ -62,15 +62,17 @@ host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
LD = @LD@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
NCURSES_LIB = @NCURSES_LIB@
NM = @NM@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
lib_LTLIBRARIES = libproc.la
@ -84,7 +86,7 @@ CONFIG_CLEAN_FILES =
LTLIBRARIES = $(lib_LTLIBRARIES)
DEFS = @DEFS@ -I$(top_srcdir) -I$(srcdir)
DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@ -112,7 +114,7 @@ OBJECTS = $(libproc_la_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
.SUFFIXES: .S .c .lo .o .obj .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu proc/Makefile
@ -146,6 +148,11 @@ uninstall-libLTLIBRARIES:
$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
# FIXME: We should only use cygpath when building on Windows,
# and only if it is available.
.c.obj:
$(COMPILE) -c `cygpath -w $<`
.s.o:
$(COMPILE) -c $<
@ -154,6 +161,7 @@ uninstall-libLTLIBRARIES:
mostlyclean-compile:
-rm -f *.o core *.core
-rm -f *.$(OBJEXT)
clean-compile: