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

Stop using CPPFLAGS

Browse Source
This commit is contained in:
Roy Marples 2008-01-07 09:39:44 +00:00
parent 18adcb1ee8
commit 74e0e58b89
8 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib.mk
View File

@ -30,7 +30,7 @@ LIBMODE?= 0444
.SUFFIXES: .So .SUFFIXES: .So
.c.So: .c.So:
${CC} ${PICFLAG} -DPIC ${CFLAGS} ${CPPFLAGS} -c $< -o $@ ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c $< -o $@
all: ${_LIBS} all: ${_LIBS}

5
src/librc/Makefile
View File

@ -3,11 +3,12 @@ include $(TOPDIR)/os.mk
LIB= rc LIB= rc
SHLIB_MAJOR= 1 SHLIB_MAJOR= 1
SRCS= librc.c librc-daemon.c librc-depend.c librc-misc.c librc-strlist.c SRCS= librc.c librc-daemon.c librc-depend.c librc-misc.c \
librc-strlist.c
INCS= rc.h INCS= rc.h
VERSION_MAP= rc.map VERSION_MAP= rc.map
CPPFLAGS+= -DLIB=\"${LIBNAME}\" CFLAGS+= -DLIB=\"${LIBNAME}\"
LDADD+= ${LIBKVM} LDADD+= ${LIBKVM}
SHLIBDIR= /${LIBNAME} SHLIBDIR= /${LIBNAME}

2
src/ncurses.mk
View File

@ -1,3 +1,3 @@
LIBTERMCAP?= -lncurses LIBTERMCAP?= -lncurses
CPPFLAGS+= -DHAVE_TERMCAP CFLAGS+= -DHAVE_TERMCAP
LDADD+= ${LIBTERMCAP} LDADD+= ${LIBTERMCAP}

2
src/os.mk
View File

@ -13,7 +13,7 @@ RC_LIB= /$(LIB)/rc
_DEF_SH= case `uname -s` in Linux) echo "-D_XOPEN_SOURCE=600 -D_BSD_SOURCE";; *) echo;; esac _DEF_SH= case `uname -s` in Linux) echo "-D_XOPEN_SOURCE=600 -D_BSD_SOURCE";; *) echo;; esac
_DEF!= $(_DEF_SH) _DEF!= $(_DEF_SH)
CPPFLAGS+= $(_DEF)$(shell $(_DEF_SH)) CFLAGS+= $(_DEF)$(shell $(_DEF_SH))
_LIBDL_SH= case `uname -s` in Linux) echo "-Wl,-Bdynamic -ldl";; *) echo;; esac _LIBDL_SH= case `uname -s` in Linux) echo "-Wl,-Bdynamic -ldl";; *) echo;; esac
_LIBDL!= $(_LIBDL_SH) _LIBDL!= $(_LIBDL_SH)

2
src/pam.mk
View File

@ -1,5 +1,5 @@
LIBPAM?= -lpam LIBPAM?= -lpam
CPPFLAGS+= -DHAVE_PAM CFLAGS+= -DHAVE_PAM
LDADD+= ${LIBPAM} LDADD+= ${LIBPAM}
PAMDIR?= /etc/pam.d PAMDIR?= /etc/pam.d

3
src/prog.mk
View File

@ -4,7 +4,6 @@
# Copyright 2008 Roy Marples # Copyright 2008 Roy Marples
BINDIR?= /sbin BINDIR?= /sbin
OBJS+= ${SRCS:.c=.o} OBJS+= ${SRCS:.c=.o}
INSTALL?= install INSTALL?= install
@ -12,7 +11,7 @@ INSTALL?= install
all: ${PROG} all: ${PROG}
${PROG}: ${SCRIPTS} ${OBJS} ${PROG}: ${SCRIPTS} ${OBJS}
${CC} ${CFLAGS} ${LDFLAGS} ${PROGLDFLAGS} ${CPPFLAGS} -o $@ ${OBJS} ${LDADD} ${CC} ${CFLAGS} ${LDFLAGS} ${PROGLDFLAGS} -o $@ ${OBJS} ${LDADD}
clean: clean:
rm -f ${OBJS} ${PROG} ${CLEANFILES} rm -f ${OBJS} ${PROG} ${CLEANFILES}

4
src/rc/Makefile
View File

@ -10,7 +10,7 @@ TOPDIR= ..
LDFLAGS+= -L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo LDFLAGS+= -L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo
LDADD+= -lutil -lrc -leinfo LDADD+= -lutil -lrc -leinfo
CPPFLAGS+= -I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo CFLAGS+= -I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo
BINDIR?= /sbin BINDIR?= /sbin
@ -34,7 +34,7 @@ RC_SBINLINKS= mark_service_starting mark_service_started \
rc-abort rc-abort
include $(TOPDIR)/os.mk include $(TOPDIR)/os.mk
CPPFLAGS+= -DLIB=\"$(LIBNAME)\" CFLAGS+= -DLIB=\"$(LIBNAME)\"
include $(TOPDIR)/cc.mk include $(TOPDIR)/cc.mk
include $(TOPDIR)/prog.mk include $(TOPDIR)/prog.mk

2
src/termcap.mk
View File

@ -1,3 +1,3 @@
LIBTERMCAP?= -ltermcap LIBTERMCAP?= -ltermcap
CPPFLAGS+= -DHAVE_TERMCAP CFLAGS+= -DHAVE_TERMCAP
LDADD+= ${LIBTERMCAP} LDADD+= ${LIBTERMCAP}