utilize SELECT_UNAME_ETC_LIB

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10283 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
shatty 2004-11-29 00:19:29 +00:00
parent a104c31b99
commit 2506bbb6f3
5 changed files with 13 additions and 6 deletions

View File

@ -110,8 +110,10 @@ switch $(TARGET_PLATFORM)
}
if $(BONE_COMPATIBLE) {
NETWORK_LIBS = libsocket.so libbind.so ;
SELECT_UNAME_ETC_LIB = libroot.so ;
} else {
NETWORK_LIBS = libnet.so ;
SELECT_UNAME_ETC_LIB = libnet.so ;
}
# Determine if we're building on PPC or x86

View File

@ -63,7 +63,7 @@ BinCommand sh :
list.c stringlib.c locale.c findcmd.c redir.c
pcomplete.c pcomplib.c syntax.c xmalloc.c test.c sig.c
: libreadline.a <bash>libglob.a libbuiltins.a libtilde.a libsh.a
libtermcap.a
libtermcap.a $(SELECT_UNAME_ETC_LIB)
: bash.rdef ;
# trap.c includes signames.h

View File

@ -30,7 +30,6 @@ StdBinCommands
fmt.c
fold.c
head.c
hostname.c
id.c
join.c
kill.c
@ -61,7 +60,6 @@ StdBinCommands
sum.c
sync.c
tac.c
tail.c
tee.c
test.c
touch.c
@ -69,7 +67,6 @@ StdBinCommands
true.c
tsort.c
tty.c
uname.c
unexpand.c
uniq.c
unlink.c
@ -78,6 +75,14 @@ StdBinCommands
yes.c
: libfetish.a : $(coreutils_rsrc) ;
# commands requiring select, uname, etc.
StdBinCommands
hostname.c
tail.c
uname.c
: libfetish.a $(SELECT_UNAME_ETC_LIB) : $(coreutils_rsrc) ;
# stat.c
# chroot.c
# df.c

View File

@ -9,7 +9,7 @@ ResComp $(sharutils_rsrc) : [ FGristFiles sharutils.rdef ] ;
BinCommand shar :
shar.c encode.c
: libsharutils.a
: libsharutils.a $(SELECT_UNAME_ETC_LIB)
: sharutils.rsrc ;
BinCommand unshar :

View File

@ -56,7 +56,7 @@ BinCommand vim :
os_beos.c
version.c
pathdef.c
: be libtermcap.a $(NETWORK_LIBS)
: be libtermcap.a $(SELECT_UNAME_ETC_LIB)
: vim.rdef ;
SEARCH on [ FGristFiles pathdef.c ] = [ FDirName $(SUBDIR) auto ] ;