Add patches: 024_fix-make-clean.full.patch, 024_fix-make-clean.full+lite.patch. Fix clean-up of build tree after make build has run.

6 files changed, 83 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 5462b6cc6..bde750b15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ nx-libs (2:3.5.0.16-0) UNRELEASED; urgency=low
   * Add patch: 032_no-x11r6.debian.patch. Use /usr/lib/nx for nx-X11 on Debian.
   * Drop patch 032, fix other patches so that installation via make install
     installs NX components to /usr/local/lib/nx and /usr/local/include/nx.
+  * Add patches: 024_fix-make-clean.full.patch,
+    024_fix-make-clean.full+lite.patch. Fix clean-up of build tree after
+    make build has run.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 21 Sep 2012 10:06:54 +0200
 
diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/024_fix-make-clean.full+lite.patch
new file mode 100644
index 000000000..74d52d785
--- /dev/null
+++ b/debian/patches/024_fix-make-clean.full+lite.patch
@@ -0,0 +1,16 @@
+--- a/nxcomp/Makefile.in
++++ b/nxcomp/Makefile.in
+@@ -313,4 +313,4 @@
+ 
+ distclean:	clean
+ 		-rm -rf autom4te.cache config.status config.log \
+-		config.cache depend.status Makefile tags
++		config.cache depend.status Makefile tags configure
+--- a/nxproxy/Makefile.in
++++ b/nxproxy/Makefile.in
+@@ -109,4 +109,4 @@
+ 		$(PROGRAM) $(PROGRAM).exe $(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE)
+ 
+ distclean:	clean
+-		-rm -f config.status config.log config.cache depend.status Makefile tags
++		-rm -rf autom4te.cache config.status config.log config.cache depend.status Makefile tags configure
diff --git a/debian/patches/024_fix-make-clean.full.patch b/debian/patches/024_fix-make-clean.full.patch
new file mode 100644
index 000000000..356ce47d8
--- /dev/null
+++ b/debian/patches/024_fix-make-clean.full.patch
@@ -0,0 +1,51 @@
+Description: Provide main Makefile for whole source tree
+ By design this patch is not needed to be sent upstream.
+Forwarded: not-needed
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Last-Update: 2012-10-19
+--- a/nx-X11/Makefile
++++ b/nx-X11/Makefile
+@@ -138,6 +138,7 @@
+ 
+ xmakefile: Imakefile
+ 	$(RM) xmakefile
++	@rm -f $(IRULESRC)/date.def; echo "" > $(IRULESRC)/date.def;
+ 	$(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
+ 
+ World.Win32:
+@@ -197,11 +198,16 @@
+ # a copy of every rule that might be invoked at top level
+ 
+ clean:
+-	    $(MAKE_CMD) $@
++	    -$(MAKE_CMD) $@
++	    find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
++	    find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
++	    find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
++	    find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
++	    rm -f config/cf/{version.def,date.def}
+ dangerous_strip_clean:
+ 	    $(MAKE_CMD) $@
+ distclean:
+-	    $(MAKE_CMD) $@
++	    -$(MAKE_CMD) $@
+ 	    $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
+ depend:
+ 	    $(MAKE_CMD) $@
+--- a/nxcompext/Makefile.in
++++ b/nxcompext/Makefile.in
+@@ -185,5 +185,5 @@
+ 		@ALL@
+ 
+ distclean:	clean
+-		-rm -rf autom4te.cache config.status config.log \
++		-rm -rf autom4te.cache config.status config.log configure \
+ 		config.cache depend.status Makefile tags
+--- a/nxcompshad/Makefile.in
++++ b/nxcompshad/Makefile.in
+@@ -222,4 +222,4 @@
+ 		$(LIBFULL) $(LIBLOAD) $(LIBSHARED) $(LIBARCHIVE) $(LIBDLL) $(LIBDLLSTATIC) $(PROGRAM) $(PROGRAM).exe
+ 
+ distclean:	clean
+-		-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache
++		-rm -rf config.status config.log config.cache depend.status Makefile tags autom4te.cache configure 
diff --git a/debian/patches/031_nx-X11_parallel-make.full.patch b/debian/patches/031_nx-X11_parallel-make.full.patch
index 9f754d767..049b2130f 100644
--- a/debian/patches/031_nx-X11_parallel-make.full.patch
+++ b/debian/patches/031_nx-X11_parallel-make.full.patch
@@ -65,7 +65,7 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
  	@echo ""
  	@date
  	@echo ""
-@@ -153,15 +153,15 @@
+@@ -154,15 +154,15 @@
  	-if exist xmakefile.bak del xmakefile.bak
  	-if exist xmakefile ren xmakefile xmakefile.bak
  	$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
@@ -87,18 +87,23 @@ Last-Update: 2012-01-26 22:29:13.993994227 +0100
  	@echo :
  	@echo :
  	@echo Full build of $(RELEASE) complete.
-@@ -197,33 +197,33 @@
+@@ -198,38 +198,38 @@
  # a copy of every rule that might be invoked at top level
  
  clean:
--	    $(MAKE_CMD) $@
-+	    ${MAKE} ${MAKE_OPTS} $@
+-	    -$(MAKE_CMD) $@
++	    -${MAKE_CMD} ${MAKE_OPTS} $@
+ 	    find config -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+ 	    find lib -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+ 	    find programs -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+ 	    find include -type f | egrep '.*/Makefile$$' | while read makefile; do rm -f $$makefile; done
+ 	    rm -f config/cf/{version.def,date.def}
  dangerous_strip_clean:
 -	    $(MAKE_CMD) $@
 +	    ${MAKE} ${MAKE_OPTS} $@
  distclean:
--	    $(MAKE_CMD) $@
-+	    ${MAKE} ${MAKE_OPTS} $@
+-	    -$(MAKE_CMD) $@
++	    -${MAKE} ${MAKE_OPTS} $@
  	    $(RM) xmakefile $(IRULESRC)/version.def $(IRULESRC)/date.def
  depend:
 -	    $(MAKE_CMD) $@
diff --git a/debian/patches/series b/debian/patches/series
index 2b961f29b..91e54d30d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,6 +22,8 @@
 021_add-nxauth-wrapper.full.patch
 022_add-nxproxy-wrapper.full+lite.patch
 023_add-x2goagent-wrapper.full.patch
+024_fix-make-clean.full.patch
+024_fix-make-clean.full+lite.patch
 030_nx-X11_configure-args.full.patch
 031_nx-X11_parallel-make.full.patch
 051_nxcomp_macos105-fdisset.full+lite.patch
diff --git a/debian/rules b/debian/rules
index a5ac09e06..36401ef55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,6 @@ override_dh_auto_clean:
 	LD_LIBRARY_PATH=`pwd`/debian/libnx-x11/usr/lib/nx/X11:$$LD_LIBRARY_PATH dh_auto_clean
 
 override_dh_clean:
-	rm -f nxcomp/configure
-	rm -f nxcompext/configure
-	rm -f nxcompshad/configure
 	rm -f nx-X11/changelog
 	rm -f nxcomp/changelog
 	rm -f nxcompext/changelog