diff --git a/make/rules.mk b/make/rules.mk index 7e5e5d9b..5da344f0 100644 --- a/make/rules.mk +++ b/make/rules.mk @@ -147,6 +147,12 @@ strip.done: $(EXE_ALL) %.done: make -$(MAKEFLAGS) -C $(shell dirname $@) `basename $@` +.%.o.dep.mk: %.cpp $(BUILD_HDR) + $(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + +.%.o.dep.mk: %.c $(BUILD_HDR) + $(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ + ifeq ($(LIBTYPE),shared) lib%.so: %.o # $(LIB_SO) $(LD) -shared $(LDFLAGS) $^ -o $@ @@ -208,8 +214,8 @@ else $(PLUGIN) $(PLUGIN_LIB): $(OBJ) endif $(CPP) -shared $(sort $(OBJ)) $(LDFLAGS) -o $@ - mkdir -p $(BUILD_LIBDIR) - install -m 755 $@ $(BUILD_LIBDIR) +# mkdir -p $(BUILD_LIBDIR) +# install -m 755 $@ $(BUILD_LIBDIR) define check_not_empty check_not_empty_$(1): @@ -256,6 +262,12 @@ $(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(ty $(LINKS_SO): cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@) +ifeq ($(DEVELOPMENT),true) +install_profile_path: +else +install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT) +endif + $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done echo "if [ -z \"\$$PATH\" ]; then PATH=$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%)" > path_script.sh echo "else PATH=\$$PATH:$(shell echo $(INSTALL_EXEDIR) | sed -e s%^$(ENV_PREFIX)/%/%); fi" >> path_script.sh @@ -268,23 +280,4 @@ $(INSTALLED_VERSION_FILE): $(SYSCONFIG_DIR)/%: % $(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@ -ifeq ($(DEVELOPMENT),true) -install_profile_path: -else -install_profile_path: $(INSTALLED_PROFILE_PATH_SCRIPT) -endif - -#depend.mk: $(SRC_ALL_CPP) -# > $@ && makedepend -f depend.mk -- $(CPPFLAGS) $(DEPEND_CPPFLAGS) -- $(SRC_ALL_CPP) 2>&1 | sed '/non-portable whitespace/ d' - -#depend.mk: $(filter-out %.h, $(SRC_ALL_CPP) $(PREREQ_DONE)) -# > $@ && if [ "$(wildcard *.cpp *.c)" ]; then \ -# gcc -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $(filter-out %.h,$(SRC_ALL_CPP)) -o $@; \ -# fi - -.%.o.dep.mk: %.cpp $(BUILD_HDR) - $(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ - -.%.o.dep.mk: %.c $(BUILD_HDR) - $(CC) -M $(CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@