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

Simplify build rules, based on patch from Mike Frysinger and Gentoo.

Browse Source
This commit is contained in:
Petter Reinholdtsen 2009-11-20 22:55:47 +00:00
parent d56e3c239e
commit b80d3844c1
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/Changelog
View File

@ -6,6 +6,7 @@ sysvinit (2.88dsf) UNRELEASED; urgency=low
from Bill Nottingham. from Bill Nottingham.
* Adjust makefile to make sure the install directories are created * Adjust makefile to make sure the install directories are created
before files are copied into them. before files are copied into them.
* Simplify build rules, based on patch from Mike Frysinger and Gentoo.
* Fix minor bug in optimizing of argument parsing. Based on * Fix minor bug in optimizing of argument parsing. Based on
report from jakemus on freshmeat. report from jakemus on freshmeat.
* Add casts to get rid of compiler warning about signed/unsigned issues. * Add casts to get rid of compiler warning about signed/unsigned issues.

45
src/Makefile
View File

@ -8,9 +8,8 @@
# Version: @(#)Makefile 2.85-13 23-Mar-2004 miquels@cistron.nl # Version: @(#)Makefile 2.85-13 23-Mar-2004 miquels@cistron.nl
# #
CC = gcc CFLAGS ?= -ansi -O2 -fomit-frame-pointer
CFLAGS = -ansi -W -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE CFLAGS += -W -Wall -D_GNU_SOURCE
LDFLAGS = -s
STATIC = STATIC =
# For some known distributions we do not build all programs, otherwise we do. # For some known distributions we do not build all programs, otherwise we do.
@ -49,6 +48,7 @@ BIN_COMBO = $(BIN_OWNER):$(BIN_GROUP)
STRIP = strip -s -R .comment STRIP = strip -s -R .comment
INSTALL_EXEC = install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755 INSTALL_EXEC = install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 755
INSTALL_DATA = install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 644 INSTALL_DATA = install -o $(BIN_OWNER) -g $(BIN_GROUP) -m 644
INSTALL_DIR = install -m 755 -d
MANDIR = /usr/share/man MANDIR = /usr/share/man
ifeq ($(WITH_SELINUX),yes) ifeq ($(WITH_SELINUX),yes)
@ -70,50 +70,47 @@ endif
all: $(BIN) $(SBIN) $(USRBIN) all: $(BIN) $(SBIN) $(USRBIN)
#%: %.o
# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
#%.o: %.c
# $(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@
init: LDLIBS += $(INIT_SELIBS) $(STATIC)
init: init.o init_utmp.o init: init.o init_utmp.o
$(CC) $(LDFLAGS) $(STATIC) -o $@ init.o init_utmp.o $(INIT_SELIBS)
halt: halt.o ifdown.o hddown.o utmp.o reboot.h halt: halt.o ifdown.o hddown.o utmp.o reboot.h
$(CC) $(LDFLAGS) -o $@ halt.o ifdown.o hddown.o utmp.o
last: last.o oldutmp.h last: last.o oldutmp.h
$(CC) $(LDFLAGS) -o $@ last.o
mesg: mesg.o mesg: mesg.o
$(CC) $(LDFLAGS) -o $@ mesg.o
mountpoint: mountpoint.o mountpoint: mountpoint.o
$(CC) $(LDFLAGS) -o $@ mountpoint.o
utmpdump: utmpdump.o utmpdump: utmpdump.o
$(CC) $(LDFLAGS) -o $@ utmpdump.o
runlevel: runlevel.o runlevel: runlevel.o
$(CC) $(LDFLAGS) -o $@ runlevel.o
sulogin: LDLIBS += $(LCRYPT) $(SULOGIN_SELIBS) $(STATIC)
sulogin: sulogin.o sulogin: sulogin.o
$(CC) $(LDFLAGS) $(STATIC) $(SELINUX_DEF) -o $@ $^ $(LCRYPT) $(SULOGIN_SELIBS)
wall: dowall.o wall.o wall: dowall.o wall.o
$(CC) $(LDFLAGS) -o $@ dowall.o wall.o
shutdown: dowall.o shutdown.o utmp.o reboot.h shutdown: dowall.o shutdown.o utmp.o reboot.h
$(CC) $(LDFLAGS) -o $@ dowall.o shutdown.o utmp.o
bootlogd: LDLIBS += -lutil
bootlogd: bootlogd.o bootlogd: bootlogd.o
$(CC) $(LDFLAGS) -o $@ bootlogd.o -lutil
sulogin.o: CPPFLAGS += $(SELINUX_DEF)
sulogin.o: sulogin.c sulogin.o: sulogin.c
$(CC) -c $(CFLAGS) $(SELINUX_DEF) sulogin.c
init.o: CPPFLAGS += $(SELINUX_DEF)
init.o: init.c init.h set.h reboot.h initreq.h init.o: init.c init.h set.h reboot.h initreq.h
$(CC) -c $(CFLAGS) $(SELINUX_DEF) init.c
utmp.o: utmp.c init.h utmp.o: utmp.c init.h
$(CC) -c $(CFLAGS) utmp.c
init_utmp.o: CPPFLAGS += -DINIT_MAIN
init_utmp.o: utmp.c init.h init_utmp.o: utmp.c init.h
$(CC) -c $(CFLAGS) -DINIT_MAIN utmp.c -o init_utmp.o $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
cleanobjs: cleanobjs:
rm -f *.o *.bak rm -f *.o *.bak
@ -127,8 +124,8 @@ clobber: cleanobjs
distclean: clobber distclean: clobber
install: install:
$(INSTALL_EXEC) -d $(ROOT)/bin/ $(ROOT)/sbin/ $(INSTALL_DIR) $(ROOT)/bin/ $(ROOT)/sbin/
$(INSTALL_EXEC) -d $(ROOT)/usr/bin/ $(INSTALL_DIR) $(ROOT)/usr/bin/
for i in $(BIN); do \ for i in $(BIN); do \
$(STRIP) $$i ; \ $(STRIP) $$i ; \
$(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \ $(INSTALL_EXEC) $$i $(ROOT)/bin/ ; \
@ -149,11 +146,11 @@ install:
if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
ln -sf last $(ROOT)/usr/bin/lastb; \ ln -sf last $(ROOT)/usr/bin/lastb; \
fi fi
$(INSTALL_EXEC) -d $(ROOT)/usr/include/ $(INSTALL_DIR) $(ROOT)/usr/include/
$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man1/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man5/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man5/
$(INSTALL_EXEC) -d $(ROOT)$(MANDIR)/man8/ $(INSTALL_DIR) $(ROOT)$(MANDIR)/man8/
for i in $(MAN1); do \ for i in $(MAN1); do \
$(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \ $(INSTALL_DATA) ../man/$$i $(ROOT)$(MANDIR)/man1/; \
done done