The branch, master has been updated via 7f7cb5d874a857ab59bef7427734d8edfcca85bd (commit) from eb5ef91b6b940eb001d8acb95f6413560570c1a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f7cb5d874a857ab59bef7427734d8edfcca85bd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 7 16:39:58 2012 +0100 more simplification of the main Makefile ----------------------------------------------------------------------- Summary of changes: .../patches/001_add-main-makefile.full+lite.patch | 61 +++++++------------ 1 files changed, 23 insertions(+), 38 deletions(-) The diff of changes is: diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch index 9f4b8d1..7cd9321 100644 --- a/debian/patches/001_add-main-makefile.full+lite.patch +++ b/debian/patches/001_add-main-makefile.full+lite.patch @@ -5,50 +5,35 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Last-Update: 2011-12-31 --- /dev/null +++ b/Makefile -@@ -0,0 +1,46 @@ +@@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +all: build + -+build: build-arch build-indep -+ -+clean: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ -+distclean: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ -+build-arch: -+ if test -d nx-X11; then \ -+ cd nxcomp && autoconf; cd ..; \ -+ cd nxcompext && autoconf; cd ..; \ -+ cd nxcompshad && autoconf; cd ..; \ -+ cd nx-X11 && make World && cd ..; \ ++build-lite: ++ cd nxcomp && autoconf && ./configure && $(MAKE) ++ cd nxproxy && autoconf && ./configure && $(MAKE) ++ ++build-full: ++# in the full case, we rely on "magic" in the nx-X11 imake-based makefiles... ++ cd nxcomp && autoconf && ./configure ++ cd nxcompext && autoconf ++ cd nxcompshad && autoconf ++ cd nx-X11 && $(MAKE) World ++ cd nxproxy && autoconf && ./configure && $(MAKE) ++ ++build: ++ if ! test -d nx-X11; then \ ++ $(MAKE) build-lite; \ + else \ -+ cd nxcomp && autoconf && ./configure && make; cd ..; \ ++ $(MAKE) build-full; \ + fi -+ cd nxproxy && autoconf && ./configure && make; cd .. -+ -+build-indep: + -+install: ++%: + $(MAKE) -C nxcomp $@ + $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi -+ -+uninstall: -+ $(MAKE) -C nxcomp $@ -+ $(MAKE) -C nxproxy $@ -+ if test -d nx-X11; then $(MAKE) -C nx-X11 $@; fi -+ if test -d nxcompext; then $(MAKE) -C nxcompext $@; fi -+ if test -d nxcompshad; then $(MAKE) -C nxcompshad $@; fi ++ if test -d nx-X11; then \ ++ $(MAKE) -C nxcompext $@; \ ++ $(MAKE) -C nxcompshad; \ ++ $(MAKE) -C nx-X11 $@; \ ++ fi hooks/post-receive -- nx-libs.git (NX (redistributed)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "nx-libs.git" (NX (redistributed)).