diff options
| author | Will Miles <wmiles@sgl.com> | 2015-01-22 09:43:28 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2015-01-24 13:48:53 -0600 |
| commit | 3f80f22e22ec16ed517397fd303c3df99f9340fc (patch) | |
| tree | f76bee821407e2ec9d3881a3bb6fce79364c814c | |
| parent | 8250ac94dfc6156075081e0e2d0986cb51b3098d (diff) | |
Prioritize local includes and libraries
This fixes #35.
| -rw-r--r-- | mk/depend.mk | 2 | ||||
| -rw-r--r-- | mk/lib.mk | 6 | ||||
| -rw-r--r-- | mk/prog.mk | 6 | ||||
| -rw-r--r-- | src/libeinfo/Makefile | 2 | ||||
| -rw-r--r-- | src/librc/Makefile | 2 | ||||
| -rw-r--r-- | src/rc/Makefile | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/mk/depend.mk b/mk/depend.mk index 44af3782..873b0ca3 100644 --- a/mk/depend.mk +++ b/mk/depend.mk @@ -6,7 +6,7 @@ IGNOREFILES+= .depend .depend: ${SRCS} rm -f .depend - ${CC} ${CPPFLAGS} -MM ${SRCS} > .depend + ${CC} ${LOCAL_CPPFLAGS} ${CPPFLAGS} -MM ${SRCS} > .depend depend: .depend extra_depend @@ -21,10 +21,10 @@ _LIBS+= ${SHLIB_NAME} CLEANFILES+= ${OBJS} ${SOBJS} ${_LIBS} ${SHLIB_LINK} %.o: %.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@ + ${CC} ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CFLAGS} ${CPPFLAGS} -c $< -o $@ %.So: %.c - ${CC} ${PICFLAG} -DPIC ${CPPFLAGS} ${CFLAGS} -c $< -o $@ + ${CC} ${PICFLAG} -DPIC ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CPPFLAGS} ${CFLAGS} -c $< -o $@ all: depend ${_LIBS} @@ -40,7 +40,7 @@ ${SHLIB_NAME}: ${SOBJS} @${ECHO} building shared library $@ @rm -f $@ ${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} \ ${SOBJS} ${LDADD} @@ -1,4 +1,4 @@ -# rules to build a library +# rules to build a program # based on FreeBSD's bsd.prog.mk # Copyright (c) 2008 Roy Marples <roy@marples.name> @@ -25,10 +25,10 @@ CLEANFILES+= ${OBJS} ${PROG} all: depend ${PROG} %.o: %.c - ${CC} ${CFLAGS} ${CPPFLAGS} -c $< -o $@ + ${CC} ${LOCAL_CFLAGS} ${LOCAL_CPPFLAGS} ${CFLAGS} ${CPPFLAGS} -c $< -o $@ ${PROG}: ${SCRIPTS} ${OBJS} - ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD} + ${CC} ${LOCAL_CFLAGS} ${LOCAL_LDFLAGS} ${CFLAGS} ${LDFLAGS} -o $@ ${OBJS} ${LDADD} clean: rm -f ${CLEANFILES} diff --git a/src/libeinfo/Makefile b/src/libeinfo/Makefile index ec756b47..e6ccb650 100644 --- a/src/libeinfo/Makefile +++ b/src/libeinfo/Makefile @@ -4,7 +4,7 @@ SRCS= libeinfo.c INCS= einfo.h VERSION_MAP= einfo.map -CPPFLAGS+= -I../includes +LOCAL_CPPFLAGS+= -I../includes MK= ../../mk include ${MK}/lib.mk diff --git a/src/librc/Makefile b/src/librc/Makefile index 73075608..08c599ef 100644 --- a/src/librc/Makefile +++ b/src/librc/Makefile @@ -7,7 +7,7 @@ VERSION_MAP= rc.map LDADD+= ${LIBKVM} -CPPFLAGS+= -I../includes +LOCAL_CPPFLAGS+= -I../includes MK= ../../mk include ${MK}/lib.mk diff --git a/src/rc/Makefile b/src/rc/Makefile index d2b2ac5f..fc88ff28 100644 --- a/src/rc/Makefile +++ b/src/rc/Makefile @@ -35,8 +35,8 @@ RC_SBINLINKS= mark_service_starting mark_service_started \ ALL_LINKS= ${BINLINKS} ${SBINLINKS} ${RC_BINLINKS} ${RC_SBINLINKS} CLEANFILES+= ${ALL_LINKS} -CPPFLAGS+= -I../includes -I../librc -I../libeinfo -LDFLAGS+= -L../librc -L../libeinfo +LOCAL_CPPFLAGS=-I../includes -I../librc -I../libeinfo +LOCAL_LDFLAGS=-L../librc -L../libeinfo LDADD+= -lutil -lrc -leinfo include ../../Makefile.inc |