janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 06:30:38 +01:00
Code Activity

Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE

Browse source
This commit is contained in:
Jan Lindemann 2011-02-20 14:15:22 +00:00 • committed by Jan Lindemann
commit 2939f8e3a8
29 changed files with 743 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

71
make/rules.mk
View file

@ -162,10 +162,6 @@ trace-marks:
ifneq ($(TARGET),mingw)
ldd:
ifneq ($(wildcard *.o),)
@echo "======= objects:"
@for o in *.o; do echo "------- $$o"; ldd $$o; done
endif
ifneq ($(wildcard *.so),)
@echo "======= libraries:"
@for o in *.so; do echo "------- $$o"; ldd $$o; done
@ -279,12 +275,36 @@ check_not_empty_$(1):
fi
endef
INSTALLATION_FILE_TYPES += LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG \
SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT RSYSLOG CRONTAB
INSTALLATION_FILE_TYPES += LIB HDR EXE INIT DOC PROFILE MAKE CFG \
SYSCFG IMG LOG JAVA LD_CONF CGI LOGROT RSYSLOG CRONTAB HTML
#$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
# $(eval $(call std_install_rules,$(type)$(attr)))))
# --- special installation rules, that the general rules below dont catch
# for whatever reason >
%: %.init
cp $< $@
# don't know why %: %.init from above doesn't remake %
$(INSTALL_INITDIR)/%: %.init | $(INSTALL_INITDIR)
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
$(INSTALL_LOGROTDIR)/%: %.logrotate | $(INSTALL_LOGROTDIR)
$(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@
$(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog | $(INSTALL_RSYSLOGDIR)
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@
%: %.sysconf
cp $< $@
# don't know why %: %.sysconf from above doesn't remake %
$(INSTALL_SYSCFGDIR)/%: %.sysconf | $(INSTALL_SYSCFGDIR)
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
# --- special installation rules <
define std_install_rules
#build_dir_$(1): $$(TOPDIR)/dir_build_$(1).done
@ -304,43 +324,24 @@ $$(BUILD_$(1)DIR)/%: % $$(TOPDIR)/dir_build_$(1).done
fi
$$(TOPDIR)/dir_install_$(1).done:
@if [ -n "$$(INSTALL_$(1)DIR)" ]; then \
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) ;\
echo $$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$(INSTALL_$(1)DIR) ;\
fi
#@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 $$@
$$(INSTALL_$(1)DIR)/%: % $$(TOPDIR)/dir_install_$(1).done
$$(INSTALL_$(1)DIR):
$$(INSTALL) -d -o $$($(1)DIROWNER) -g $$($(1)DIRGROUP) -m $$($(1)DIRMODE) $$@
# old prereq $$(TOPDIR)/dir_install_$(1).done
$$(INSTALL_$(1)DIR)/%: % | $$(INSTALL_$(1)DIR)
$$(INSTALL) -o $$($(1)OWNER) -g $$($(1)GROUP) -m $$($(1)MODE) $$< $$@
endef
$(foreach type, $(INSTALLATION_FILE_TYPES), $(eval $(call std_install_rules,$(type))))
# ---
# doesn't work, dunno why
%: %.init
cp $< $@
# don't know why %: %.init from above doesn't remake %
$(INSTALL_INITDIR)/%: %.init
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
$(INSTALL_LOGROTDIR)/%: %.logrotate
$(INSTALL) -o $(LOGROTOWNER) -g $(LOGROTGROUP) -m $(LOGROTMODE) $< $@
$(INSTALL_RSYSLOGDIR)/%.conf: %.rsyslog
$(INSTALL) -o $(RSYSLOGOWNER) -g $(RSYSLOGGROUP) -m $(RSYSLOGMODE) $< $@
%: %.sysconf
cp $< $@
# don't know why %: %.sysconf from above doesn't remake %
$(INSTALL_SYSCFGDIR)/%: %.sysconf
$(INSTALL) -o $(INITOWNER) -g $(INITGROUP) -m $(INITMODE) $< $@
# ---
$(sort $(LINKS_SO)):
cd $(dir $@); ln -sf $(shell echo $@ | sed -e 's/\.so$$\|\.so.*$$//').$(SO_SUFFIX) $(notdir $@)