emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prioritize local includes and libraries

Browse Source 
This fixes #35.
This commit is contained in:
Will Miles
2015-01-22 09:43:28 -05:00
committed by William Hubbs
parent 8250ac94df
commit 3f80f22e22
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mk/depend.mk
View File

@@ -6,7 +6,7 @@ IGNOREFILES+= .depend
.depend: ${SRCS} .depend: ${SRCS}
rm -f .depend rm -f .depend
${CC} ${CPPFLAGS} -MM ${SRCS} > .depend ${CC} ${LOCAL_CPPFLAGS} ${CPPFLAGS} -MM ${SRCS} > .depend
depend: .depend extra_depend depend: .depend extra_depend

6
mk/lib.mk
View File

@@ -21,10 +21,10 @@ _LIBS+= ${SHLIB_NAME}
CLEANFILES+= ${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK} CLEANFILES+= ${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK}
%.o: %.c %.o: %.c
${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@ ${CC} ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
%.So: %.c %.So: %.c
${CC} ${PICFLAG} -DPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@ ${CC} ${PICFLAG} -DPIC ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CPPFLAGS} ${CFLAGS} -c $< -o $@
all: depend ${_LIBS} all: depend ${_LIBS}
@@ -40,7 +40,7 @@ ${SHLIB_NAME}: ${SOBJS}
@${ECHO} building shared library $@ @${ECHO} building shared library $@
@rm -f $@ ${SHLIB_LINK} @rm -f $@ ${SHLIB_LINK}
@ln -fs $@ ${SHLIB_LINK} @ln -fs $@ ${SHLIB_LINK}
${CC} ${CFLAGS} ${LDFLAGS} -shared -Wl,-x \ ${CC} ${LOCAL_CFLAGS} ${CFLAGS} ${LOCAL_LDFLAGS} ${LDFLAGS} -shared -Wl,-x \
-o $@ -Wl,-soname,${SONAME} \ -o $@ -Wl,-soname,${SONAME} \
${SOBJS} ${LDADD} ${SOBJS} ${LDADD}

6
mk/prog.mk
View File

@@ -1,4 +1,4 @@
# rules to build a library # rules to build a program
# based on FreeBSD's bsd.prog.mk # based on FreeBSD's bsd.prog.mk
# Copyright (c) 2008 Roy Marples <roy@marples.name> # Copyright (c) 2008 Roy Marples <roy@marples.name>
@@ -25,10 +25,10 @@ CLEANFILES+= ${OBJS} ${PROG}
all: depend ${PROG} all: depend ${PROG}
%.o: %.c %.o: %.c
${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@ ${CC} ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CFLAGS} ${CPPFLAGS} -c $< -o $@
${PROG}: ${SCRIPTS} ${OBJS} ${PROG}: ${SCRIPTS} ${OBJS}
${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD} ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD}
clean: clean:
rm -f ${CLEANFILES} rm -f ${CLEANFILES}

2
src/libeinfo/Makefile
View File

@@ -4,7 +4,7 @@ SRCS= libeinfo.c
INCS= einfo.h INCS= einfo.h
VERSION_MAP= einfo.map VERSION_MAP= einfo.map
CPPFLAGS+= -I../includes LOCAL_CPPFLAGS+= -I../includes
MK= ../../mk MK= ../../mk
include ${MK}/lib.mk include ${MK}/lib.mk

2
src/librc/Makefile
View File

@@ -7,7 +7,7 @@ VERSION_MAP= rc.map
LDADD+= ${LIBKVM} LDADD+= ${LIBKVM}
CPPFLAGS+= -I../includes LOCAL_CPPFLAGS+= -I../includes
MK= ../../mk MK= ../../mk
include ${MK}/lib.mk include ${MK}/lib.mk

4
src/rc/Makefile
View File

@@ -35,8 +35,8 @@ RC_SBINLINKS= mark_service_starting mark_service_started \
ALL_LINKS= ${BINLINKS} ${SBINLINKS} ${RC_BINLINKS} ${RC_SBINLINKS} ALL_LINKS= ${BINLINKS} ${SBINLINKS} ${RC_BINLINKS} ${RC_SBINLINKS}
CLEANFILES+= ${ALL_LINKS} CLEANFILES+= ${ALL_LINKS}
CPPFLAGS+= -I../includes -I../librc -I../libeinfo LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo
LDFLAGS+= -L../librc -L../libeinfo LOCAL_LDFLAGS=-L../librc -L../libeinfo
LDADD+= -lutil -lrc -leinfo LDADD+= -lutil -lrc -leinfo
include ../../Makefile.inc include ../../Makefile.inc