Style updates.

This commit is contained in:
Roy Marples
2008-01-09 11:44:43 +00:00
parent 666be0faa0
commit 06634f6309
9 changed files with 64 additions and 62 deletions

View File

@@ -3,18 +3,17 @@ SRCS= checkpath.c fstabinfo.c mountinfo.c rc.c rc-depend.c \
rc-logger.c rc-misc.c rc-plugin.c rc-status.c rc-update.c \
runscript.c start-stop-daemon.c
SCRIPTS= version.h
CLEANFILES= version.h
TOPDIR= ..
LDFLAGS+= -L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo
LDFLAGS+= -L${TOPDIR}/librc -L${TOPDIR}/libeinfo
LDADD+= -lutil -lrc -leinfo
CFLAGS+= -I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo
CFLAGS+= -I${TOPDIR} -I${TOPDIR}/librc -I${TOPDIR}/libeinfo
BINDIR?= /sbin
LINKDIR= $(LIBNAME)/$(PROG)
LINKDIR= ${LIBNAME}/${PROG}
BINLINKS= rc-status
SBINLINKS= rc-update runscript start-stop-daemon
RC_BINLINKS= einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
@@ -33,15 +32,16 @@ RC_SBINLINKS= mark_service_starting mark_service_started \
mark_service_coldplugged mark_service_failed \
rc-abort
include $(TOPDIR)/os.mk
CFLAGS+= -DLIB=\"$(LIBNAME)\"
include $(TOPDIR)/cc.mk
include $(TOPDIR)/prog.mk
include ${TOPDIR}/os.mk
CFLAGS+= -DLIB=\"${LIBNAME}\"
include ${TOPDIR}/cc.mk
include ${TOPDIR}/prog.mk
include $(TOPDIR)/$(TERMCAP).mk
include ${TOPDIR}/${TERMCAP}.mk
LDADD+= ${LIBDL} ${LIBKVM}
include $(TOPDIR)/$(PAM).mk
include ${TOPDIR}/${PAM}.mk
${SRCS}: version.h
version.h:
sed -n -e 's/^VERSION =[[:space:]]*\([^[:space:]]*\).*/#define VERSION "\1\"/p' ../../Makefile > version.h
if test -n "${BRANDING}"; then \
@@ -52,14 +52,14 @@ install: all
${INSTALL} -d ${DESTDIR}${BINDIR}
${INSTALL} ${PROG} ${DESTDIR}${BINDIR}
${INSTALL} -d ${DESTDIR}/bin
for x in $(BINLINKS); do ln -fs ${BINDIR}/${PROG} $(DESTDIR)/bin/$$x; done
for x in ${BINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}/bin/$$x; done
${INSTALL} -d ${DESTDIR}/bin
for x in $(SBINLINKS); do ln -fs ${BINDIR}/${PROG} $(DESTDIR)${BINDIR}/$$x; done
$(INSTALL) -d $(DESTDIR)/$(LIBNAME)/$(PROG)/bin
for x in $(RC_BINLINKS); do ln -fs ${BINDIR}/${PROG} $(DESTDIR)/$(LIBNAME)/$(PROG)/bin/$$x; done
$(INSTALL) -d $(DESTDIR)/$(LIBNAME)/$(PROG)/sbin
for x in $(RC_SBINLINKS); do ln -fs ${BINDIR}/${PROG} $(DESTDIR)/$(LIBNAME)/$(PROG)/sbin/$$x; done
if test "$(PAM)" = pam; then \
for x in ${SBINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}${BINDIR}/$$x; done
${INSTALL} -d ${DESTDIR}/${LIBNAME}/${PROG}/bin
for x in $(RC_BINLINKS); do ln -fs ${BINDIR}/${PROG} $(DESTDIR)/${LIBNAME}/${PROG}/bin/$$x; done
${INSTALL} -d ${DESTDIR}/${LIBNAME}/${PROG}/sbin
for x in ${RC_SBINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}/${LIBNAME}/${PROG}/sbin/$$x; done
if test "${PAM}" = pam; then \
${INSTALL} -d ${DESTDIR}${PAMDIR}; \
${INSTALL} -m ${PAMMODE} start-stop-daemon.pam $(DESTDIR)${PAMDIR}/start-stop-daemon; \
${INSTALL} -m ${PAMMODE} start-stop-daemon.pam ${DESTDIR}${PAMDIR}/start-stop-daemon; \
fi