Set include paths in Makefile instead of .c files
This commit is contained in:
parent
da4217fec8
commit
8afb86a5de
@ -10,6 +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
|
||||||
|
|
||||||
BINDIR?= /sbin
|
BINDIR?= /sbin
|
||||||
|
|
||||||
|
@ -43,8 +43,8 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
|
|
||||||
static const char *applet;
|
static const char *applet;
|
||||||
|
|
||||||
|
@ -65,10 +65,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
#ifdef HAVE_GETMNTENT
|
#ifdef HAVE_GETMNTENT
|
||||||
static struct mntent *getmntfile (const char *file)
|
static struct mntent *getmntfile (const char *file)
|
||||||
|
@ -50,10 +50,10 @@
|
|||||||
#include <regex.h>
|
#include <regex.h>
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
static const char *applet;
|
static const char *applet;
|
||||||
|
|
||||||
|
@ -40,10 +40,10 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
static const char *applet;
|
static const char *applet;
|
||||||
|
|
||||||
|
@ -48,9 +48,9 @@
|
|||||||
# include <libutil.h>
|
# include <libutil.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc-logger.h"
|
#include "rc-logger.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
|
|
||||||
#define LOGFILE RC_SVCDIR "/rc.log"
|
#define LOGFILE RC_SVCDIR "/rc.log"
|
||||||
|
@ -44,8 +44,8 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
#define PROFILE_ENV "/etc/profile.env"
|
#define PROFILE_ENV "/etc/profile.env"
|
||||||
#define SYS_WHITELIST RC_LIBDIR "/conf.d/env_whitelist"
|
#define SYS_WHITELIST RC_LIBDIR "/conf.d/env_whitelist"
|
||||||
|
@ -41,11 +41,11 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "rc-plugin.h"
|
#include "rc-plugin.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
#define RC_PLUGIN_HOOK "rc_plugin_hook"
|
#define RC_PLUGIN_HOOK "rc_plugin_hook"
|
||||||
|
|
||||||
|
@ -36,10 +36,10 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
static const char *applet;
|
static const char *applet;
|
||||||
|
|
||||||
|
@ -59,12 +59,12 @@ const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "rc-logger.h"
|
#include "rc-logger.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "rc-plugin.h"
|
#include "rc-plugin.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
|
@ -54,11 +54,11 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "rc-plugin.h"
|
#include "rc-plugin.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
#define SELINUX_LIB RC_LIBDIR "/runscript_selinux.so"
|
#define SELINUX_LIB RC_LIBDIR "/runscript_selinux.so"
|
||||||
|
|
||||||
|
@ -68,10 +68,10 @@ static struct pam_conv conv = { NULL, NULL};
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "builtins.h"
|
#include "builtins.h"
|
||||||
#include "../libeinfo/einfo.h"
|
#include "einfo.h"
|
||||||
#include "rc.h"
|
#include "rc.h"
|
||||||
#include "../rc-misc.h"
|
#include "rc-misc.h"
|
||||||
#include "../strlist.h"
|
#include "strlist.h"
|
||||||
|
|
||||||
typedef struct schedulelist
|
typedef struct schedulelist
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user