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

make: Prefix BUILD_ to a couple of makefile variables

Browse source 
Rename variables to avoid collision:

  OBJ      -> BUILD_OBJ
  INCLUDE  -> BUILD_INCLUDE
  LIBFLAGS -> BUILD_LIBFLAGS
  LPPFLAGS -> BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-04-08 18:26:45 +00:00
commit 17a080138c
8 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

24
make/rules.mk
View file

@ -167,8 +167,8 @@ echo-ldflags:
@echo "LOCAL_LDFLAGS = $(LOCAL_LDFLAGS)"
@echo "PROJECTLIB_LDFLAGS = $(PROJECTLIB_LDFLAGS)"
@echo "PROJECT_LDFLAGS = $(PROJECT_LDFLAGS)"
@echo "LPPFLAGS = $(LPPFLAGS)"
@echo "LIBFLAGS = $(LIBFLAGS)"
@echo "BUILD_LPPFLAGS = $(BUILD_LPPFLAGS)"
@echo "BUILD_LIBFLAGS = $(BUILD_LIBFLAGS)"
@echo "QT_LDFLAGS = $(QT_LDFLAGS)"
@echo "REAL_LDFLAGS = $(REAL_LDFLAGS)"
@ -217,7 +217,7 @@ echo-modules:
@echo "SCOPE_CASMIX = $(SCOPE_CASMIX_DIR)"
echo-include:
@echo "INCLUDE : $(INCLUDE)"
@echo "INCLUDE : $(BUILD_INCLUDE)"
echo-mk:
@echo MAKEFILE_LIST = $(MAKEFILE_LIST)
@ -329,27 +329,27 @@ $(LIB_A)(%.o): %.o
$(AR) crU $(LIB_A) $<
ifneq ($(USE_QT),)
$(OBJ): $(UIC_H) $(MOC_H) $(UIC_CPP) $(MOC_CPP) $(RCC_CPP)
$(BUILD_OBJ): $(UIC_H) $(MOC_H) $(UIC_CPP) $(MOC_CPP) $(RCC_CPP)
endif
ifeq ($(USE_PROJECT_LIB),true)
ifeq ($(LIBTYPE),shared)
$(EXE) $(EXE_BIN): $(OBJ) $(LD_SCRIPTS) $(LIB_SO)
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LD_SCRIPTS) $(LIB_SO)
$(EXE) $(EXE_BIN): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_SO)
$(PLUGIN) $(PLUGIN_LIB): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_SO)
else
$(EXE) $(EXE_BIN): $(OBJ) $(LD_SCRIPTS) $(LIB_A)
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LD_SCRIPTS) $(LIB_A)
$(EXE) $(EXE_BIN): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_A)
$(PLUGIN) $(PLUGIN_LIB): $(BUILD_OBJ) $(LD_SCRIPTS) $(LIB_A)
endif
else
$(EXE) $(EXE_BIN): $(OBJ) $(LD_SCRIPTS)
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LD_SCRIPTS)
$(EXE) $(EXE_BIN): $(BUILD_OBJ) $(LD_SCRIPTS)
$(PLUGIN) $(PLUGIN_LIB): $(BUILD_OBJ) $(LD_SCRIPTS)
endif
$(EXE) $(EXE_BIN):
$(CXX) $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
$(CXX) $(sort $(BUILD_OBJ)) $(REAL_LDFLAGS) -o $@
$(PLUGIN) $(PLUGIN_LIB):
$(CXX) -shared $(sort $(OBJ)) $(REAL_LDFLAGS) -o $@
$(CXX) -shared $(sort $(BUILD_OBJ)) $(REAL_LDFLAGS) -o $@
# mkdir -p $(BUILD_LIBDIR)
# $(BIN_INSTALL) -m 755 $@ $(BUILD_LIBDIR)