janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk, exe.mk, rules.mk: Fix USE_PROJECT_LIB = false case

Browse source
This commit is contained in:
Jan Lindemann 2010-11-21 17:55:20 +00:00 • committed by Jan Lindemann
commit e3a028d88f
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/defs.mk
View file

@ -681,8 +681,12 @@ ifeq ($(STRIP_SYMBOLS),true)
STRIP_DONE ?= strip.done STRIP_DONE ?= strip.done
endif endif
INCLUDE += $(LOCAL_INCLUDE) -I. $(PROJECT_INCLUDE) -I$(TOPDIR)/include INCLUDE += $(LOCAL_INCLUDE) -I.
ifeq ($(USE_PROJECT_LIB),true)
INCLUDE += $(PROJECT_INCLUDE) -I$(TOPDIR)/include
LIBFLAGS += -L$(BUILD_LIBDIR) LIBFLAGS += -L$(BUILD_LIBDIR)
endif
# -- use of supplementary libraries # -- use of supplementary libraries

2
make/exe.mk
View file

@ -15,7 +15,9 @@ debug: gdb
clean: execlean localclean profclean clean: execlean localclean profclean
ifeq ($(USE_PROJECT_LIB),true)
$(LIB_SO): $(LIB_A) $(LIB_SO): $(LIB_A)
$(EXE): $(LIB_SO) $(EXE): $(LIB_SO)
endif
all.dirs: all.dirs:

17
make/rules.mk
View file

@ -252,23 +252,20 @@ endif
ifeq ($(USE_PROJECT_LIB),true) ifeq ($(USE_PROJECT_LIB),true)
ifeq ($(LIBTYPE),shared) ifeq ($(LIBTYPE),shared)
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO) $(EXE) $(EXE_BIN): $(OBJ) $(LIB_SO)
else
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
endif
else
$(EXE) $(EXE_BIN): $(OBJ)
endif
$(CPP) $(sort $(OBJ)) $(LDFLAGS) -o $@
ifeq ($(USE_PROJECT_LIB),true)
ifeq ($(LIBTYPE),shared)
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LIB_SO) $(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LIB_SO)
else else
$(EXE) $(EXE_BIN): $(OBJ) $(LIB_A)
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LIB_A) $(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LIB_A)
endif endif
else else
$(EXE) $(EXE_BIN): $(OBJ)
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(PLUGIN) $(PLUGIN_LIB): $(OBJ)
endif endif
$(EXE) $(EXE_BIN):
$(CPP) $(sort $(OBJ)) $(LDFLAGS) -o $@
$(PLUGIN) $(PLUGIN_LIB):
$(CPP) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@ $(CPP) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@
# mkdir -p $(BUILD_LIBDIR) # mkdir -p $(BUILD_LIBDIR)
# install -m 755 $@ $(BUILD_LIBDIR) # install -m 755 $@ $(BUILD_LIBDIR)