[X2Go-Commits] [nx-libs] 16/29: nxcomp*, nxproxy: Fix clean-up of source tree via Makefile.in templates.
git-admin at x2go.org
git-admin at x2go.org
Tue Feb 10 05:21:44 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 236ee4ffa8e4fa92bb748301986307841ef060ab
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 9 15:16:30 2015 +0100
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
---
debian/patches/024_fix-make-clean.full+lite.patch | 19 --------
debian/patches/024_fix-make-clean.full.patch | 51 ---------------------
debian/patches/series | 2 -
nx-X11/Makefile | 10 +++-
nxcomp/Makefile.in | 2 +-
nxcompext/Makefile.in | 2 +-
nxcompshad/Makefile.in | 2 +-
nxproxy/Makefile.in | 2 +-
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 7f0b327..0000000
--- 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 at 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 356ce47..0000000
--- 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 at 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 70c573c..63bc3dc 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 3aefb79..7c4090a 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 d291c39..1be9281 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 51bc06e..9fd2c7d 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 26a92bd..00bca25 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 5d78972..c00df91 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
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list