summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <abaumann@yahoo.com>2011-12-24 14:48:55 +0100
committerAndreas Baumann <abaumann@yahoo.com>2011-12-24 14:48:55 +0100
commit8cedf21f247829a8b73dd93ae33951ef1bf4d261 (patch)
tree90bc2eff2a3174bf5c83ec31afe5179e5422e85d
parent2d948f085ae999fc0f15a0286f668431840a5b37 (diff)
downloadwolfbones-8cedf21f247829a8b73dd93ae33951ef1bf4d261.tar.gz
wolfbones-8cedf21f247829a8b73dd93ae33951ef1bf4d261.tar.bz2
allowing CFLAGS and LDFLAGS to be passed to make, internally using ALL_ flags
-rw-r--r--makefiles/gmake/compiler.mk12
-rw-r--r--makefiles/gmake/depend.mk8
-rw-r--r--makefiles/gmake/libs.mk4
3 files changed, 12 insertions, 12 deletions
diff --git a/makefiles/gmake/compiler.mk b/makefiles/gmake/compiler.mk
index 9c145f9..bde55a0 100644
--- a/makefiles/gmake/compiler.mk
+++ b/makefiles/gmake/compiler.mk
@@ -298,23 +298,23 @@ endif
#endif
#endif
-CFLAGS = $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(INCLUDE_CFLAGS) $(PTHREADS_CFLAGS)
+ALL_CFLAGS = $(CFLAGS) $(COMPILE_FLAGS) $(PLATFORM_COMPILE_FLAGS) $(INCLUDE_DIRS) $(INCLUDE_CFLAGS) $(PTHREADS_CFLAGS)
+ALL_LDFLAGS = $(LDFLAGS) $(INCLUDE_LDFLAGS) $(PTHREADS_LDFLAGS) $(LDFLAGS_NET) $(LDFLAGS_LT) $(LDFLAGS_DL)
-LDFLAGS = $(INCLUDE_LDFLAGS) $(PTHREADS_LDFLAGS) $(LDFLAGS_NET) $(LDFLAGS_LT) $(LDFLAGS_DL)
LIBS = $(INCLUDE_LIBS) $(PTHREADS_LIBS) $(LIBS_NET) $(LIBS_LT) $(LIBS_DL)
LINK = $(CC)
%.o : %.c
- $(CC) -c -o $@ $(CFLAGS) $<
+ $(CC) -c -o $@ $(ALL_CFLAGS) $<
%$(EXE): %.o $(OBJS) $(TEST_OBJS)
- $(LINK) -o $@ $(LDFLAGS) $(OBJS) $(TEST_OBJS) $< $(LIBS)
+ $(LINK) -o $@ $(ALL_LDFLAGS) $(OBJS) $(TEST_OBJS) $< $(LIBS)
%.sho : %.c
- $(CC) -c -o $@ $(SO_COMPILE_FLAGS) -DSHARED $(CFLAGS) $<
+ $(CC) -c -o $@ $(SO_COMPILE_FLAGS) -DSHARED $(ALL_CFLAGS) $<
%$(SO) : %.sho $(OBJS)
- $(LINK) -shared -o $@ $(LDFLAGS) $(LIBS) $(OBJS) $<
+ $(LINK) -shared -o $@ $(ALL_LDFLAGS) $(LIBS) $(OBJS) $<
BIN_OBJS = $(BINS:$(EXE)=.o)
TEST_BIN_OBJS = $(TEST_BINS:$(EXE)=.o)
diff --git a/makefiles/gmake/depend.mk b/makefiles/gmake/depend.mk
index 22eaa41..500ad91 100644
--- a/makefiles/gmake/depend.mk
+++ b/makefiles/gmake/depend.mk
@@ -16,7 +16,7 @@ ifeq "$(COMPILER)" "gcc"
%.d : %.c
@echo Generating dependencies for $<
- @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(CFLAGS) $< | \
+ @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(ALL_CFLAGS) $< | \
sed "s,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g" | tr -s '&' "\n" > $@
endif
@@ -33,7 +33,7 @@ ifeq "$(COMPILER)" "icc"
%.d : %.c
@echo Generating dependencies for $<
- @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(CFLAGS) $< | \
+ @$(CC) -DMAKE_DEPENDENCIES -MM -MT $(@:.d=.o) $(ALL_CFLAGS) $< | \
sed "s,\($*\.o\)[ :]*\(.*\),$@ : $$\(wildcard \2\)\&\&\&\1 : \2,g" | tr -s '&' "\n" > $@
endif
@@ -42,7 +42,7 @@ ifeq "$(COMPILER)" "spro"
%.d : %.c
@echo Generating dependencies for $<
- @$(CC) -DMAKE_DEPENDENCIES -xM1 $(CFLAGS) $< > $@
+ @$(CC) -DMAKE_DEPENDENCIES -xM1 $(ALL_CFLAGS) $< > $@
endif
@@ -51,7 +51,7 @@ ifeq "$(COMPILER)" "pcc"
# FIXME: platform in path of compiler include files, mmh, how to fix?
%.d : %.c
@echo Generating dependencies for $<
- @$(CC) -DMAKE_DEPENDENCIES $(CFLAGS) -M $< > $@
+ @$(CC) -DMAKE_DEPENDENCIES $(ALL_CFLAGS) -M $< > $@
endif
diff --git a/makefiles/gmake/libs.mk b/makefiles/gmake/libs.mk
index c074b76..932cd3b 100644
--- a/makefiles/gmake/libs.mk
+++ b/makefiles/gmake/libs.mk
@@ -55,14 +55,14 @@ endif
ifneq "$(DYNAMIC_LIB)" ""
$(DYNAMIC_LIB).$(DYNAMIC_LIB_MAJOR).$(DYNAMIC_LIB_MINOR).$(DYNAMIC_LIB_PATCH) : $(SH_OBJS)
- $(LINK) $(SO_FLAGS) -o $@ $(LDFLAGS) $(SH_OBJS) $(LIBS)
+ $(LINK) $(SO_FLAGS) -o $@ $(ALL_LDFLAGS) $(SH_OBJS) $(LIBS)
else
$(DYNAMIC_LIB).$(DYNAMIC_LIB_MAJOR).$(DYNAMIC_LIB_MINOR).$(DYNAMIC_LIB_PATCH) :
endif
ifneq "$(TEST_DYNAMIC_LIB)" ""
$(TEST_DYNAMIC_LIB).$(TEST_DYNAMIC_LIB_MAJOR).$(TEST_DYNAMIC_LIB_MINOR).$(TEST_DYNAMIC_LIB_PATCH) : $(SH_OBJS)
- $(LINK) $(SO_FLAGS) -o $@ $(LDFLAGS) $(SH_OBJS) $(LIBS)
+ $(LINK) $(SO_FLAGS) -o $@ $(ALL_LDFLAGS) $(SH_OBJS) $(LIBS)
else
$(TEST_DYNAMIC_LIB).$(TEST_DYNAMIC_LIB_MAJOR).$(TEST_DYNAMIC_LIB_MINOR).$(TEST_DYNAMIC_LIB_PATCH) :
endif