janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 15:23:54 +01:00
Code Activity

rules.mk: Beautification

Browse source
This commit is contained in:
Jan Lindemann 2007-08-22 12:20:16 +00:00 • committed by Jan Lindemann
commit b80f5c6b6f
1 changed files with 14 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

35
make/rules.mk
View file

@ -147,6 +147,12 @@ strip.done: $(EXE_ALL)
%.done: %.done:
make -$(MAKEFLAGS) -C $(shell dirname $@) `basename $@` 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) ifeq ($(LIBTYPE),shared)
lib%.so: %.o # $(LIB_SO) lib%.so: %.o # $(LIB_SO)
$(LD) -shared $(LDFLAGS) $^ -o $@ $(LD) -shared $(LDFLAGS) $^ -o $@
@ -208,8 +214,8 @@ else
$(PLUGIN) $(PLUGIN_LIB): $(OBJ) $(PLUGIN) $(PLUGIN_LIB): $(OBJ)
endif endif
$(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)
define check_not_empty define check_not_empty
check_not_empty_$(1): check_not_empty_$(1):
@ -256,6 +262,12 @@ $(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(ty
$(LINKS_SO): $(LINKS_SO):
cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@) 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 $(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 "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 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)/%: % $(SYSCONFIG_DIR)/%: %
$(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@ $(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 $@