[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.0.0-14-g756e2fc

X2go dev team git-admin at x2go.org
Wed Oct 12 11:10:39 CEST 2011


The branch, master has been updated
       via  756e2fc2ca76a46d69883ab4cdd999d0102a2ac1 (commit)
      from  b4ee8079b4f3f0fbf1d1dfd1b701238aace7f4fe (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 756e2fc2ca76a46d69883ab4cdd999d0102a2ac1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 12 11:10:36 2011 +0200

    Add build_man/clean_man stanzas to Makefile. Do not run man2html from rules file anymore.

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

Summary of changes:
 Makefile          |    7 +++++--
 Makefile.man2html |    8 +++++++-
 debian/changelog  |    2 ++
 debian/rules      |    4 ----
 4 files changed, 14 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/Makefile b/Makefile
index b4a5c6d..57ca900 100755
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ MOZPLUGDIR=$(PREFIX)/lib/mozilla/plugins
 
 all: build
 
-build: build_client build_plugin
+build: build_client build_plugin build_man
 
 build_client:
 	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && qmake-qt4 ../x2goclient.pro
@@ -35,6 +35,9 @@ build_plugin:
 	mkdir -p $(PLUGIN_DIR) && cd $(PLUGIN_DIR) && X2GO_CLIENT_TARGET=plugin qmake-qt4 ../x2goclient.pro
 	cd $(PLUGIN_DIR) && $(MAKE)
 
+build_man:
+	make -f Makefile.man2html build
+
 clean: clean_client clean_plugin clean_man
 	find . -type f -name '*.o' -exec rm -vf {} +
 	find . -type f -name 'moc_*.cpp' -exec rm -vf {} +
@@ -50,7 +53,7 @@ clean_plugin:
 	rm -fr $(PLUGIN_DIR)
 
 clean_man:
-	rm -Rfv .build_man2html
+	make -f Makefile.man2html clean
 
 install: install_client install_plugin install_man
 
diff --git a/Makefile.man2html b/Makefile.man2html
index 0b9f91d..97af6fe 100644
--- a/Makefile.man2html
+++ b/Makefile.man2html
@@ -2,7 +2,8 @@
 
 MAN2HTML_BIN = man2html
 MAN2HTML_SRC   = man
-MAN2HTML_DEST = .build_man2html/html
+BUILD_DIR = .build_man2html
+MAN2HTML_DEST = $(BUILD_DIR)/html
 
 man_pages = `cd $(MAN2HTML_SRC) && find * -type f`
 
@@ -14,3 +15,8 @@ build_man2html:
 	mkdir -p $(MAN2HTML_DEST)
 	for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
 	for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+
+clean: clean_man2html
+
+clean_man2html:
+	rm -Rf $(BUILD_DIR)
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index a14b5df..01960f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ x2goclient (3.99.0.1-0~x2go1) UNRELEASED; urgency=low
     - Set TCP_NODELAY (equals: turn Nagle off) for SSH graphical port forwarding
       tunnel.
     - Include cups/ppd.h in cupsprint.h, fixes build on Debian wheezy/sid.
+    - Add build_man/clean_man stanzas to Makefile.
   * Explicitly use source format 3.0 (native).
   * Build-depend on libssh-dev (>=0.4.7).
   * Update menu file in /debian folder (rename title to ,,X2go Client (Qt)'').
+  * Do not run man2html from rules file anymore.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 26 Jul 2011 14:37:20 +0200
 
diff --git a/debian/rules b/debian/rules
index 9605613..d82f357 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,6 @@ override_dh_auto_build:
 	mkdir -p .build_doxygen/man
 	doxygen
 
-override_dh_installdocs:
-	make -f Makefile.man2html build
-	dh_installdocs
-
 override_dh_auto_install:
 
 override_dh_auto_clean:


hooks/post-receive
-- 
x2goclient.git (X2go Client)

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 "x2goclient.git" (X2go Client).




More information about the x2go-commits mailing list