aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-07 16:39:58 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2012-02-07 16:39:58 +0100
commit7f7cb5d874a857ab59bef7427734d8edfcca85bd (patch)
treeddf6ef7ece2ec248a9a69c90e9e9cff26a9ab0c2 /debian
parenteb5ef91b6b940eb001d8acb95f6413560570c1a7 (diff)
downloadnx-libs-7f7cb5d874a857ab59bef7427734d8edfcca85bd.tar.gz
nx-libs-7f7cb5d874a857ab59bef7427734d8edfcca85bd.tar.bz2
nx-libs-7f7cb5d874a857ab59bef7427734d8edfcca85bd.zip
more simplification of the main Makefile
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/001_add-main-makefile.full+lite.patch61
1 files changed, 23 insertions, 38 deletions
diff --git a/debian/patches/001_add-main-makefile.full+lite.patch b/debian/patches/001_add-main-makefile.full+lite.patch
index 9f4b8d1af..7cd932111 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