[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.9-9-g5318914

X2go dev team git-admin at x2go.org
Fri Jan 27 13:34:42 CET 2012


The branch, master has been updated
       via  53189140add345ba89fda7dae4274b96a37daed8 (commit)
      from  6e50ee147551291fc4dc8cd8a8d9a9817da7f90b (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 -----------------------------------------------------------------
commit 53189140add345ba89fda7dae4274b96a37daed8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jan 27 13:34:37 2012 +0100

    Use $(MAKE) -C <subdir> calls to run Makefiles in subfolders.

-----------------------------------------------------------------------

Summary of changes:
 Makefile         |   74 ++++++++++++++++++++++++++---------------------------
 debian/changelog |    1 +
 2 files changed, 37 insertions(+), 38 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index e7efc9f..77ae676 100755
--- a/Makefile
+++ b/Makefile
@@ -6,51 +6,49 @@ build: build-arch build-indep
 
 # make man2html build available from project's base folder...
 build_man2html:
-	cd x2goserver && make $@
-	cd x2goserver-printing && make $@
-	cd x2goserver-compat && make $@
-	cd x2goserver-extensions && make $@
-	cd x2goserver-xsession && make $@
-	cd x2goserver-pyhoca && make $@
+	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-printing $@
+	$(MAKE) -C x2goserver-compat $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver-xsession $@
+	$(MAKE) -C x2goserver-pyhoca $@
 
 clean:
-	cd x2goserver && make $@
-	cd x2goserver-printing && make $@
-	cd x2goserver-compat && make $@
-	cd x2goserver-extensions && make $@
-	cd x2goserver-xsession && make $@
-	cd x2goserver-pyhoca && make $@
+	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-printing $@
+	$(MAKE) -C x2goserver-compat $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver-xsession $@
+	$(MAKE) -C x2goserver-pyhoca $@
 
 build-arch:
-	cd x2goserver && make $@
-	cd x2goserver-printing && make $@
-	cd x2goserver-compat && make $@
-	cd x2goserver-extensions && make $@
-	cd x2goserver-xsession && make $@
-	cd x2goserver-pyhoca && make $@
+	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-printing $@
+	$(MAKE) -C x2goserver-compat $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver-xsession $@
+	$(MAKE) -C x2goserver-pyhoca $@
 
 build-indep:
-	cd x2goserver && make $@
-	cd x2goserver-printing && make $@
-	cd x2goserver-compat && make $@
-	cd x2goserver-extensions && make $@
-	cd x2goserver-xsession && make $@
-	cd x2goserver-pyhoca && make $@
+	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-printing $@
+	$(MAKE) -C x2goserver-compat $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver-xsession $@
+	$(MAKE) -C x2goserver-pyhoca $@
 
 install:
-	cd x2goserver && make $@
-	cd x2goserver-printing && make $@
-	cd x2goserver-compat && make $@
-	cd x2goserver-extensions && make $@
-	cd x2goserver-xsession && make $@
-	cd x2goserver-pyhoca && make $@
+	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-printing $@
+	$(MAKE) -C x2goserver-compat $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver-xsession $@
+	$(MAKE) -C x2goserver-pyhoca $@
 
 uninstall:
-	cd x2goserver-extensions && make $@
-	cd x2goserver-compat && make $@
-	cd x2goserver-printing && make $@
-	cd x2goserver && make $@
-	cd x2goserver-xsession && make $@
-	cd x2goserver-pyhoca && make $@
-
-
+	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-printing $@
+	$(MAKE) -C x2goserver-compat $@
+	$(MAKE) -C x2goserver-extensions $@
+	$(MAKE) -C x2goserver-xsession $@
+	$(MAKE) -C x2goserver-pyhoca $@
diff --git a/debian/changelog b/debian/changelog
index f4e84ba..e98c271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x2goserver (3.0.99.10-0~x2go1) UNRELEASED; urgency=low
   [ Mike Gabriel ]
   * New upstream version (3.0.99.10):
     - Replace all string ,,X2Go.' with ,,X2Go''.
+    - Use $(MAKE) -C <subdir> calls to run Makefiles in subfolders.
   * x2goserver.postinst script leaves the DB file alone if
     a DB backend different from SQLite is configured. Thanks
     to Jochen Schulz for bringing this into awareness.


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

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 "x2goserver.git" (X2Go Server).




More information about the x2go-commits mailing list