diff options
author | Andreas Baumann <abaumann@yahoo.com> | 2011-12-24 14:48:55 +0100 |
---|---|---|
committer | Andreas Baumann <abaumann@yahoo.com> | 2011-12-24 14:48:55 +0100 |
commit | 8cedf21f247829a8b73dd93ae33951ef1bf4d261 (patch) | |
tree | 90bc2eff2a3174bf5c83ec31afe5179e5422e85d /makefiles/gmake/compiler.mk | |
parent | 2d948f085ae999fc0f15a0286f668431840a5b37 (diff) | |
download | wolfbones-8cedf21f247829a8b73dd93ae33951ef1bf4d261.tar.gz wolfbones-8cedf21f247829a8b73dd93ae33951ef1bf4d261.tar.bz2 |
allowing CFLAGS and LDFLAGS to be passed to make, internally using ALL_ flags
Diffstat (limited to 'makefiles/gmake/compiler.mk')
-rw-r--r-- | makefiles/gmake/compiler.mk | 12 |
1 files changed, 6 insertions, 6 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) |