summaryrefslogtreecommitdiff
blob: e70f096ea6b4d8fca42e7578a90efe0291ef394b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
Don't build python via the makefile and fix parallel make jobs.

--- binwalk-2.0.1/Makefile.in
+++ binwalk-2.0.1/Makefile.in
@@ -33,21 +33,20 @@
 	$(PYTHON) ./setup.py install $(PREFIX)
 
 build:
-	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi
-	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR); fi
-	$(PYTHON) ./setup.py build
+	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR); fi
+	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR); fi
 
 deps:
 	./deps.sh
 
 clean:
-	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) clean; fi
-	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi
+	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) clean; fi
+	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) clean; fi
 	$(PYTHON) ./setup.py clean
 
 distclean: clean
-	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) distclean; fi
-	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi
+	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) distclean; fi
+	if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) distclean; fi
 	rm -rf Makefile config.* *.cache
 
 uninstall:
--- binwalk-2.0.1/src/C/Makefile
+++ binwalk-2.0.1/src/C/Makefile
@@ -3,9 +3,9 @@
 .PHONY: all clean_libs clean distclean
 
 all:
-	make -C miniz
+	$(MAKE) -C miniz
 	cp miniz/*.$(SOEXT) $(LIB_DIR)
-	make -C compress
+	$(MAKE) -C compress
 	cp compress/*.$(SOEXT) $(LIB_DIR)
 
 clean_libs:
@@ -13,10 +13,10 @@
 	rm -f $(LIB_DIR)/libcompress42.$(SOEXT)
 
 clean: clean_libs
-	make -C miniz clean
-	make -C compress clean
+	$(MAKE) -C miniz clean
+	$(MAKE) -C compress clean
 
 distclean: clean_libs
-	make -C miniz distclean
-	make -C compress distclean
+	$(MAKE) -C miniz distclean
+	$(MAKE) -C compress distclean