diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-07 16:10:34 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-07 16:10:51 +0100 |
| commit | 00b266b82503e8155e7195180f287df0392fb770 (patch) | |
| tree | f33ed79d5fa2c4c92f9507d3f3602c773885cf2a | |
| parent | f4ef2967b1495e5d9577a94610ee0be3e89ab870 (diff) | |
| download | nx-libs-00b266b82503e8155e7195180f287df0392fb770.tar.gz nx-libs-00b266b82503e8155e7195180f287df0392fb770.tar.bz2 nx-libs-00b266b82503e8155e7195180f287df0392fb770.zip | |
Use ,,$(MAKE) -C'' in main Makefile for calling Makefiles in subdirectories, make build stanza work for nx-libs-full and nx-libs-lite.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/001_add-main-makefile.full+lite.patch | 56 |
2 files changed, 32 insertions, 27 deletions
diff --git a/debian/changelog b/debian/changelog index c56632ce6..012c7bd95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ 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 diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 2d35e822b..0adead108 100644 --- 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 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +distclean: -+ -make -C nx-X11 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +build-arch: -+ cd nxcomp && autoconf && ./configure && make -+ -cd nxcompext && autoconf && ./configure && make -+ -cd nxcompshad && autoconf && ./configure && make -+ -cd nx-X11 && make World && ./configure && make -+ cd nxproxy && autoconf && ./configure && make ++ if test -d nx-X11; then \ ++ if test -d nxcomp; then cd nxcomp && autoconf; cd ..; fi; \ ++ if test -d nxcompext; then cd nxcompext && autoconf; cd ..; fi; \ ++ if test -d nxcompshad; then cd nxcompshad && autoconf; cd ..; fi; \ ++ 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 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi + +uninstall: -+ -make -C nx-X11 $@ -+ -make -C nxcomp $@ -+ -make -C nxcompext $@ -+ -make -C nxcompshad $@ -+ -make -C nxproxy $@ ++ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi ++ if test -d nxcomp; then $(MAKE) -C nxcomp $@; fi ++ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi ++ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nxproxy; then $(MAKE) -C nxproxy $@; fi |