From 8afb86a5deb7187e87f35a62959e3944348eb0d9 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 6 Jan 2008 13:47:39 +0000
Subject: Set include paths in Makefile instead of .c files

---
 src/rc/Makefile            | 1 +
 src/rc/checkpath.c         | 4 ++--
 src/rc/fstabinfo.c         | 6 +++---
 src/rc/mountinfo.c         | 6 +++---
 src/rc/rc-depend.c         | 6 +++---
 src/rc/rc-logger.c         | 4 ++--
 src/rc/rc-misc.c           | 4 ++--
 src/rc/rc-plugin.c         | 6 +++---
 src/rc/rc-status.c         | 6 +++---
 src/rc/rc.c                | 6 +++---
 src/rc/runscript.c         | 6 +++---
 src/rc/start-stop-daemon.c | 6 +++---
 12 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/src/rc/Makefile b/src/rc/Makefile
index a96b0e4..6d3d7dd 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -10,6 +10,7 @@ TOPDIR=			..
 
 LDFLAGS+=		-L$(TOPDIR)/librc -L$(TOPDIR)/libeinfo
 LDADD+=			-lutil -lrc -leinfo
+CPPFLAGS+=		-I$(TOPDIR) -I$(TOPDIR)/librc -I$(TOPDIR)/libeinfo
 
 BINDIR?=		/sbin
 
diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
index a4d3da1..612a076 100644
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -43,8 +43,8 @@
 #include <unistd.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
-#include "../rc-misc.h"
+#include "einfo.h"
+#include "rc-misc.h"
 
 static const char *applet;
 
diff --git a/src/rc/fstabinfo.c b/src/rc/fstabinfo.c
index 04f0384..5f8e469 100644
--- a/src/rc/fstabinfo.c
+++ b/src/rc/fstabinfo.c
@@ -65,10 +65,10 @@
 #endif
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 #ifdef HAVE_GETMNTENT
 static struct mntent *getmntfile (const char *file)
diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index 155e860..05ce8dd 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -50,10 +50,10 @@
 #include <regex.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 static const char *applet;
 
diff --git a/src/rc/rc-depend.c b/src/rc/rc-depend.c
index da99a5c..c5e9e66 100644
--- a/src/rc/rc-depend.c
+++ b/src/rc/rc-depend.c
@@ -40,10 +40,10 @@
 #include <string.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 static const char *applet;
 
diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c
index 133026a..675a4d2 100644
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -48,9 +48,9 @@
 # include <libutil.h>
 #endif
 
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc-logger.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc.h"
 
 #define LOGFILE RC_SVCDIR "/rc.log"
diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
index aacd6fe..85d7cd7 100644
--- a/src/rc/rc-misc.c
+++ b/src/rc/rc-misc.c
@@ -44,8 +44,8 @@
 #include <string.h>
 
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 #define PROFILE_ENV     "/etc/profile.env"
 #define SYS_WHITELIST   RC_LIBDIR "/conf.d/env_whitelist"
diff --git a/src/rc/rc-plugin.c b/src/rc/rc-plugin.c
index 3f59544..613f049 100644
--- a/src/rc/rc-plugin.c
+++ b/src/rc/rc-plugin.c
@@ -41,11 +41,11 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc-plugin.h"
-#include "../strlist.h"
+#include "strlist.h"
 
 #define RC_PLUGIN_HOOK "rc_plugin_hook"
 
diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c
index 1b943cf..155192f 100644
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -36,10 +36,10 @@
 #include <unistd.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 static const char *applet;
 
diff --git a/src/rc/rc.c b/src/rc/rc.c
index cbb9a15..891ce11 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -59,12 +59,12 @@ const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
 #include <unistd.h>
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
 #include "rc-logger.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc-plugin.h"
-#include "../strlist.h"
+#include "strlist.h"
 
 #include "version.h"
 
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 615b411..fdb0496 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -54,11 +54,11 @@
 #endif
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
+#include "rc-misc.h"
 #include "rc-plugin.h"
-#include "../strlist.h"
+#include "strlist.h"
 
 #define SELINUX_LIB     RC_LIBDIR "/runscript_selinux.so"
 
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index bfd9202..bf03dbe 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -68,10 +68,10 @@ static struct pam_conv conv = { NULL, NULL};
 #endif
 
 #include "builtins.h"
-#include "../libeinfo/einfo.h"
+#include "einfo.h"
 #include "rc.h"
-#include "../rc-misc.h"
-#include "../strlist.h"
+#include "rc-misc.h"
+#include "strlist.h"
 
 typedef struct schedulelist
 {
-- 
cgit v1.2.3