diff --git a/make/defs.mk b/make/defs.mk index 26cf1f3c..8bc449e3 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -681,8 +681,12 @@ ifeq ($(STRIP_SYMBOLS),true) STRIP_DONE ?= strip.done 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) +endif # -- use of supplementary libraries diff --git a/make/exe.mk b/make/exe.mk index e0300744..22cea60d 100644 --- a/make/exe.mk +++ b/make/exe.mk @@ -15,7 +15,9 @@ debug: gdb clean: execlean localclean profclean +ifeq ($(USE_PROJECT_LIB),true) $(LIB_SO): $(LIB_A) $(EXE): $(LIB_SO) +endif all.dirs: diff --git a/make/rules.mk b/make/rules.mk index 30d6a542..9ebdd015 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -252,23 +252,20 @@ endif ifeq ($(USE_PROJECT_LIB),true) ifeq ($(LIBTYPE),shared) $(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) else + $(EXE) $(EXE_BIN): $(OBJ) $(LIB_A) $(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(LIB_A) endif else + $(EXE) $(EXE_BIN): $(OBJ) $(PLUGIN) $(PLUGIN_LIB): $(OBJ) endif + +$(EXE) $(EXE_BIN): + $(CPP) $(sort $(OBJ)) $(LDFLAGS) -o $@ + +$(PLUGIN) $(PLUGIN_LIB): $(CPP) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@ # mkdir -p $(BUILD_LIBDIR) # install -m 755 $@ $(BUILD_LIBDIR)