Merge commit 'mhy/master' into merge

* commit 'mhy/master':
  add static target

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/tools/dsync-0.0/Makefile b/tools/dsync-0.0/Makefile
index 84d3bb2fc2b4af688746beaef8e362d8839f1fe4..d30b15630c060eed9af338cbed89d5db4f3bdded 100644 (file)
--- a/tools/dsync-0.0/Makefile
+++ b/tools/dsync-0.0/Makefile
@@ -12,6 +12,10 @@ all headers library clean veryclean binary program doc:
        $(MAKE) -C cmdline $@
        $(MAKE) -C doc $@
 
+static:
+       $(MAKE) -C libdsync
+       LDFLAGS="-static" $(MAKE) -C cmdline
+
 # Some very common aliases
 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
 maintainer-clean dist-clean distclean pristine sanity: veryclean

diff --git a/tools/dsync-0.0/buildlib/makefile.in b/tools/dsync-0.0/buildlib/makefile.in
index de2f70decb5ed8bbc95754853116acf623d045cb..3a9625733b9b4b40e5626b3bc6807d665a583159 100644 (file)
--- a/tools/dsync-0.0/buildlib/makefile.in
+++ b/tools/dsync-0.0/buildlib/makefile.in
@@ -14,9 +14,9 @@ BUILD:=$(shell pwd)
 export BUILD
 
 # Chain to the parent make to do the actual building
-.PHONY: headers library clean veryclean all binary program doc \
+.PHONY: headers library clean veryclean all binary program doc static \
         veryclean/local
-all headers library clean veryclean binary program doc:
+all headers library clean veryclean binary program doc static:
        $(MAKE) -C $(SRCDIR) -f Makefile $@
 
 # Purge everything.