janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

*.mk: Prefix non-env C/C++ flags with BUILD_

Browse source 
Prefix all CFLAGS / CPPFLAGS / LDFLAGS with BUILD_ to distinguish
them from flags read from the environment (and getting longer and
longer with +=).
This commit is contained in:
Jan Lindemann 2012-02-04 16:48:58 +00:00 • committed by Jan Lindemann
commit 634992f447
6 changed files with 94 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

28
make/rules.mk
View file

@ -108,7 +108,7 @@ libpath:
echo-ldflags:
@echo LDFLAGS = $(LDFLAGS)
@echo BUILD_LDFLAGS = $(BUILD_LDFLAGS)
@echo LOCAL_LDFLAGS = $(LOCAL_LDFLAGS)
@echo PROJECTLIB_LDFLAGS = $(PROJECTLIB_LDFLAGS)
@echo PROJECT_LDFLAGS = $(PROJECT_LDFLAGS)
@ -119,10 +119,10 @@ echo-ldflags:
echo-cflags:
@echo LOCAL_CFLAGS = $(LOCAL_CFLAGS)
@echo PROJECT_CFLAGS = $(PROJECT_CFLAGS)
@echo CFLAGS = $(CFLAGS)
@echo BUILD_CFLAGS = $(BUILD_CFLAGS)
@echo LOCAL_CPPFLAGS = $(LOCAL_CPPFLAGS)
@echo PROJECT_CPPFLAGS = $(PROJECT_CPPFLAGS)
@echo CPPFLAGS = $(CPPFLAGS)
@echo BUILD_CPPFLAGS = $(BUILD_CPPFLAGS)
echo-development:
echo DEVELOPMENT = $(DEVELOPMENT)
@ -189,17 +189,17 @@ strip.done: $(EXE_ALL)
# make -$(MAKEFLAGS) -C $(shell dirname $@) `basename $@`
.%.o.dep.mk: %.cpp $(BUILD_HDR)
$(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
$(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
.%.o.dep.mk: %.c $(BUILD_HDR)
$(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
$(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
ifeq ($(LIBTYPE),shared)
$(SO_PREFIX)%.so: %.o
$(LD) -shared $(LDFLAGS) $^ -o $@
$(LD) -shared $(BUILD_LDFLAGS) $^ -o $@
else
$(SO_PREFIX)%.so: %.o
$(LD) $(LDFLAGS) $^ -o $@
$(LD) $(BUILD_LDFLAGS) $^ -o $@
endif
$(VERSION_SCRIPT):
@ -208,7 +208,7 @@ $(VERSION_SCRIPT):
ifneq ($(TARGET),mingw)
$(LIB_SO): $(VERSION_SCRIPT) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
$(LD) -shared -Wl,--whole-archive,-soname=$(notdir $@) $(VERSION_SCRIPT) $(LIB_A) -Wl,--no-whole-archive \
$(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
$(filter-out -l$(LIBNAME),$(BUILD_LDFLAGS)) -o $@
else
$(WINRES_RC): $(WINRES_RC_TMPL)
$(CAT) $< | $(SED) " \
@ -225,19 +225,19 @@ $(WINRES_O): $(WINRES_RC)
$(LIB_SO): $(VERSION_SCRIPT) $(WINRES_O) $(LIB_A) $(TOPDIR)/dir_build_LIB.done
$(LD) -shared -Wl,--whole-archive,--out-implib,$(shell echo $(LIB_A) | \
$(SED) 's/-static//'),--output-def,$(LIB_DEF) $(VERSION_SCRIPT) $(LIB_A) $(WINRES_O) \
-Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(LDFLAGS)) -o $@
-Wl,--no-whole-archive $(filter-out -l$(LIBNAME),$(BUILD_LDFLAGS)) -o $@
$(MSVCPP_IMPLIB): $(LIB_SO)
$(MS_LD) /machine:i386 /def:$(LIB_DEF)
endif
%.o: %.cpp
$(CPP) $(CPPFLAGS) -c $<
$(CPP) $(BUILD_CPPFLAGS) -c $<
%.o: %.c
$(CC) $(CFLAGS) -c $<
$(CC) $(BUILD_CFLAGS) -c $<
%.o: %.S
$(CC) $(CFLAGS) -c $<
$(CC) $(BUILD_CFLAGS) -c $<
timers_%.h: %.h $(GENERATE_FUNC_TIMERS)
sh $(GENERATE_FUNC_TIMERS) $< $@
@ -260,10 +260,10 @@ else
endif
$(EXE) $(EXE_BIN):
$(CPP) $(sort $(OBJ)) $(LDFLAGS) -o $@
$(CPP) $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
$(PLUGIN) $(PLUGIN_LIB):
$(CPP) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@
$(CPP) -shared $(sort $(OBJ)) $(BUILD_LDFLAGS) -o $@
# mkdir -p $(BUILD_LIBDIR)
# install -m 755 $@ $(BUILD_LIBDIR)