[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-47-gfecfb1e

X2Go dev team git-admin at x2go.org
Tue Sep 18 21:25:17 CEST 2012


The branch, master has been updated
       via  fecfb1e366a6c83a79e160cf469b9898963cf6a9 (commit)
      from  cbebebc2e846bdc7d1f2a699708804c4829ddaad (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 fecfb1e366a6c83a79e160cf469b9898963cf6a9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Sep 18 21:25:12 2012 +0200

    follow-up commit, call Makefile in x2goserver-common from main Makefile

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

Summary of changes:
 Makefile |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 41a508f..c96b24f 100755
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,7 @@ build: build-arch build-indep
 
 # make man2html build available from project's base folder...
 build_man2html:
+	$(MAKE) -C x2goserver-common $@
 	$(MAKE) -C x2goserver $@
 	$(MAKE) -C libx2go-server-db-perl $@
 	$(MAKE) -C x2goserver-printing $@
@@ -29,6 +30,7 @@ build_man2html:
 
 clean:
 	-$(MAKE) -f Makefile.perl clean
+	$(MAKE) -C x2goserver-common $@
 	$(MAKE) -C x2goserver $@
 	$(MAKE) -C libx2go-server-db-perl $@
 	$(MAKE) -C x2goserver-printing $@
@@ -40,6 +42,7 @@ clean:
 
 distclean:
 	-$(MAKE) -f Makefile.perl realclean
+	$(MAKE) -C x2goserver-common clean
 	$(MAKE) -C x2goserver clean
 	$(MAKE) -C libx2go-server-db-perl clean
 	$(MAKE) -C x2goserver-printing clean
@@ -50,6 +53,7 @@ distclean:
 	$(MAKE) -C x2goserver-pyhoca clean
 
 build-arch:
+	$(MAKE) -C x2goserver-common $@
 	$(MAKE) -C x2goserver $@
 	$(MAKE) -C libx2go-server-db-perl $@
 	$(MAKE) -C x2goserver-printing $@
@@ -62,6 +66,7 @@ build-arch:
 build-indep:
 	$(PERL) Makefile.PL INSTALLDIRS=$(PERL_INSTALLDIRS)
 	$(MAKE) -f Makefile.perl
+	$(MAKE) -C x2goserver-common $@
 	$(MAKE) -C x2goserver $@
 	$(MAKE) -C libx2go-server-db-perl $@
 	$(MAKE) -C x2goserver-printing $@
@@ -73,6 +78,7 @@ build-indep:
 
 install:
 	$(MAKE) -f Makefile.perl install
+	$(MAKE) -C x2goserver-common $@
 	$(MAKE) -C x2goserver $@
 	$(MAKE) -C libx2go-server-db-perl $@
 	$(MAKE) -C x2goserver-printing $@
@@ -92,6 +98,7 @@ uninstall:
 	$(MAKE) -f Makefile.perl uninstall
 	$(MAKE) -C libx2go-server-db-perl $@
 	$(MAKE) -C x2goserver $@
+	$(MAKE) -C x2goserver-common $@
 	if test -d $(DESTDIR)$(LIBDIR); then $(RM_DIR) $(DESTDIR)$(LIBDIR); fi
 	if test -d $(DESTDIR)$(SHAREDIR)/x2gofeature.d; then $(RM_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d; fi
 	if test -d $(DESTDIR)$(SHAREDIR); then $(RM_DIR) $(DESTDIR)$(SHAREDIR); fi


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