aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-19 15:22:20 +0000
committerRoy Marples <roy@marples.name>2008-03-19 15:22:20 +0000
commit64853c4916945ad760f06c27c363a201c1643271 (patch)
tree109ea61e97fb045f2b7f483fff88f83c9d78dc94 /src
parent0e6eb0f7640a5994755e93ea65e630d6ab917eaa (diff)
Rejig the build system a little so we have per ok defs per system. Probably easier in the long run.
Diffstat (limited to 'src')
-rw-r--r--src/libeinfo/Makefile6
-rw-r--r--src/librc/Makefile6
-rw-r--r--src/rc/Makefile3
3 files changed, 5 insertions, 10 deletions
diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile
index b40266f5..bcbfa62b 100644
--- a/src/libeinfo/Makefile
+++ b/src/libeinfo/Makefile
@@ -1,6 +1,3 @@
-MK= ../../mk
-include ${MK}/os.mk
-
LIB= einfo
SHLIB_MAJOR= 1
SRCS= libeinfo.c
@@ -9,6 +6,7 @@ VERSION_MAP= einfo.map
CFLAGS+= -I../includes
-include ${MK}/cc.mk
+MK= ../../mk
include ${MK}/lib.mk
+include ${MK}/cc.mk
include ${MK}/${MKTERMCAP}.mk
diff --git a/src/librc/Makefile b/src/librc/Makefile
index 15c396b3..f47f5b07 100644
--- a/src/librc/Makefile
+++ b/src/librc/Makefile
@@ -1,6 +1,3 @@
-MK= ../../mk
-include ${MK}/os.mk
-
LIB= rc
SHLIB_MAJOR= 1
SRCS= librc.c librc-daemon.c librc-depend.c librc-misc.c \
@@ -14,5 +11,6 @@ LDADD+= ${LIBKVM}
CFLAGS+= -I../includes
-include ${MK}/cc.mk
+MK= ../../mk
include ${MK}/lib.mk
+include ${MK}/cc.mk
diff --git a/src/rc/Makefile b/src/rc/Makefile
index 469ac984..8c43da85 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -36,9 +36,8 @@ LDADD+= -lutil -lrc -leinfo
#LDFLAGS+= -Wl,--rpath=../librc -Wl,--rpath=../libeinfo
MK= ../../mk
-include ${MK}/cc.mk
-include ${MK}/os.mk
include ${MK}/prog.mk
+include ${MK}/cc.mk
CFLAGS+= -I../includes -I../librc -I../libeinfo
CFLAGS+= -DLIB=\"${LIBNAME}\"