Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,…

Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, make build stanza work for nx-libs-full and nx-libs-lite.

Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,…
00b266b8 · Mike Gabriel · f4ef2967 · 00b266b8 · 00b266b8
Commit 00b266b8 authored Feb 07, 2012 by Mike Gabriel
Show whitespace changes
Inline Side-by-side

Showing with 32 additions and 27 deletions

changelog debian/changelog +2 -1

001_add-main-makefile.full+lite.patch debian/patches/001_add-main-makefile.full+lite.patch +30 -26

No files found.
--- a/debian/changelog
+++ b/debian/changelog
 nx-libs (2:3.5.0.11-0) UNRELEASED; urgency=low
-  * Use ,,make -C'' in main Makefile for calling Makefiles in subdirectories.
+  * Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories,
+    make build stanza work for nx-libs-full and nx-libs-lite.
 -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Tue, 07 Feb 2012 13:48:19 +0100

--- a/debian/patches/001_add-main-makefile.full+lite.patch
+++ b/debian/patches/001_add-main-makefile.full+lite.patch
@@ -5,7 +5,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Last-Update: 2011-12-31
 --- /dev/null
 +++ b/Makefile
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,46 @@
 +#!/usr/bin/make -f
 +
 +all: build
@@ -13,38 +13,42 @@ Last-Update: 2011-12-31
 +build: build-arch build-indep
 +
 +clean:
-+	-make -C nx-X11 $@
+	if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+	-make -C nxcomp $@
+	if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
-+	-make -C nxcompext $@
+	if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+	-make -C nxcompshad $@
+	if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+	-make -C nxproxy $@
+	if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
 +
 +distclean:
-+	-make -C nx-X11 $@
+	if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+	-make -C nxcomp $@
+	if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
-+	-make -C nxcompext $@
+	if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+	-make -C nxcompshad $@
+	if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+	-make -C nxproxy $@
+	if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
 +
 +build-arch:
-+	cd nxcomp && autoconf && ./configure && make
+	if test -d nx-X11; then \
-+	-cd nxcompext && autoconf && ./configure && make
+	    if test -d nxcomp; then cd nxcomp && autoconf; cd ..; fi; \
-+	-cd nxcompshad && autoconf && ./configure && make
+	    if test -d nxcompext; then cd nxcompext && autoconf; cd ..; fi; \
-+	-cd nx-X11 && make World && ./configure && make
+	    if test -d nxcompshad; then cd nxcompshad && autoconf; cd ..; fi; \
-+	cd nxproxy && autoconf && ./configure && make
+	    cd nx-X11 && make World && cd ..; \
+	else \
+	    if test -d nxcomp; then cd nxcomp && autoconf && ./configure && make; cd ..; fi; \
+	fi
+	if test -d nxproxy; then cd nxproxy && autoconf && ./configure && make; cd ..; fi
 +
 +build-indep:
 +
 +install:
-+	-make -C nx-X11 $@
+	if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+	-make -C nxcomp $@
+	if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
-+	-make -C nxcompext $@
+	if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+	-make -C nxcompshad $@
+	if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+	-make -C nxproxy $@
+	if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi
 +
 +uninstall:
-+	-make -C nx-X11 $@
+	if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi
-+	-make -C nxcomp $@
+	if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi
-+	-make -C nxcompext $@
+	if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi
-+	-make -C nxcompshad $@
+	if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi
-+	-make -C nxproxy $@
+	if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi