chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge uaudio stragglers.
[disorder]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index 470f08be9fda2e019e1181024c6b6cc00d4acec7..5c53f50bc27ae6044fcde3ffd47ffd3fc5d87e14 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-43,6
+43,12
@@
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
INSTALL_PROGRAM += -s
endif
+# Set DEB_BUILD_OPTIONS=parallel=N to do make -jN
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+PARALLEL = -j$(NUMJOBS)
+endif
+
export INSTALL_DATA
export INSTALL_SCRIPT
export INSTALL_PROGRAM
export INSTALL_DATA
export INSTALL_SCRIPT
export INSTALL_PROGRAM
@@
-68,7
+74,7
@@
build:
echo ./config.status;\
./config.status;\
fi
echo ./config.status;\
./config.status;\
fi
- $(MAKE) SENDMAIL=${SENDMAIL}
+ $(MAKE) SENDMAIL=${SENDMAIL}
${PARALLEL}
pkg-disorder: build
rm -rf debian/disorder
pkg-disorder: build
rm -rf debian/disorder
@@
-156,6
+162,7
@@
pkg-disorder-server: build
rm -rf debian/disorder-server/usr/share/man/man1
rm -rf debian/disorder-server/usr/share/man/man3
rm -f debian/disorder-server/usr/share/man/man5/disorder_config.5
rm -rf debian/disorder-server/usr/share/man/man1
rm -rf debian/disorder-server/usr/share/man/man3
rm -f debian/disorder-server/usr/share/man/man5/disorder_config.5
+ rm -f debian/disorder-server/usr/share/man/man5/disorder_preferences.5
rm -f debian/disorder-server/usr/share/man/man5/disorder_protocol.5
find debian/disorder-server -name '*.la' -print0 | xargs -r0 rm -f
find debian/disorder-server -name '*.so.0' -print0 | xargs -r0 rm -f
rm -f debian/disorder-server/usr/share/man/man5/disorder_protocol.5
find debian/disorder-server -name '*.la' -print0 | xargs -r0 rm -f
find debian/disorder-server -name '*.so.0' -print0 | xargs -r0 rm -f
@@
-289,7
+296,7
@@
binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
binary-indep:
clean:
binary-indep:
clean:
-
-
$(MAKE) distclean
+
test -f Makefile &&
$(MAKE) distclean
rm -f config.cache
rm -f debian/files
rm -f debian/substvars.*
rm -f config.cache
rm -f debian/files
rm -f debian/substvars.*