Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE

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

View file

@ -1,15 +1,22 @@
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
# variables
#PROJ_H ?= $(PROJECT).h
SRC_H += $(PROJ_H)
SRC_H += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h)
# mandatory targets
all: $(PROJ_H)
clean: clean.include
install: install_HDR
# not wäry naaice
ifneq ($(HDRDIR_SCOPE_SUFFIX),)
install_HDR: dir_install_hdr_suffix.done
dir_install_hdr_suffix.done:
$(INSTALL) -d -o $(HDRDIROWNER) -g $(HDRDIRGROUP) -m $(HDRDIRMODE) $(INSTALL_HDRDIR)/$(HDRDIR_SCOPE_SUFFIX)
touch $@
endif
# convenience targets
project-header: $(PROJ_H)
@ -26,3 +33,10 @@ $(PROJ_H): $(filter-out $(PROJ_H) $(PROJECT)/$(PROJ_H),$(wildcard *.h $(PROJECT)
echo "#endif /* #ifndef _$(PROJECT_CAPNAME)_H */" >> $@.tmp
mv $@.tmp $@
install-links:
DEVELOPMENT=false make do-install-links
do-install-links:
@$(call install_links,HDR)
include $(MODDIR)/make/rules.mk