From 74e0e58b899accd2bd72a7d7303331e47089959f Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Mon, 7 Jan 2008 09:39:44 +0000
Subject: Stop using CPPFLAGS

---
 src/rc/Makefile | 58 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/rc/Makefile')

diff --git a/src/rc/Makefile b/src/rc/Makefile
index da0c95e..2f1c4ca 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -1,45 +1,45 @@
-PROG=			rc
-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
+PROG=		rc
+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
+SCRIPTS=	version.h
+CLEANFILES=	version.h
 
-TOPDIR=			..
+TOPDIR=		..
 
-LDFLAGS+=		-L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo
-LDADD+=			-lutil -lrc -leinfo
-CPPFLAGS+=		-I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo
+LDFLAGS+=	-L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo
+LDADD+=		-lutil -lrc -leinfo
+CFLAGS+=	-I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo
 
-BINDIR?=		/sbin
+BINDIR?=	/sbin
 
-LINKDIR=		$(LIBNAME)/$(PROG)
-BINLINKS=		rc-status
-SBINLINKS=		rc-update runscript start-stop-daemon
+LINKDIR=	$(LIBNAME)/$(PROG)
+BINLINKS=	rc-status
+SBINLINKS=	rc-update runscript start-stop-daemon
 RC_BINLINKS=	einfon einfo ewarnn ewarn eerrorn eerror ebegin eend ewend \
-				eindent eoutdent esyslog eval_ecolors \
-				veinfo vewarn vebegin veend vewend veindent veoutdent \
-				service_starting service_started \
-				service_stopping service_stopped \
-				service_inactive service_wasinactive \
-				service_coldplugged service_started_daemon \
-				checkpath fstabinfo mountinfo rc-depend \
-				service_get_value service_set_value get_options save_options \
-				shell_var
+		eindent eoutdent esyslog eval_ecolors \
+		veinfo vewarn vebegin veend vewend veindent veoutdent \
+		service_starting service_started \
+		service_stopping service_stopped \
+		service_inactive service_wasinactive \
+		service_coldplugged service_started_daemon \
+		checkpath fstabinfo mountinfo rc-depend \
+		service_get_value service_set_value get_options save_options \
+		shell_var
 RC_SBINLINKS=	mark_service_starting mark_service_started \
-				mark_service_stopping mark_service_stopped \
-				mark_service_inactive mark_service_wasinactive \
-				mark_service_coldplugged mark_service_failed \
-				rc-abort
+		mark_service_stopping mark_service_stopped \
+		mark_service_inactive mark_service_wasinactive \
+		mark_service_coldplugged mark_service_failed \
+		rc-abort
 
 include $(TOPDIR)/os.mk
-CPPFLAGS+=		-DLIB=\"$(LIBNAME)\"
+CFLAGS+=	-DLIB=\"$(LIBNAME)\"
 include $(TOPDIR)/cc.mk
 include $(TOPDIR)/prog.mk
 
 include $(TOPDIR)/$(TERMCAP).mk
-LDADD+=			${LIBDL} ${LIBKVM}
+LDADD+=		${LIBDL} ${LIBKVM}
 include $(TOPDIR)/$(PAM).mk
 
 version.h:
-- 
cgit v1.2.3