diff options
| author | Roy Marples <roy@marples.name> | 2007-09-11 21:45:26 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2007-09-11 21:45:26 +0000 |
| commit | 607f2b37b118d83d63990f8b37da63e3ca0bcd08 (patch) | |
| tree | 89661a98f62d6a3dc3f84b2b9b4ad20d38b8c620 /src | |
| parent | bc6b031f2e4bfe7a424f1dae241e4eb77b0992f8 (diff) | |
Work better with --as-needed
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 22 | ||||
| -rw-r--r-- | src/Makefile.Linux | 3 | ||||
| -rw-r--r-- | src/Makefile.pam | 2 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/Makefile b/src/Makefile index 7e83c511..b2ede0db 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,6 +14,7 @@ CC ?= gcc CFLAGS += -O2 -pipe +LDFLAGS += -L. # 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; \ @@ -44,13 +45,6 @@ LIB = lib # Set PAM = pam for pam support 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 LIBEINFOSO = libeinfo.so.$(LIBRCSOVER) LIBEINFOOBJS= libeinfo.o @@ -58,11 +52,12 @@ LIBEINFOOBJS= libeinfo.o LIBRCSOVER = 0 LIBRCSO = librc.so.$(LIBRCSOVER) 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 \ rc-depend.o rc-plugin.o rc-status.o rc-update.o runscript.o \ start-stop-daemon.o rc.o +LDLIBS_RC = $(LDLIBS_LIBRC) -lrc LIB_TARGETS = $(LIBEINFOSO) $(LIBRCSO) 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) 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) $(LIBEINFOOBJS): @@ -109,13 +111,13 @@ $(LIBEINFOSO): $(LIBEINFOOBJS) $(LIBRCOBJS): $(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -c $< $(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 $(RCOBJS): $(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $< rc: $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS) - $(CC) $(LDFLAGS) -o rc $(RCOBJS) $(LIBRCSO) $(LIBEINFOSO) $(LDLIBS_SSD) $(LDLIBS_RC) + $(CC) $(LDFLAGS) -o rc $(RCOBJS) $(LDLIBS_RC) links: rc for x in $(BINLINKS) $(SBINLINKS) $(RCLINKS) $(RCPRIVLINKS); do ln -sf rc $$x; done diff --git a/src/Makefile.Linux b/src/Makefile.Linux index 691e8964..ca852f15 100644 --- a/src/Makefile.Linux +++ b/src/Makefile.Linux @@ -1,3 +1,2 @@ -LDLIBS_RC = -ldl -LDLIBS_RS = -ldl +LDLIBS_RC += -ldl CPPFLAGS += -D_GNU_SOURCE diff --git a/src/Makefile.pam b/src/Makefile.pam index b4ba0194..5f8ff569 100644 --- a/src/Makefile.pam +++ b/src/Makefile.pam @@ -1,2 +1,2 @@ CPPFLAGS_SSD = -DHAVE_PAM -LDLIBS_SSD = -lpam +LDLIBS_RC += -lpam |