Work better with --as-needed

This commit is contained in:
Roy Marples 2007-09-11 21:45:26 +00:00
parent bc6b031f2e
commit 607f2b37b1
3 changed files with 14 additions and 13 deletions

View File

@ -14,6 +14,7 @@
CC ?= gcc CC ?= gcc
CFLAGS += -O2 -pipe CFLAGS += -O2 -pipe
LDFLAGS += -L.
# GNU Make way of detecting gcc flags we can use # GNU Make way of detecting gcc flags we can use
check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
@ -44,13 +45,6 @@ LIB = lib
# Set PAM = pam for pam support # Set PAM = pam for pam support
PAM = PAM =
# Load an optional OS Makefile
_OS_SH = u=`uname -s`; case "$${u}" in *BSD|DragonFly) echo "BSD";; *) echo "$${u}";; esac
_OS != $(_OS_SH)
OS ?= $(_OS)$(shell $(_OS_SH))
-include Makefile.$(OS)
-include Makefile.$(PAM)
LIBEINFOSOVER = 0 LIBEINFOSOVER = 0
LIBEINFOSO = libeinfo.so.$(LIBRCSOVER) LIBEINFOSO = libeinfo.so.$(LIBRCSOVER)
LIBEINFOOBJS= libeinfo.o LIBEINFOOBJS= libeinfo.o
@ -58,11 +52,12 @@ LIBEINFOOBJS= libeinfo.o
LIBRCSOVER = 0 LIBRCSOVER = 0
LIBRCSO = librc.so.$(LIBRCSOVER) LIBRCSO = librc.so.$(LIBRCSOVER)
LIBRCOBJS = librc.o librc-depend.o librc-daemon.o librc-misc.o librc-strlist.o LIBRCOBJS = librc.o librc-depend.o librc-daemon.o librc-misc.o librc-strlist.o
LDLIBS_LIBRC = $(LIBEINFOSO) LDLIBS_LIBRC = -leinfo
RCOBJS = env-update.o fstabinfo.o mountinfo.o \ RCOBJS = env-update.o fstabinfo.o mountinfo.o \
rc-depend.o rc-plugin.o rc-status.o rc-update.o runscript.o \ rc-depend.o rc-plugin.o rc-status.o rc-update.o runscript.o \
start-stop-daemon.o rc.o start-stop-daemon.o rc.o
LDLIBS_RC = $(LDLIBS_LIBRC) -lrc
LIB_TARGETS = $(LIBEINFOSO) $(LIBRCSO) LIB_TARGETS = $(LIBEINFOSO) $(LIBRCSO)
SBIN_TARGETS = rc SBIN_TARGETS = rc
@ -98,6 +93,13 @@ _SVN_LDFLAGS_SH = if test -d .svn; then echo "-Wl,-rpath ."; else echo ""; fi
_SVN_LDFLAGS != $(_SVN_LDFLAGS_SH) _SVN_LDFLAGS != $(_SVN_LDFLAGS_SH)
LDFLAGS += $(_SVN_LDFLAGS)$(shell $(_SVN_LDFLAGS_SH)) LDFLAGS += $(_SVN_LDFLAGS)$(shell $(_SVN_LDFLAGS_SH))
# Load an optional OS Makefile
_OS_SH = u=`uname -s`; case "$${u}" in *BSD|DragonFly) echo "BSD";; *) echo "$${u}";; esac
_OS != $(_OS_SH)
OS ?= $(_OS)$(shell $(_OS_SH))
-include Makefile.$(OS)
-include Makefile.$(PAM)
all: .depend $(TARGET) all: .depend $(TARGET)
$(LIBEINFOOBJS): $(LIBEINFOOBJS):
@ -109,13 +111,13 @@ $(LIBEINFOSO): $(LIBEINFOOBJS)
$(LIBRCOBJS): $(LIBRCOBJS):
$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $<
$(LIBRCSO): $(LIBRCOBJS) $(LIBEINFOSO) $(LIBRCSO): $(LIBRCOBJS) $(LIBEINFOSO)
$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(LIBRCSO) -o $(LIBRCSO) $(LDLIBS_LIBRC) $(LIBRCOBJS) $(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(LIBRCSO) -o $(LIBRCSO) $(LIBRCOBJS) $(LDLIBS_LIBRC)
ln -sf $(LIBRCSO) librc.so ln -sf $(LIBRCSO) librc.so
$(RCOBJS): $(RCOBJS):
$(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $< $(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $<
rc: $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS) rc: $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS)
$(CC) $(LDFLAGS) -o rc $(RCOBJS) $(LIBRCSO) $(LIBEINFOSO) $(LDLIBS_SSD) $(LDLIBS_RC) $(CC) $(LDFLAGS) -o rc $(RCOBJS) $(LDLIBS_RC)
links: rc links: rc
for x in $(BINLINKS) $(SBINLINKS) $(RCLINKS) $(RCPRIVLINKS); do ln -sf rc $$x; done for x in $(BINLINKS) $(SBINLINKS) $(RCLINKS) $(RCPRIVLINKS); do ln -sf rc $$x; done

View File

@ -1,3 +1,2 @@
LDLIBS_RC = -ldl LDLIBS_RC += -ldl
LDLIBS_RS = -ldl
CPPFLAGS += -D_GNU_SOURCE CPPFLAGS += -D_GNU_SOURCE

View File

@ -1,2 +1,2 @@
CPPFLAGS_SSD = -DHAVE_PAM CPPFLAGS_SSD = -DHAVE_PAM
LDLIBS_SSD = -lpam LDLIBS_RC += -lpam