emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More static building fixes.

Browse Source
This commit is contained in:
Roy Marples 2008-01-04 14:46:45 +00:00
parent 633297a6ca
commit aa1129a71d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -80,8 +80,6 @@ BINLINKS = rc-status
SBINLINKS = rc-update runscript start-stop-daemon SBINLINKS = rc-update runscript start-stop-daemon
ALL_LINKS = $(BINLINKS) $(SBINLINKS) $(RC_BINLINKS) $(RC_SBINLINKS) ALL_LINKS = $(BINLINKS) $(SBINLINKS) $(RC_BINLINKS) $(RC_SBINLINKS)
# We also define _BSD_SOURCE so both Linux and the BSDs get a few
# handy functions which makes our lives a lot easier
CPPFLAGS += -DLIB=\"$(LIB)\" CPPFLAGS += -DLIB=\"$(LIB)\"
# IMPORTANT!!! # IMPORTANT!!!
@ -89,12 +87,12 @@ CPPFLAGS += -DLIB=\"$(LIB)\"
# issues. However, this does ease development a little # issues. However, this does ease development a little
LDFLAGS += -Wl,-rpath . LDFLAGS += -Wl,-rpath .
# Load an optional OS Makefile # Load an optional Makefiles - the order is important
TOPDIR = .. TOPDIR = ..
include $(TOPDIR)/default.mk include $(TOPDIR)/default.mk
include Makefile.$(OS)
include Makefile.$(TERMCAP) include Makefile.$(TERMCAP)
include Makefile.$(PAM) include Makefile.$(PAM)
include Makefile.$(OS)
all: .depend $(TARGET) all: .depend $(TARGET)
@ -130,7 +128,7 @@ $(RCOBJS):
$(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $< $(CC) $(CPPFLAGS) $(CPPFLAGS_SSD) $(CFLAGS) -c $<
rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS) rc: version.h $(LIBEINFOSO) $(LIBRCSO) $(RCOBJS)
$(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc \ $(CC) $(LDFLAGS) $(BIN_LDFLAGS) -o rc \
$(RCOBJS) $(LDLIBS_LIBEINFO) $(LDLIBS_LIBRC) $(LDLIBS_RC) $(RCOBJS) $(LDLIBS_LIBRC) $(LDLIBS_RC)
$(ALL_LINKS): rc $(ALL_LINKS): rc
ln -sf rc $@ ln -sf rc $@

1
src/Makefile.ncurses
View File

@ -1,3 +1,4 @@
LIBTERMCAP ?= -lncurses LIBTERMCAP ?= -lncurses
CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP CPPFLAGS_LIBEINFO = -DHAVE_TERMCAP
LDLIBS_LIBEINFO += $(LIBTERMCAP) LDLIBS_LIBEINFO += $(LIBTERMCAP)
LDLIBS_RC += $(LIBTERMCAP)