Unified installation of includes.

diff --git a/build/install-includes b/build/install-includes
index 1bf324834fd23e1fbdb61cbd4d6086cd710bfad7..33e2c9a9ffb15679d2f874313d9eb46063eb4622 100755 (executable)
--- a/build/install-includes
+++ b/build/install-includes
@@ -8,7 +8,7 @@ DEST=$2
 shift 2
 while [ -n "$1" ] ; do
        if [ "$SRC/$1" -nt "$DEST/$1" ] ; then
-               echo "Copying $SRC/$1 to $DEST/$1"
+               echo "INC $SRC/$1 -> $DEST/$1"
                mkdir -p $DEST/`dirname $1`
                cp $SRC/$1 $DEST/$1
        fi

diff --git a/charset/Makefile b/charset/Makefile
index dc8f46810554bc6923d4e875473f04f463b46728..4f3f45b45ed6bb4f73e009b0eb060504fec07295 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -10,8 +10,7 @@ $(o)/charset/libcharset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARS
 
 INCLUDES+=$(o)/charset/.include-stamp
 $(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
-       $(s)/build/install-includes $(s)/charset run/include/charset $(?F)
-       touch $(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: IDST=charset
 
 build_charsets:
        cd $(s)/charset && sh misc/generate

diff --git a/images/Makefile b/images/Makefile
index c089123a2b5fd783fda5a6a2b48b6daf72a95f15..31155edf62378aafce299e5f65bd52a730dd15ee 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -85,5 +85,4 @@ $(o)/images/color.test: $(o)/images/color-t
 
 INCLUDES+=$(o)/images/.include-stamp
 $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
-       $(s)/build/install-includes $(s)/images run/include/images $(?F)
-       touch $(o)/images/.include-stamp
+$(o)/images/.include-stamp: IDST=images

diff --git a/lib/Makefile b/lib/Makefile
index 08fe41b2a0db90bae2c18ad2d73485e1bd22cd41..9826060020193acfe6b2c30e5b57fe735c6e0311 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -114,9 +114,7 @@ $(o)/lib/getopt.test: $(o)/lib/getopt-t
 
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-       $(s)/build/install-includes $(s)/lib run/include/lib $(?F)
-       $(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
-       touch $(o)/lib/.include-stamp
+$(o)/lib/.include-stamp: IDST=lib
 
 ifdef CONFIG_UCW_PERL
 include $(s)/lib/perl/Makefile