[X2Go-Commits] nx-libs.git - build-main (branch) updated: redist-client/3.5.0.10-2-gf4ef296

X2Go dev team git-admin at x2go.org
Fri Aug 30 16:23:19 CEST 2013


The branch, build-main has been updated
       via  f4ef2967b1495e5d9577a94610ee0be3e89ab870 (commit)
      from  a751baaab83cc58245632e8fdb406e0b059810da (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +-
 .../patches/001_add-main-makefile.full+lite.patch  |   53 ++++++++++----------
 2 files changed, 27 insertions(+), 28 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index eb3a582..c56632c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
 
-  * Continue development...
+  * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 07 Feb 2012 13:48:19 +0100
 
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 533ce7e..2d35e82 100644
--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 Last-Update: 2011-12-31
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,42 @@
 +#!/usr/bin/make -f
 +
 +all: build
@@ -13,39 +13,38 @@ Last-Update: 2011-12-31
 +build: build-arch build-indep
 +
 +clean:
-+	test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true
-+	test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true
-+	test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true
-+	test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true
-+	test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true
-+
++	-make -C nx-X11 $@
++	-make -C nxcomp $@
++	-make -C nxcompext $@
++	-make -C nxcompshad $@
++	-make -C nxproxy $@
 +
 +distclean:
-+	test -d nx-X11 && cd nx-X11 && test -f Makefile && make $@ || true
-+	test -d nxcomp && cd nxcomp && test -f Makefile && make $@ || true
-+	test -d nxcompext && cd nxcompext && test -f Makefile && make $@ || true
-+	test -d nxcompshad && cd nxcompshad && test -f Makefile && make $@ || true
-+	test -d nxproxy && cd nxproxy && test -f Makefile && make $@ || true
++	-make -C nx-X11 $@
++	-make -C nxcomp $@
++	-make -C nxcompext $@
++	-make -C nxcompshad $@
++	-make -C nxproxy $@
 +
 +build-arch:
-+	test -d nxcomp && cd nxcomp && autoconf
-+	test -d nxcompext && cd nxcompext && autoconf
-+	test -d nxcompshad && cd nxcompshad && autoconf
-+	test -d nx-X11 && cd nx-X11 && make World
-+	test -d nxproxy && cd nxproxy && autoconf && ./configure && make
++	cd nxcomp && autoconf && ./configure && make
++	-cd nxcompext && autoconf && ./configure && make
++	-cd nxcompshad && autoconf && ./configure && make
++	-cd nx-X11 && make World && ./configure && make
++	cd nxproxy && autoconf && ./configure && make
 +
 +build-indep:
 +
 +install:
-+	test -d nxcomp && cd nxcomp && make install
-+	test -d nxcompext && cd nxcompext && make install
-+	test -d nxcompshad && cd nxcompshad && make install
-+	test -d nx-X11 && cd nx-X11 && make install
-+	test -d nxproxy && cd nxproxy && make install
++	-make -C nx-X11 $@
++	-make -C nxcomp $@
++	-make -C nxcompext $@
++	-make -C nxcompshad $@
++	-make -C nxproxy $@
 +
 +uninstall:
-+	test -d nxcomp && cd nxcomp && make uninstall
-+	test -d nxcompext && cd nxcompext && make uninstall
-+	test -d nxcompshad && cd nxcompshad && make uninstall
-+	test -d nx-X11 && cd nx-X11 && make uninstall
-+	test -d nxproxy && cd nxproxy && make uninstall
++	-make -C nx-X11 $@
++	-make -C nxcomp $@
++	-make -C nxcompext $@
++	-make -C nxcompshad $@
++	-make -C nxproxy $@


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).




More information about the x2go-commits mailing list