[SCM] vlevel/master: Replace all calls to make in Makefiles with $(MAKE) to properly pass -j
abe at users.alioth.debian.org
abe at users.alioth.debian.org
Sun Oct 29 23:56:13 UTC 2017
The following commit has been merged in the master branch:
commit 361f9aee00b87c0582a202f393ccc5bd9518121b
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Mon Oct 30 00:48:18 2017 +0100
Replace all calls to make in Makefiles with $(MAKE) to properly pass -j
diff --git a/debian/changelog b/debian/changelog
index be9fc59..e40d93b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ vlevel (0.5.1-2) UNRELEASED; urgency=medium
* Declare compliance with Debian Policy 4.1.1. (No changes needed.)
* Bump debhelper compatibility 10.
+ Update versioned debhelper build-dependency accordingly.
+ + Replace all calls to make in Makefiles with $(MAKE) to properly pass
+ "-j", etc.
-- Axel Beckert <abe at debian.org> Mon, 30 Oct 2017 00:20:59 +0100
diff --git a/debian/patches/recursive-make-done-properly.patch b/debian/patches/recursive-make-done-properly.patch
new file mode 100644
index 0000000..c97ed49
--- /dev/null
+++ b/debian/patches/recursive-make-done-properly.patch
@@ -0,0 +1,71 @@
+Description: Replace all calls to make in Makefiles with $(MAKE) to properly pass -j
+Author: Axel Beckert <abe at debian.org>
+Last-Update: 2017-Oct-30
+
+--- a/Makefile
++++ b/Makefile
+@@ -54,19 +54,19 @@
+ .PHONY: all install clean
+
+ all:
+- make -C volumeleveler all
+- make -C vlevel-bin all
+- make -C vlevel-ladspa all
+- make -C vlevel-jack all
++ $(MAKE) -C volumeleveler all
++ $(MAKE) -C vlevel-bin all
++ $(MAKE) -C vlevel-ladspa all
++ $(MAKE) -C vlevel-jack all
+
+ install: all
+- make -C volumeleveler install
+- make -C vlevel-bin install
+- make -C vlevel-ladspa install
+- make -C vlevel-jack install
++ $(MAKE) -C volumeleveler install
++ $(MAKE) -C vlevel-bin install
++ $(MAKE) -C vlevel-ladspa install
++ $(MAKE) -C vlevel-jack install
+
+ clean:
+- make -C volumeleveler clean
+- make -C vlevel-bin clean
+- make -C vlevel-ladspa clean
+- make -C vlevel-jack clean
++ $(MAKE) -C volumeleveler clean
++ $(MAKE) -C vlevel-bin clean
++ $(MAKE) -C vlevel-ladspa clean
++ $(MAKE) -C vlevel-jack clean
+--- a/vlevel-bin/Makefile
++++ b/vlevel-bin/Makefile
+@@ -40,7 +40,7 @@
+ # Make sucks.
+
+ ../volumeleveler/volumeleveler.o:
+- make -C ../volumeleveler all
++ $(MAKE) -C ../volumeleveler all
+
+ vlevel-bin: vlevel-bin.o \
+ commandline.o \
+--- a/vlevel-jack/Makefile
++++ b/vlevel-jack/Makefile
+@@ -49,7 +49,7 @@
+ # Make sucks.
+
+ ../volumeleveler/volumeleveler.o:
+- make -C ../volumeleveler all
++ $(MAKE) -C ../volumeleveler all
+
+ vlevel-jack: vlevel-jack.o \
+ commandline.o \
+--- a/vlevel-ladspa/Makefile
++++ b/vlevel-ladspa/Makefile
+@@ -40,7 +40,7 @@
+ # Make sucks.
+
+ ../volumeleveler/volumeleveler.o:
+- make -C ../volumeleveler all
++ $(MAKE) -C ../volumeleveler all
+
+ vlevel-ladspa.so: vlevel-ladspa.o ../volumeleveler/volumeleveler.o
+ $(CXX) $(CXXFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o ../volumeleveler/volumeleveler.o
diff --git a/debian/patches/series b/debian/patches/series
index 4e0d75e..1bcb25c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix-hardcoded-makefile-variables.patch
+recursive-make-done-properly.patch
--
vlevel packaging
More information about the pkg-multimedia-commits
mailing list