It is now possible to link header files instead of copying.

darcs-hash:20060628212516-f2ef6-ef1fafbb2611d985c3b6670408a945c7983860f5.gz

diff --git a/snippets/base b/snippets/base
index 8cce1a7848b216308a94a17fed7283fda34b5d58..4c1306ab62388890a36db26273d38e53392b43d7 100644 (file)
--- a/snippets/base
+++ b/snippets/base
@@ -80,7 +80,6 @@ ifneq ($(findstring s,$(MAKEFLAGS)),)
   OMK_SILENT = 1
 else
   QUIET_CMD_ECHO = echo
-  CP_FLAGS += -v
 endif
 
 # ===================================================================

diff --git a/snippets/include b/snippets/include
index 4f4a854ec33fd8db6c823dca28615bdaa917f4a8..5fab4ad69d4fb668c6d75cb20625c6b76b63638f 100644 (file)
--- a/snippets/include
+++ b/snippets/include
@@ -1,19 +1,32 @@
+# LN_HEADERS       .. if defined, header files are symbolicaly linked instead of copied.
+ifeq ($(OMK_VERBOSE),1)
+CPHEADER_FLAGS += -v
+LNHEADER_FLAGS += -v
+endif
+
+ifndef LN_HEADERS
+define cp_cmd
+cp $(CPHEADER_FLAGS) $(1) $(2)
+endef
+else
+define cp_cmd
+ln -sf $(LNHEADER_FLAGS) $(1) $(2)
+endef
+endif
 
 # TODO: Check modification date of changed header files. If it is
 # newer that in source dir, show a warning.
 
-# TODO: Optionaly link the files instead of copying
-
 # Syntax: $(call include-pass-template,<include dir>,<keyword>)
 define include-pass-template
        @$(foreach f, $($(2)_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(1)/$(notdir $(f)) \
-          || cp $(CPHEADER_FLAGS) $(SOURCES_DIR)/$(f) $(1)/$(notdir $(f)) || exit 1 ; )
+          || $(call cp_cmd,$(SOURCES_DIR)/$(f),$(1)/$(notdir $(f))) || exit 1 ; )
        @$(foreach f, $(nobase_$(2)_HEADERS), cmp --quiet $(SOURCES_DIR)/$(f) $(1)/$(f) \
-          || ( mkdir -p $(1)/$(dir $(f)) && cp $(CPHEADER_FLAGS) $(SOURCES_DIR)/$(f) $(1)/$(f) ) || exit 1 ; )
+          || ( mkdir -p $(1)/$(dir $(f)) && $(call cp_cmd,$(SOURCES_DIR)/$(f),$(1)/$(f)) ) || exit 1 ; )
        @$(foreach f, $(renamed_$(2)_HEADERS), \
           srcfname=`echo '$(f)' | sed -e 's/^\(.*\)->.*$$/\1/'` ; destfname=`echo '$(f)' | sed -e 's/^.*->\(.*\)$$/\1/'` ; \
           cmp --quiet $(SOURCES_DIR)/$${srcfname} $(1)/$${destfname} \
-          || ( mkdir -p `dirname $(1)/$${destfname}` && cp $(CPHEADER_FLAGS) $(SOURCES_DIR)/$${srcfname} $(1)/$${destfname} ) || exit 1 ; )
+          || ( mkdir -p `dirname $(1)/$${destfname}` && $(call cp_cmd $(SOURCES_DIR)/$${srcfname},$(1)/$${destfname}) ) || exit 1 ; )
 endef
 
 # Local Variables:

diff --git a/snippets/sysless b/snippets/sysless
index dd19fbdb4f63903796c95b9ec29d4c59f8b85230..b7929008ec41ae42d7b82a9dd6ac0310003fb9e4 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -227,7 +227,7 @@ install-local:
 include-pass-local:
        $(call include-pass-template,$(USER_INCLUDE_DIR),include)
        @$(foreach f, $(lib_LDSCRIPTS), cmp --quiet $(SOURCES_DIR)/$(f) $(USER_LIB_DIR)/$(notdir $(f)) \
-          || cp $(CP_FLAGS) $(SOURCES_DIR)/$(f) $(USER_LIB_DIR)/$(notdir $(f)) || exit 1 ; )
+          || $(call cp_cmd,$(SOURCES_DIR)/$(f),$(USER_LIB_DIR)/$(notdir $(f))) || exit 1 ; )
 
 
 .PHONY: clean-custom