nxcomp*, nxproxy: Fix clean-up of source tree via Makefile.in templates.

  024_fix-make-clean.full.patch
  024_fix-make-clean.full+lite.patch

8 files changed, 12 insertions, 78 deletions

diff --git a/debian/patches/024_fix-make-clean.full+lite.patch b/debian/patches/024_fix-make-clean.full+lite.patch
deleted file mode 100644
index 7f0b327cf..000000000
--- a/debian/patches/024_fix-make-clean.full+lite.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: fix clean rule in nxcomp's Makefile.in
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- 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
deleted file mode 100644
index 356ce47d8..000000000
--- a/debian/patches/024_fix-make-clean.full.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/series b/debian/patches/series
index 70c573c38..63bc3dc43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-024_fix-make-clean.full.patch
-024_fix-make-clean.full+lite.patch
 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
 026_nxcompext_honour-optflags.full.patch
 026_nxcomp_honour-optflags.full+lite.patch
diff --git a/nx-X11/Makefile b/nx-X11/Makefile
index 3aefb7974..7c4090a95 100644
--- a/nx-X11/Makefile
+++ b/nx-X11/Makefile
@@ -138,6 +138,7 @@ Makefile::
 
 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 @@ World.OS2:
 # 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) $@
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in
index d291c3967..1be928167 100644
--- a/nxcomp/Makefile.in
+++ b/nxcomp/Makefile.in
@@ -313,4 +313,4 @@ clean:
 
 distclean:	clean
 		-rm -rf autom4te.cache config.status config.log \
-		config.cache depend.status Makefile tags
+		config.cache depend.status Makefile tags configure
diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in
index 51bc06ed2..9fd2c7d7d 100644
--- a/nxcompext/Makefile.in
+++ b/nxcompext/Makefile.in
@@ -185,5 +185,5 @@ clean:
 		@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
diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in
index 26a92bdce..00bca25c9 100644
--- a/nxcompshad/Makefile.in
+++ b/nxcompshad/Makefile.in
@@ -222,4 +222,4 @@ clean:
 		$(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/nxproxy/Makefile.in b/nxproxy/Makefile.in
index 5d78972b9..c00df91dc 100644
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -109,4 +109,4 @@ clean:
 		$(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