aboutsummaryrefslogtreecommitdiff
path: root/src/librc
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2022-04-06 10:51:55 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2022-04-06 10:51:55 -0500
commit391d12db48754861b5cecac92ee3321597ee02c1 (patch)
treeb42fad5a31ca342de7b7ecf1fb78784194c1400c /src/librc
parent0efc1b133e4182bd53cde78153bd8b5cc2e99448 (diff)
migrate fully to meson build system
- drop old build system - move shared include and source files to common directory - drop "rc-" prefix from shared include and source files - move executable-specific code to individual directories under src - adjust top-level .gitignore file for new build system This closes #489.
Diffstat (limited to 'src/librc')
-rw-r--r--src/librc/.gitignore2
-rw-r--r--src/librc/Makefile48
-rw-r--r--src/librc/librc.h2
3 files changed, 1 insertions, 51 deletions
diff --git a/src/librc/.gitignore b/src/librc/.gitignore
deleted file mode 100644
index e7fafe8c..00000000
--- a/src/librc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-librc.so.1
-rc.h
diff --git a/src/librc/Makefile b/src/librc/Makefile
deleted file mode 100644
index 08c599ef..00000000
--- a/src/librc/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-LIB= rc
-SHLIB_MAJOR= 1
-SRCS= librc.c librc-daemon.c librc-depend.c librc-misc.c \
- librc-stringlist.c
-INCS= rc.h
-VERSION_MAP= rc.map
-
-LDADD+= ${LIBKVM}
-
-LOCAL_CPPFLAGS+= -I../includes
-
-MK= ../../mk
-include ${MK}/lib.mk
-include ${MK}/cc.mk
-
-# Massage our header file for our dirs
-SED_CMD= -e 's:@PREFIX@:${PREFIX}:g'
-SED_CMD+= -e 's:@LIB@:${LIBNAME}:g'
-SED_CMD+= -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
-SED_CMD+= -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
-SED_CMD+= -e 's:@BINDIR@:${BINDIR}:g'
-SED_CMD+= -e 's:@SBINDIR@:${SBINDIR}:g'
-
-_PKG_PREFIX= -e 's:.*@PKG_PREFIX@.*:\#undef RC_PKG_PREFIX:g'
-ifneq (${PKG_PREFIX},)
-ifneq (${PKG_PREFIX},/)
-ifneq (${PKG_PREFIX},${PREFIX})
-_PKG_PREFIX= -e 's:@PKG_PREFIX@:${PKG_PREFIX}:g'
-endif
-endif
-endif
-SED_CMD+= ${_PKG_PREFIX}
-
-_LCL_PREFIX= -e 's:@LOCAL_PREFIX@::g'
-ifneq (${LOCAL_PREFIX},)
-ifneq (${LOCAL_PREFIX},/)
-ifneq (${LOCAL_PREFIX},${PREFIX})
-_LCL_PREFIX= -e 's:@LOCAL_PREFIX@:${LOCAL_PREFIX}:g'
-endif
-endif
-endif
-SED_CMD+= ${_LCL_PREFIX}
-
-%.h: %.h.in
- ${SED} ${SED_CMD} $< > $@
-${SRCS}: rc.h
-
-CLEANFILES+= rc.h
diff --git a/src/librc/librc.h b/src/librc/librc.h
index 64198b2e..09ab9276 100644
--- a/src/librc/librc.h
+++ b/src/librc/librc.h
@@ -54,6 +54,6 @@
#endif
#include "rc.h"
-#include "rc-misc.h"
+#include "misc.h"
#endif