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

rules.mk: Code cleanup

Browse source 
- Remove dead code
- General beautification
- Remove $(TOPDIR)/dir_install_XXX.done
This commit is contained in:
Jan Lindemann 2012-04-28 14:34:35 +00:00 • committed by Jan Lindemann
commit 4ce715b6e0
1 changed files with 6 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

42
make/rules.mk
View file

@ -163,7 +163,10 @@ trace-marks:
cp $$f.rep $$f ;\ cp $$f.rep $$f ;\
done done
core-pattern:
echo core.%e.%p | sudo tee /proc/sys/kernel/core_pattern
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
ldd: ldd:
ifneq ($(wildcard *.so),) ifneq ($(wildcard *.so),)
@echo "======= libraries:" @echo "======= libraries:"
@ -188,9 +191,6 @@ strip.done: $(EXE_ALL)
$(STRIP) $^ $(STRIP) $^
touch $@ touch $@
#%.done:
# make -$(MAKEFLAGS) -C $(shell dirname $@) `basename $@`
.%.o.dep.mk: %.cpp $(BUILD_HDR) .%.o.dep.mk: %.cpp $(BUILD_HDR)
$(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@ $(CC) -M $(BUILD_CPPFLAGS) $(DEPEND_CPPFLAGS) $< -o $@
@ -278,15 +278,8 @@ check_not_empty_$(1):
fi fi
endef endef
#$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\ # --- special installation rules, that the general rules farther down
# $(eval $(call std_install_rules,$(type)$(attr))))) # below don't catch for whatever reason >
# --- special installation rules, that the general rules below doesn't catch
# for whatever reason >
%: %.init
cp $< $@
# don't know why %: %.init from above doesn't remake %
$(INSTALL_INITDIR)/%: %.init | install_dir_INIT $(INSTALL_INITDIR)/%: %.init | install_dir_INIT
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@ $(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
@ -299,26 +292,11 @@ $(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | install_dir_RSYSLOG
$(INSTALL_RSYSLOGDIR)/%.bprof: rsyslog-%.bprof | install_dir_RSYSLOG $(INSTALL_RSYSLOGDIR)/%.bprof: rsyslog-%.bprof | install_dir_RSYSLOG
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@ $(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@
%: %.sysconf $(INSTALL_SYSCFGDIR)/%: %.sysconf | install_dir_SYSCFG
cp $< $@
# don't know why %: %.sysconf from above doesn't remake %
$(INSTALL_SYSCFGDIR)/%: %.sysconf | $(INSTALL_SYSCFGDIR)
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@ $(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
# --- special installation rules < # --- special installation rules <
#build_dir_$(1): $$(TOPDIR)/dir_build_$(1).done
# old prereq $$(TOPDIR)/dir_install_$(1).done
#$$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done check_not_empty_$(1)MODE
#$$(TOPDIR)/dir_install_$(1).done:
# #@if [ -n "$$(INSTALL_$(1)DIR)" ]; then \
# # $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$< ;\
# # echo $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$< ;\
# #fi
# touch $$@
define std_install_rules define std_install_rules
build_$(1): $$(TOPDIR)/dir_build_$(1).done $$(BUILD_$(1)) build_$(1): $$(TOPDIR)/dir_build_$(1).done $$(BUILD_$(1))
@ -336,10 +314,6 @@ $$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done
rm -f $$(TOPDIR)/dirs-*.done ;\ rm -f $$(TOPDIR)/dirs-*.done ;\
fi fi
$$(TOPDIR)/dir_install_$(1).done:
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR)
touch $$@
$$(INSTALL_$(1)DIR): $$(INSTALL_$(1)DIR):
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR)
@ -364,7 +338,3 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
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
$(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@ $(INSTALL) -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
core-pattern:
echo core.%e.%p | sudo tee /proc/sys/kernel/core_pattern
#$(SYSCFG_DIR)/%: %
# $(INSTALL) -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@