[Pkg-electronics-commits] [pcb-rnd] 01/05: Makefiles: recurse with $(MAKE) to allow parallelism
Dima Kogan
dima at secretsauce.net
Mon Jan 16 22:32:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkogan pushed a commit to branch patch-queue/master
in repository pcb-rnd.
commit e0b3892418f9a66f7031282e20509c526373d866
Author: Dima Kogan <dima at secretsauce.net>
Date: Sun Dec 18 21:02:51 2016 -0800
Makefiles: recurse with $(MAKE) to allow parallelism
The child 'make' processes now know about and can use the jobserver
Gbp-Pq: Name 0001-Makefiles-recurse-with-MAKE-to-allow-parallelism.patch
---
Makefile | 60 +++++++++++++-------------
data/Makefile | 4 +-
doc-orig/tutorial/Makefile | 4 +-
doc-rnd/Makefile | 10 ++---
doc-rnd/djopt/Makefile | 10 ++---
doc-rnd/gpmi/Makefile | 2 +-
doc-rnd/man/Makefile | 4 +-
pcblib/Makefile | 4 +-
scconfig/src/tmpasm/Makefile | 2 +-
src/Makefile.in | 8 ++--
src_3rd/genregex/Makefile | 2 +-
src_3rd/genvector/Makefile | 4 +-
src_3rd/liblhtpers/tests/Makefile | 2 +-
src_3rd/liblihata/Makefile | 6 +--
src_3rd/liblihata/Makefile.module | 2 +-
src_3rd/liblihata/genht/Makefile | 4 +-
src_3rd/liblihata/regression/Makefile | 12 +++---
src_3rd/liblihata/regression/Makefile.test | 2 +-
src_3rd/sphash/Makefile | 4 +-
src_plugins/autocrop/Makefile | 2 +-
src_plugins/autoplace/Makefile | 2 +-
src_plugins/autoroute/Makefile | 2 +-
src_plugins/boardflip/Makefile | 2 +-
src_plugins/dbus/Makefile | 2 +-
src_plugins/diag/Makefile | 2 +-
src_plugins/distalign/Makefile | 2 +-
src_plugins/distaligntext/Makefile | 2 +-
src_plugins/djopt/Makefile | 2 +-
src_plugins/export_bboard/Makefile | 2 +-
src_plugins/export_bom/Makefile | 2 +-
src_plugins/export_dsn/Makefile | 2 +-
src_plugins/export_dxf/Makefile | 2 +-
src_plugins/export_gcode/Makefile | 2 +-
src_plugins/export_gerber/Makefile | 2 +-
src_plugins/export_ipcd356/Makefile | 2 +-
src_plugins/export_lpr/Makefile | 2 +-
src_plugins/export_nelma/Makefile | 2 +-
src_plugins/export_openscad/Makefile | 2 +-
src_plugins/export_png/Makefile | 2 +-
src_plugins/export_ps/Makefile | 2 +-
src_plugins/export_svg/Makefile | 2 +-
src_plugins/export_test/Makefile | 2 +-
src_plugins/export_xy/Makefile | 2 +-
src_plugins/fontmode/Makefile | 2 +-
src_plugins/fp_fs/Makefile | 2 +-
src_plugins/fp_wget/Makefile | 2 +-
src_plugins/gpmi/Makefile | 2 +-
src_plugins/gpmi/pcb-gpmi/Makefile | 4 +-
src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile | 8 ++--
src_plugins/hid_batch/Makefile | 2 +-
src_plugins/hid_gtk/Makefile | 2 +-
src_plugins/hid_lesstif/Makefile | 2 +-
src_plugins/import_dsn/Makefile | 2 +-
src_plugins/import_edif/Makefile | 2 +-
src_plugins/import_netlist/Makefile | 2 +-
src_plugins/import_sch/Makefile | 2 +-
src_plugins/io_kicad/Makefile | 2 +-
src_plugins/io_kicad_legacy/Makefile | 2 +-
src_plugins/io_lihata/Makefile | 2 +-
src_plugins/io_pcb/Makefile | 2 +-
src_plugins/jostle/Makefile | 2 +-
src_plugins/lib_gensexpr/Makefile | 2 +-
src_plugins/lib_legacy_func/Makefile | 2 +-
src_plugins/loghid/Makefile | 2 +-
src_plugins/mincut/Makefile | 2 +-
src_plugins/mincut/pcb-mincut/Makefile | 2 +-
src_plugins/oldactions/Makefile | 2 +-
src_plugins/polycombine/Makefile | 2 +-
src_plugins/polystitch/Makefile | 2 +-
src_plugins/propedit/Makefile | 2 +-
src_plugins/puller/Makefile | 2 +-
src_plugins/query/Makefile | 2 +-
src_plugins/renumber/Makefile | 2 +-
src_plugins/report/Makefile | 2 +-
src_plugins/shand_cmd/Makefile | 2 +-
src_plugins/smartdisperse/Makefile | 2 +-
src_plugins/stroke/Makefile | 2 +-
src_plugins/teardrops/Makefile | 2 +-
src_plugins/toporouter/Makefile | 2 +-
src_plugins/vendordrill/Makefile | 2 +-
tests/Makefile | 12 +++---
tests/conf/Makefile | 4 +-
util/Makefile | 12 +++---
util/gsch2pcb-rnd/Makefile.in | 10 ++---
84 files changed, 157 insertions(+), 157 deletions(-)
diff --git a/Makefile b/Makefile
index 9bfe337..da06dd9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,43 +1,43 @@
all: FORCE
- cd src && make
- cd util && make
- cd pcblib && make
-# cd doc-rnd && make
+ cd src && $(MAKE)
+ cd util && $(MAKE)
+ cd pcblib && $(MAKE)
+# cd doc-rnd && $(MAKE)
clean: FORCE
- cd src && make clean
- cd util && make clean
- cd pcblib && make clean
- cd doc-rnd && make clean
+ cd src && $(MAKE) clean
+ cd util && $(MAKE) clean
+ cd pcblib && $(MAKE) clean
+ cd doc-rnd && $(MAKE) clean
distclean: FORCE
- make clean ; true
- cd doc-rnd && make distclean
- cd scconfig && make clean ; true
- cd src_3rd/genlist && make clean ; true
- cd src_3rd/genregex && make clean ; true
- cd src_3rd/genvector && make clean ; true
- cd src_3rd/gts && make clean ; true
- cd src_3rd/liblihata && make clean ; true
- cd src_3rd/liblihata/genht && make clean ; true
- cd src_3rd/qparse && make clean ; true
+ $(MAKE) clean ; true
+ cd doc-rnd && $(MAKE) distclean
+ cd scconfig && $(MAKE) clean ; true
+ cd src_3rd/genlist && $(MAKE) clean ; true
+ cd src_3rd/genregex && $(MAKE) clean ; true
+ cd src_3rd/genvector && $(MAKE) clean ; true
+ cd src_3rd/gts && $(MAKE) clean ; true
+ cd src_3rd/liblihata && $(MAKE) clean ; true
+ cd src_3rd/liblihata/genht && $(MAKE) clean ; true
+ cd src_3rd/qparse && $(MAKE) clean ; true
install: FORCE
- cd src && make install
- cd util && make install
- cd pcblib && make install
- cd doc-rnd && make install
+ cd src && $(MAKE) install
+ cd util && $(MAKE) install
+ cd pcblib && $(MAKE) install
+ cd doc-rnd && $(MAKE) install
linstall: FORCE
- cd src && make linstall
- cd util && make linstall
- cd pcblib && make linstall
- cd doc-rnd && make linstall
+ cd src && $(MAKE) linstall
+ cd util && $(MAKE) linstall
+ cd pcblib && $(MAKE) linstall
+ cd doc-rnd && $(MAKE) linstall
uninstall: FORCE
- cd src && make uninstall
- cd util && make uninstall
- cd pcblib && make uninstall
- cd doc-rnd && make uninstall
+ cd src && $(MAKE) uninstall
+ cd util && $(MAKE) uninstall
+ cd pcblib && $(MAKE) uninstall
+ cd doc-rnd && $(MAKE) uninstall
FORCE:
diff --git a/data/Makefile b/data/Makefile
index 3cefb09..7ca473d 100644
--- a/data/Makefile
+++ b/data/Makefile
@@ -51,10 +51,10 @@ install_:
-i $(theme_icons)
install:
- make install_ CPC="$(CP)"
+ $(MAKE) install_ CPC="$(CP)"
linstall:
- make install_ CPC="$(LN)"
+ $(MAKE) install_ CPC="$(LN)"
uninstall:
$(RM) $(DOCDIR)/examples/tut1.pcb
diff --git a/doc-orig/tutorial/Makefile b/doc-orig/tutorial/Makefile
index be4f806..d282f72 100644
--- a/doc-orig/tutorial/Makefile
+++ b/doc-orig/tutorial/Makefile
@@ -8,10 +8,10 @@ install_:
$(CPC) "`pwd`/tut1.pcb" "$(DOCDIR)/examples/tut1.pcb"
install:
- make install_ CPC="$(CP)"
+ $(MAKE) install_ CPC="$(CP)"
linstall:
- make install_ CPC="$(LN)"
+ $(MAKE) install_ CPC="$(LN)"
uninstall:
$(RM) "$(DOCDIR)/examples/tut1.pcb"
diff --git a/doc-rnd/Makefile b/doc-rnd/Makefile
index 96103c8..51907ee 100644
--- a/doc-rnd/Makefile
+++ b/doc-rnd/Makefile
@@ -13,16 +13,16 @@ keys_mkey.html: $(MENU_RES_MKEY) $(KEYLIST)
$(KEYLIST) $(MENU_RES_MKEY) > keys_mkey.html
install:
- cd man && make install
+ cd man && $(MAKE) install
linstall:
- cd man && make linstall
+ cd man && $(MAKE) linstall
uninstall:
- cd man && make uninstall
+ cd man && $(MAKE) uninstall
clean:
- cd man && make clean
+ cd man && $(MAKE) clean
distclean:
- cd man && make distclean
+ cd man && $(MAKE) distclean
diff --git a/doc-rnd/djopt/Makefile b/doc-rnd/djopt/Makefile
index c6af240..e414f98 100644
--- a/doc-rnd/djopt/Makefile
+++ b/doc-rnd/djopt/Makefile
@@ -9,16 +9,16 @@ CASES = \
viatrim.$(TARGET)
all:
- make conv TARGET=out.png
- make conv TARGET=png
- make index
+ $(MAKE) conv TARGET=out.png
+ $(MAKE) conv TARGET=png
+ $(MAKE) index
index:
- make index.html TARGET=txt
+ $(MAKE) index.html TARGET=txt
index.html: Pre.html Post.html $(CASES) Makefile
cat Pre.html > $(HTML)
- make conv TARGET=tbl
+ $(MAKE) conv TARGET=tbl
cat Post.html >>$(HTML)
conv: $(CASES)
diff --git a/doc-rnd/gpmi/Makefile b/doc-rnd/gpmi/Makefile
index 6406e2f..7c0f0ac 100644
--- a/doc-rnd/gpmi/Makefile
+++ b/doc-rnd/gpmi/Makefile
@@ -2,7 +2,7 @@ DPI_BIG=-Gsize=8,8 -Gdpi=166
DPI=-Gsize=8,8 -Gdpi=100
all: gpmi_flow.png gpmi_flow_load.png gpmi_flow_reg.png gpmi_flow_menu.png gpmi_flow_exp.png
- cd rosetta && make
+ cd rosetta && $(MAKE)
gpmi_flow.png: gpmi_flow.dot Makefile
dot $(DPI_BIG) -Tpng gpmi_flow.dot >$@
diff --git a/doc-rnd/man/Makefile b/doc-rnd/man/Makefile
index 4364dbb..4a88b1c 100644
--- a/doc-rnd/man/Makefile
+++ b/doc-rnd/man/Makefile
@@ -49,10 +49,10 @@ uninstall:
$(RM) "$(MAN1DIR)/gsch2pcb-rnd.1"
install:
- make install_ CPC="$(CP)"
+ $(MAKE) install_ CPC="$(CP)"
linstall:
- make install_ CPC="$(LN)"
+ $(MAKE) install_ CPC="$(LN)"
include ../../Makefile.conf
diff --git a/pcblib/Makefile b/pcblib/Makefile
index a850c03..eb72121 100644
--- a/pcblib/Makefile
+++ b/pcblib/Makefile
@@ -16,12 +16,12 @@ install_:
$(CPC) "`pwd`/tru-hole"/* "$(DATADIR)/pcblib/tru-hole"
install:
- make install_ CPC="$(CP)"
+ $(MAKE) install_ CPC="$(CP)"
# hack: pcb's chdir() based approach gets fooled on symlinks because of "cd .."
# returns to the wrong dir - rather symlink the whole dir
linstall:
- make uninstall
+ $(MAKE) uninstall
$(MKDIR) "$(DATADIR)"
$(LN) "`pwd`" "$(DATADIR)/pcblib"
diff --git a/scconfig/src/tmpasm/Makefile b/scconfig/src/tmpasm/Makefile
index 068e0f7..1d1ec24 100644
--- a/scconfig/src/tmpasm/Makefile
+++ b/scconfig/src/tmpasm/Makefile
@@ -9,7 +9,7 @@ tester: tester.o tmpasm.o debug.o tmpasm_scconfig.o \
tmpasm.o: tmpasm.c tmpasm.h
test: regression/Makefile
- cd regression && make
+ cd regression && $(MAKE)
regression/Makefile: regression/Makefile.in tester
./tester -e < regression/Makefile.in > regression/Makefile
diff --git a/src/Makefile.in b/src/Makefile.in
index 4857a2b..e3e5b46 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -237,8 +237,8 @@ SPHASH_PATH=../src_3rd/sphash
SPHASH=$(SPHASH_PATH)/sphash
all:
- make revcheck
- make all_exe
+ $(MAKE) revcheck
+ $(MAKE) all_exe
include ../Makefile.conf
@@ -307,10 +307,10 @@ install_:
install:
- make install_ CPC="$(CP)"@/local/pcb/rules/install@
+ $(MAKE) install_ CPC="$(CP)"@/local/pcb/rules/install@
linstall:
- make install_ CPC="$(LN)"@/local/pcb/rules/linstall@
+ $(MAKE) install_ CPC="$(LN)"@/local/pcb/rules/linstall@
uninstall:
diff --git a/src_3rd/genregex/Makefile b/src_3rd/genregex/Makefile
index 858e67d..8b3964b 100644
--- a/src_3rd/genregex/Makefile
+++ b/src_3rd/genregex/Makefile
@@ -28,7 +28,7 @@ regex_bt.o: regex_bt.c regex_bt.h regex_templ.c regex_templ.h regex.h
regex_bti.o: regex_bti.c regex_bti.h regex_templ.c regex_templ.h regex.h
test:
- cd ../regression; make all
+ cd ../regression; $(MAKE) all
clean:
rm $(OBJS) tester 2>/dev/null ; true
diff --git a/src_3rd/genvector/Makefile b/src_3rd/genvector/Makefile
index e77fc2e..4de9ca4 100644
--- a/src_3rd/genvector/Makefile
+++ b/src_3rd/genvector/Makefile
@@ -46,8 +46,8 @@ uninstall:
rm $(INCDIR)/gds_*.h $(INCDIR)/genvector*.h $(INCDIR)/vt*.h
install:
- make install_ CP="cp" PWD=`pwd`
+ $(MAKE) install_ CP="cp" PWD=`pwd`
linstall:
- make install_ CP="ln -s" PWD=`pwd`
+ $(MAKE) install_ CP="ln -s" PWD=`pwd`
diff --git a/src_3rd/liblhtpers/tests/Makefile b/src_3rd/liblhtpers/tests/Makefile
index 3c99e4a..0c1c5ae 100644
--- a/src_3rd/liblhtpers/tests/Makefile
+++ b/src_3rd/liblhtpers/tests/Makefile
@@ -14,7 +14,7 @@ include Makefile.dep
perstest: $(OBJS)
test:
- @cd roundtrip && make test
+ @cd roundtrip && $(MAKE) test
depend:
@echo "# Generated by \"make depend\"" > Makefile.dep
diff --git a/src_3rd/liblihata/Makefile b/src_3rd/liblihata/Makefile
index 2441678..04c223b 100644
--- a/src_3rd/liblihata/Makefile
+++ b/src_3rd/liblihata/Makefile
@@ -40,7 +40,7 @@ ns: liblihata.a
@nm liblihata.a | awk '/ [ABCDGNRSTVW] / { if (($$(NF) ~ "^lht_") || ($$(NF) ~ "^hts._")) next; print $$0}'
test:
- cd regression && make
+ cd regression && $(MAKE)
clean:
-rm $(OBJS) $(TESTERS) $(LIBS) 2>/dev/null
@@ -61,9 +61,9 @@ uninstall:
rm -rf $(INCDIR)
install:
- make install_ CP="cp" PWD=`pwd`
+ $(MAKE) install_ CP="cp" PWD=`pwd`
linstall:
- make install_ CP="ln -sf" PWD=`pwd`
+ $(MAKE) install_ CP="ln -sf" PWD=`pwd`
include $(ROOT)/Makefile.common
diff --git a/src_3rd/liblihata/Makefile.module b/src_3rd/liblihata/Makefile.module
index 7f7daa1..6936efe 100644
--- a/src_3rd/liblihata/Makefile.module
+++ b/src_3rd/liblihata/Makefile.module
@@ -1,4 +1,4 @@
# module Makefile
$(ROOT)/liblihata/liblihata.a:
- cd $(ROOT)/liblihata && make all
+ cd $(ROOT)/liblihata && $(MAKE) all
diff --git a/src_3rd/liblihata/genht/Makefile b/src_3rd/liblihata/genht/Makefile
index ae0a095..8a30926 100644
--- a/src_3rd/liblihata/genht/Makefile
+++ b/src_3rd/liblihata/genht/Makefile
@@ -41,7 +41,7 @@ uninstall:
rm $(LIBDIR)/genht_std.so $(LIBDIR)/genht_std.a
install:
- make install_ CP="cp"
+ $(MAKE) install_ CP="cp"
linstall:
- make install_ CP="ln -s"
+ $(MAKE) install_ CP="ln -s"
diff --git a/src_3rd/liblihata/regression/Makefile b/src_3rd/liblihata/regression/Makefile
index 173833a..ec64ad8 100644
--- a/src_3rd/liblihata/regression/Makefile
+++ b/src_3rd/liblihata/regression/Makefile
@@ -5,7 +5,7 @@ LOG=Tests.log
all: Makefile.test
@echo "Normal" > $(LOG)
- @make -f Makefile.test ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
+ @$(MAKE) -f Makefile.test ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
# This rule will work only on modern UNIX systems (GNU/Linux)
# but this is not a big loss: it's for developers to check
@@ -13,12 +13,12 @@ all: Makefile.test
# too many systems anyway.
valg: Makefile.test
@echo "Valgrind" > $(LOG)
- @make -f Makefile.test valg ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
+ @$(MAKE) -f Makefile.test valg ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
@echo "*** Valgrind result summary (only leaky tests listed): ***"
@grep -H "ERROR SUMMARY:" *.evalg *.dvalg | grep -v "ERROR SUMMARY: 0 errors" ; true
force:
- @make clean && make all
+ @$(MAKE) clean && $(MAKE) all
Makefile.test: Makefile Makegen.sh *.tts *.lht Tests.exclude
./Makegen.sh Tests.exclude > Makefile.test
@@ -27,18 +27,18 @@ Makefile.test: Makefile Makegen.sh *.tts *.lht Tests.exclude
.lht.REF: Makefile.test
@echo "" > $(LOG)
- @make -f Makefile.test $@ ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
+ @$(MAKE) -f Makefile.test $@ ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
.tts.REF: Makefile.test
@echo "" > $(LOG)
- @make -f Makefile.test $@ ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
+ @$(MAKE) -f Makefile.test $@ ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
leak:
grep -i lost *valg | awk -F '[:]' '{ print $$1 }' | uniq
clean: Makefile.test
- @make -f Makefile.test $@ ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
+ @$(MAKE) -f Makefile.test $@ ETESTER=$(ETESTER) DTESTER=$(DTESTER) TTESTER=$(TTESTER) LOG=$(LOG)
Tests.exclude:
echo "" > Tests.exclude
diff --git a/src_3rd/liblihata/regression/Makefile.test b/src_3rd/liblihata/regression/Makefile.test
index f702b0e..7ee0c4d 100644
--- a/src_3rd/liblihata/regression/Makefile.test
+++ b/src_3rd/liblihata/regression/Makefile.test
@@ -1477,4 +1477,4 @@ out/tree_unlink.valg: $(ETESTER)
############## build testers ##############
$(ETESTER) $(DTESTER) $(TTESTER):
- cd .. && make
+ cd .. && $(MAKE)
diff --git a/src_3rd/sphash/Makefile b/src_3rd/sphash/Makefile
index 91d3633..4a51819 100644
--- a/src_3rd/sphash/Makefile
+++ b/src_3rd/sphash/Makefile
@@ -29,10 +29,10 @@ install_: sphash
$(CP) `pwd`/sphash $(install_root)/usr/bin/sphash
install:
- make install_ CP=cp
+ $(MAKE) install_ CP=cp
linstall:
- make install_ CP="ln -s"
+ $(MAKE) install_ CP="ln -s"
uninstall:
rm $(install_root)/usr/bin/sphash
diff --git a/src_plugins/autocrop/Makefile b/src_plugins/autocrop/Makefile
index a41e18e..60e9e38 100644
--- a/src_plugins/autocrop/Makefile
+++ b/src_plugins/autocrop/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_autocrop
+ cd ../../src && $(MAKE) mod_autocrop
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/autoplace/Makefile b/src_plugins/autoplace/Makefile
index dfcba41..f7c508f 100644
--- a/src_plugins/autoplace/Makefile
+++ b/src_plugins/autoplace/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_autoplace
+ cd ../../src && $(MAKE) mod_autoplace
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/autoroute/Makefile b/src_plugins/autoroute/Makefile
index 380ab39..e12353d 100644
--- a/src_plugins/autoroute/Makefile
+++ b/src_plugins/autoroute/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_autoroute
+ cd ../../src && $(MAKE) mod_autoroute
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/boardflip/Makefile b/src_plugins/boardflip/Makefile
index 03c3cbd..da1ec3a 100644
--- a/src_plugins/boardflip/Makefile
+++ b/src_plugins/boardflip/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_boardflip
+ cd ../../src && $(MAKE) mod_boardflip
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/dbus/Makefile b/src_plugins/dbus/Makefile
index 61529b2..9dc4e57 100644
--- a/src_plugins/dbus/Makefile
+++ b/src_plugins/dbus/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_dbus
+ cd ../../src && $(MAKE) mod_dbus
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/diag/Makefile b/src_plugins/diag/Makefile
index 91238a7..391b937 100644
--- a/src_plugins/diag/Makefile
+++ b/src_plugins/diag/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_diag
+ cd ../../src && $(MAKE) mod_diag
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/distalign/Makefile b/src_plugins/distalign/Makefile
index d547c2a..811c2b6 100644
--- a/src_plugins/distalign/Makefile
+++ b/src_plugins/distalign/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_distalign
+ cd ../../src && $(MAKE) mod_distalign
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/distaligntext/Makefile b/src_plugins/distaligntext/Makefile
index c76b4db..e133e1b 100644
--- a/src_plugins/distaligntext/Makefile
+++ b/src_plugins/distaligntext/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_distaligntext
+ cd ../../src && $(MAKE) mod_distaligntext
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/djopt/Makefile b/src_plugins/djopt/Makefile
index 5751c57..3e14264 100644
--- a/src_plugins/djopt/Makefile
+++ b/src_plugins/djopt/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_djopt
+ cd ../../src && $(MAKE) mod_djopt
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_bboard/Makefile b/src_plugins/export_bboard/Makefile
index 9fc5059..1f56325 100644
--- a/src_plugins/export_bboard/Makefile
+++ b/src_plugins/export_bboard/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_bboard
+ cd ../../src && $(MAKE) mod_export_bboard
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_bom/Makefile b/src_plugins/export_bom/Makefile
index cafd8e5..cb2252e 100644
--- a/src_plugins/export_bom/Makefile
+++ b/src_plugins/export_bom/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_bom
+ cd ../../src && $(MAKE) mod_export_bom
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_dsn/Makefile b/src_plugins/export_dsn/Makefile
index 484a0ad..ad9ac5c 100644
--- a/src_plugins/export_dsn/Makefile
+++ b/src_plugins/export_dsn/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_dsn
+ cd ../../src && $(MAKE) mod_export_dsn
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_dxf/Makefile b/src_plugins/export_dxf/Makefile
index c6da93f..34aaaf2 100644
--- a/src_plugins/export_dxf/Makefile
+++ b/src_plugins/export_dxf/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_dxf
+ cd ../../src && $(MAKE) mod_export_dxf
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_gcode/Makefile b/src_plugins/export_gcode/Makefile
index 2c43ef0..0fbc7e6 100644
--- a/src_plugins/export_gcode/Makefile
+++ b/src_plugins/export_gcode/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_gcode
+ cd ../../src && $(MAKE) mod_export_gcode
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_gerber/Makefile b/src_plugins/export_gerber/Makefile
index 14bcdf0..730f76a 100644
--- a/src_plugins/export_gerber/Makefile
+++ b/src_plugins/export_gerber/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_gerber
+ cd ../../src && $(MAKE) mod_export_gerber
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_ipcd356/Makefile b/src_plugins/export_ipcd356/Makefile
index f816b9f..e69e6b9 100644
--- a/src_plugins/export_ipcd356/Makefile
+++ b/src_plugins/export_ipcd356/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_ipcd356
+ cd ../../src && $(MAKE) mod_export_ipcd356
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_lpr/Makefile b/src_plugins/export_lpr/Makefile
index bbf5342..6d7ba00 100644
--- a/src_plugins/export_lpr/Makefile
+++ b/src_plugins/export_lpr/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_lpr
+ cd ../../src && $(MAKE) mod_export_lpr
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_nelma/Makefile b/src_plugins/export_nelma/Makefile
index 3b6a322..f9afca3 100644
--- a/src_plugins/export_nelma/Makefile
+++ b/src_plugins/export_nelma/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_nelma
+ cd ../../src && $(MAKE) mod_export_nelma
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_openscad/Makefile b/src_plugins/export_openscad/Makefile
index c77f26b..0708b15 100644
--- a/src_plugins/export_openscad/Makefile
+++ b/src_plugins/export_openscad/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_openscad
+ cd ../../src && $(MAKE) mod_export_openscad
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_png/Makefile b/src_plugins/export_png/Makefile
index 8b4cfea..ae86881 100644
--- a/src_plugins/export_png/Makefile
+++ b/src_plugins/export_png/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_png
+ cd ../../src && $(MAKE) mod_export_png
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_ps/Makefile b/src_plugins/export_ps/Makefile
index c1dd95c..f8ee0a4 100644
--- a/src_plugins/export_ps/Makefile
+++ b/src_plugins/export_ps/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_ps
+ cd ../../src && $(MAKE) mod_export_ps
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_svg/Makefile b/src_plugins/export_svg/Makefile
index 90a3a2d..063150c 100644
--- a/src_plugins/export_svg/Makefile
+++ b/src_plugins/export_svg/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_svg
+ cd ../../src && $(MAKE) mod_export_svg
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/export_test/Makefile b/src_plugins/export_test/Makefile
index 2213a7f..58f3c4b 100644
--- a/src_plugins/export_test/Makefile
+++ b/src_plugins/export_test/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_test
+ cd ../../src && $(MAKE) mod_export_test
clean:
diff --git a/src_plugins/export_xy/Makefile b/src_plugins/export_xy/Makefile
index 52b1a8f..ab66147 100644
--- a/src_plugins/export_xy/Makefile
+++ b/src_plugins/export_xy/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_export_xy
+ cd ../../src && $(MAKE) mod_export_xy
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/fontmode/Makefile b/src_plugins/fontmode/Makefile
index 0692e77..1a1edd5 100644
--- a/src_plugins/fontmode/Makefile
+++ b/src_plugins/fontmode/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_fontmode
+ cd ../../src && $(MAKE) mod_fontmode
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/fp_fs/Makefile b/src_plugins/fp_fs/Makefile
index eed8033..431bedb 100644
--- a/src_plugins/fp_fs/Makefile
+++ b/src_plugins/fp_fs/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_fp_fs
+ cd ../../src && $(MAKE) mod_fp_fs
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/fp_wget/Makefile b/src_plugins/fp_wget/Makefile
index 3c17ed4..5e4e166 100644
--- a/src_plugins/fp_wget/Makefile
+++ b/src_plugins/fp_wget/Makefile
@@ -1,5 +1,5 @@
all: tester
- cd ../../src && make mod_fp_wget
+ cd ../../src && $(MAKE) mod_fp_wget
CFLAGS = -Wall -g -I../../src -I../.. -I../../src_3rd -I../../src_3rd/liblihata
diff --git a/src_plugins/gpmi/Makefile b/src_plugins/gpmi/Makefile
index b2da266..e835b18 100644
--- a/src_plugins/gpmi/Makefile
+++ b/src_plugins/gpmi/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_pcb_gpmi
+ cd ../../src && $(MAKE) mod_pcb_gpmi
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/gpmi/pcb-gpmi/Makefile b/src_plugins/gpmi/pcb-gpmi/Makefile
index 7dfe4e4..83a8b58 100644
--- a/src_plugins/gpmi/pcb-gpmi/Makefile
+++ b/src_plugins/gpmi/pcb-gpmi/Makefile
@@ -1,13 +1,13 @@
PCB_GPMI_ROOT=.
all:
- cd gpmi_plugin; make all
+ cd gpmi_plugin; $(MAKE) all
include ../../../Makefile.conf
PLUGIN_DIR=$(LIBDIR)/plugins
clean:
- cd gpmi_plugin; make clean
+ cd gpmi_plugin; $(MAKE) clean
test: all
cd host_lib; ./test.sh
diff --git a/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile b/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile
index de0d2d5..2d5f9d8 100644
--- a/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile
+++ b/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile
@@ -9,13 +9,13 @@ BUILDIN_OBJS = gpmi_buildin.o $(COMMON_OBJS)
PLUGIN_OBJS = gpmi_plugin.o $(COMMON_OBJS)
all: gpmi_plugin.so gpmi_buildin.a
- cd gpmi_pkg; make
+ cd gpmi_pkg; $(MAKE)
all_plugin: gpmi_plugin.so
- cd gpmi_pkg; make
+ cd gpmi_pkg; $(MAKE)
all_buildin: gpmi_buildin.a
- cd gpmi_pkg; make
+ cd gpmi_pkg; $(MAKE)
gpmi_buildin.a: $(BUILDIN_OBJS)
ar rvu gpmi_buildin.a $(BUILDIN_OBJS)
@@ -34,4 +34,4 @@ manage_scripts.o: manage_scripts.c
clean:
rm gpmi_plugin.o gpmi_plugin.so gpmi_buildin.a gpmi_buildin.o $(COMMON_OBJS) 2>/dev/null ; true
- cd gpmi_pkg; make clean
+ cd gpmi_pkg; $(MAKE) clean
diff --git a/src_plugins/hid_batch/Makefile b/src_plugins/hid_batch/Makefile
index 3477d42..c1effe6 100644
--- a/src_plugins/hid_batch/Makefile
+++ b/src_plugins/hid_batch/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_hid_batch
+ cd ../../src && $(MAKE) mod_hid_batch
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/hid_gtk/Makefile b/src_plugins/hid_gtk/Makefile
index 84cf1c9..9be8e31 100644
--- a/src_plugins/hid_gtk/Makefile
+++ b/src_plugins/hid_gtk/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_hid_gtk
+ cd ../../src && $(MAKE) mod_hid_gtk
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/hid_lesstif/Makefile b/src_plugins/hid_lesstif/Makefile
index ba83ecf..4e6247f 100644
--- a/src_plugins/hid_lesstif/Makefile
+++ b/src_plugins/hid_lesstif/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_hid_lesstif
+ cd ../../src && $(MAKE) mod_hid_lesstif
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/import_dsn/Makefile b/src_plugins/import_dsn/Makefile
index f061554..efde4a3 100644
--- a/src_plugins/import_dsn/Makefile
+++ b/src_plugins/import_dsn/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_import_dsn
+ cd ../../src && $(MAKE) mod_import_dsn
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/import_edif/Makefile b/src_plugins/import_edif/Makefile
index 0fb3a2e..3ae9958 100644
--- a/src_plugins/import_edif/Makefile
+++ b/src_plugins/import_edif/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_import_edif
+ cd ../../src && $(MAKE) mod_import_edif
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/import_netlist/Makefile b/src_plugins/import_netlist/Makefile
index e5bb6ae..8ef4348 100644
--- a/src_plugins/import_netlist/Makefile
+++ b/src_plugins/import_netlist/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_import_netlist
+ cd ../../src && $(MAKE) mod_import_netlist
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/import_sch/Makefile b/src_plugins/import_sch/Makefile
index dfcba41..f7c508f 100644
--- a/src_plugins/import_sch/Makefile
+++ b/src_plugins/import_sch/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_autoplace
+ cd ../../src && $(MAKE) mod_autoplace
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/io_kicad/Makefile b/src_plugins/io_kicad/Makefile
index 27e6cf9..24ca0ab 100644
--- a/src_plugins/io_kicad/Makefile
+++ b/src_plugins/io_kicad/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_io_kicad
+ cd ../../src && $(MAKE) mod_io_kicad
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/io_kicad_legacy/Makefile b/src_plugins/io_kicad_legacy/Makefile
index f44b79c..4879992 100644
--- a/src_plugins/io_kicad_legacy/Makefile
+++ b/src_plugins/io_kicad_legacy/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_io_kicad_legacy
+ cd ../../src && $(MAKE) mod_io_kicad_legacy
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/io_lihata/Makefile b/src_plugins/io_lihata/Makefile
index c37de74..cb659bf 100644
--- a/src_plugins/io_lihata/Makefile
+++ b/src_plugins/io_lihata/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_io_lihata
+ cd ../../src && $(MAKE) mod_io_lihata
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/io_pcb/Makefile b/src_plugins/io_pcb/Makefile
index 1023b1a..654cc91 100644
--- a/src_plugins/io_pcb/Makefile
+++ b/src_plugins/io_pcb/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_io_pcb
+ cd ../../src && $(MAKE) mod_io_pcb
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/jostle/Makefile b/src_plugins/jostle/Makefile
index ebdadff..d1be51f 100644
--- a/src_plugins/jostle/Makefile
+++ b/src_plugins/jostle/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_jostle
+ cd ../../src && $(MAKE) mod_jostle
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/lib_gensexpr/Makefile b/src_plugins/lib_gensexpr/Makefile
index deeabca..d14361d 100644
--- a/src_plugins/lib_gensexpr/Makefile
+++ b/src_plugins/lib_gensexpr/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_lib_gensexpr
+ cd ../../src && $(MAKE) mod_lib_gensexpr
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/lib_legacy_func/Makefile b/src_plugins/lib_legacy_func/Makefile
index 87807f6..ff403e4 100644
--- a/src_plugins/lib_legacy_func/Makefile
+++ b/src_plugins/lib_legacy_func/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_lib_legacy_func
+ cd ../../src && $(MAKE) mod_lib_legacy_func
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/loghid/Makefile b/src_plugins/loghid/Makefile
index 42f703a..3010e07 100644
--- a/src_plugins/loghid/Makefile
+++ b/src_plugins/loghid/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_loghid
+ cd ../../src && $(MAKE) mod_loghid
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/mincut/Makefile b/src_plugins/mincut/Makefile
index ff909df..33c93d4 100644
--- a/src_plugins/mincut/Makefile
+++ b/src_plugins/mincut/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_mincut
+ cd ../../src && $(MAKE) mod_mincut
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/mincut/pcb-mincut/Makefile b/src_plugins/mincut/pcb-mincut/Makefile
index 74f91e5..2f995b9 100644
--- a/src_plugins/mincut/pcb-mincut/Makefile
+++ b/src_plugins/mincut/pcb-mincut/Makefile
@@ -7,7 +7,7 @@ all: main
main: $(OBJS)
test:
- cd test_cases && make
+ cd test_cases && $(MAKE)
clean:
diff --git a/src_plugins/oldactions/Makefile b/src_plugins/oldactions/Makefile
index 7b0bb22..a49eac8 100644
--- a/src_plugins/oldactions/Makefile
+++ b/src_plugins/oldactions/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_oldactions
+ cd ../../src && $(MAKE) mod_oldactions
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/polycombine/Makefile b/src_plugins/polycombine/Makefile
index ba21c31..5957e0f 100644
--- a/src_plugins/polycombine/Makefile
+++ b/src_plugins/polycombine/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_polycombine
+ cd ../../src && $(MAKE) mod_polycombine
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/polystitch/Makefile b/src_plugins/polystitch/Makefile
index 051fc9b..1267449 100644
--- a/src_plugins/polystitch/Makefile
+++ b/src_plugins/polystitch/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_polystitch
+ cd ../../src && $(MAKE) mod_polystitch
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/propedit/Makefile b/src_plugins/propedit/Makefile
index 55f3aa9..33f9736 100644
--- a/src_plugins/propedit/Makefile
+++ b/src_plugins/propedit/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_propedit
+ cd ../../src && $(MAKE) mod_propedit
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/puller/Makefile b/src_plugins/puller/Makefile
index e389405..efa23f8 100644
--- a/src_plugins/puller/Makefile
+++ b/src_plugins/puller/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_puller
+ cd ../../src && $(MAKE) mod_puller
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/query/Makefile b/src_plugins/query/Makefile
index 1ab3e10..2c6d897 100644
--- a/src_plugins/query/Makefile
+++ b/src_plugins/query/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_query
+ cd ../../src && $(MAKE) mod_query
clean:
diff --git a/src_plugins/renumber/Makefile b/src_plugins/renumber/Makefile
index a0c409d..1d16307 100644
--- a/src_plugins/renumber/Makefile
+++ b/src_plugins/renumber/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_renumber
+ cd ../../src && $(MAKE) mod_renumber
clean:
diff --git a/src_plugins/report/Makefile b/src_plugins/report/Makefile
index 61be1b8..3d52bc3 100644
--- a/src_plugins/report/Makefile
+++ b/src_plugins/report/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_report
+ cd ../../src && $(MAKE) mod_report
clean:
diff --git a/src_plugins/shand_cmd/Makefile b/src_plugins/shand_cmd/Makefile
index 35dccf5..794ac30 100644
--- a/src_plugins/shand_cmd/Makefile
+++ b/src_plugins/shand_cmd/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_shand_cmd
+ cd ../../src && $(MAKE) mod_shand_cmd
clean:
diff --git a/src_plugins/smartdisperse/Makefile b/src_plugins/smartdisperse/Makefile
index 869ea87..f22fe0f 100644
--- a/src_plugins/smartdisperse/Makefile
+++ b/src_plugins/smartdisperse/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_smartdisperse
+ cd ../../src && $(MAKE) mod_smartdisperse
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/stroke/Makefile b/src_plugins/stroke/Makefile
index 07b7c21..6fe9ed3 100644
--- a/src_plugins/stroke/Makefile
+++ b/src_plugins/stroke/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_stroke
+ cd ../../src && $(MAKE) mod_stroke
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/teardrops/Makefile b/src_plugins/teardrops/Makefile
index f934ca0..54d36e0 100644
--- a/src_plugins/teardrops/Makefile
+++ b/src_plugins/teardrops/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_teardrops
+ cd ../../src && $(MAKE) mod_teardrops
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/toporouter/Makefile b/src_plugins/toporouter/Makefile
index 4d838d9..aee1245 100644
--- a/src_plugins/toporouter/Makefile
+++ b/src_plugins/toporouter/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_toporouter
+ cd ../../src && $(MAKE) mod_toporouter
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/src_plugins/vendordrill/Makefile b/src_plugins/vendordrill/Makefile
index 402f804..4bc1979 100644
--- a/src_plugins/vendordrill/Makefile
+++ b/src_plugins/vendordrill/Makefile
@@ -1,5 +1,5 @@
all:
- cd ../../src && make mod_vendordrill
+ cd ../../src && $(MAKE) mod_vendordrill
clean:
rm *.o *.so 2>/dev/null ; true
diff --git a/tests/Makefile b/tests/Makefile
index a6098e9..923badd 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,7 +1,7 @@
test:
- cd pcbflags && make all && make test
- cd conf && make all && make test
- cd strflags && make all && make test
- cd pcb-printf && make all && make test
- cd uniq_name && make all && make test
- cd propedit && make all && make test
+ cd pcbflags && $(MAKE) all && $(MAKE) test
+ cd conf && $(MAKE) all && $(MAKE) test
+ cd strflags && $(MAKE) all && $(MAKE) test
+ cd pcb-printf && $(MAKE) all && $(MAKE) test
+ cd uniq_name && $(MAKE) all && $(MAKE) test
+ cd propedit && $(MAKE) all && $(MAKE) test
diff --git a/tests/conf/Makefile b/tests/conf/Makefile
index 3663b61..2b7e079 100644
--- a/tests/conf/Makefile
+++ b/tests/conf/Makefile
@@ -49,7 +49,7 @@ conftest.o: conftest.c
help.o: help.c
$(LIB_3RD_OBJS) $(LIB_PCB_OBJS):
- cd ../../src && make
+ cd ../../src && $(MAKE)
test:
- cd tests && make all
+ cd tests && $(MAKE) all
diff --git a/util/Makefile b/util/Makefile
index 9a22c8f..1472124 100644
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,12 +1,12 @@
# plain old hand crafted Makefile
all:
- cd gsch2pcb-rnd && make all
+ cd gsch2pcb-rnd && $(MAKE) all
include ../Makefile.conf
clean:
- cd gsch2pcb-rnd && make clean
+ cd gsch2pcb-rnd && $(MAKE) clean
install_:
$(MKDIR) "$(BINDIR)" "$(LIBDIR)"
@@ -14,17 +14,17 @@ install_:
$(CPC) "`pwd`/pcb-strip" "$(BINDIR)/pcb-strip"
$(CPC) "`pwd`/gnet-pcbrndfwd.scm" "$(LIBDIR)/gnet-pcbrndfwd.scm"
$(CPC) "`pwd`/gnet-pcbrndfwd_elem.scm" "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
- cd gsch2pcb-rnd && make install_ CPC="$(CPC)"
+ cd gsch2pcb-rnd && $(MAKE) install_ CPC="$(CPC)"
install:
- make install_ CPC="$(CP)"
+ $(MAKE) install_ CPC="$(CP)"
linstall:
- make install_ CPC="$(LN)"
+ $(MAKE) install_ CPC="$(LN)"
uninstall:
$(RM) "$(BINDIR)/fp2anim"
$(RM) "$(BINDIR)/pcb-strip"
$(RM) "$(LIBDIR)/gnet-pcbrndfwd.scm"
$(RM) "$(LIBDIR)/gnet-pcbrndfwd_elem.scm"
- cd gsch2pcb-rnd && make uninstall
+ cd gsch2pcb-rnd && $(MAKE) uninstall
diff --git a/util/gsch2pcb-rnd/Makefile.in b/util/gsch2pcb-rnd/Makefile.in
index 35bf4fc..c311f5d 100644
--- a/util/gsch2pcb-rnd/Makefile.in
+++ b/util/gsch2pcb-rnd/Makefile.in
@@ -57,8 +57,8 @@ OBJS = \
method_import.o
all:
- make revcheck
- make gsch2pcb-rnd$(EXE)
+ $(MAKE) revcheck
+ $(MAKE) gsch2pcb-rnd$(EXE)
revcheck:
cd ../../scconfig && ./revtest Rev.stamp < Rev.tab
@@ -70,7 +70,7 @@ gsch2pcb.o: gsch2pcb.c ../../config.h
$(CC) -c $(CFLAGS) $(FP_CFLAGS) gsch2pcb.c -o gsch2pcb.o
../../src/pcb-rnd:
- cd ../../src && make
+ cd ../../src && $(MAKE)
$(HASHOBJ): ../../src/pcb-rnd
@@ -116,10 +116,10 @@ install_:
$(CPC) "`pwd`/gnet-gsch2pcb-rnd.scm" "$(LIBDIR)/gnet-gsch2pcb-rnd.scm"
install:
- make install_ CPC="$(CP)"
+ $(MAKE) install_ CPC="$(CP)"
linstall:
- make install_ CPC="$(LN)"
+ $(MAKE) install_ CPC="$(LN)"
uninstall:
$(RM) "$(BINDIR)/gsch2pcb-rnd$(EXE)"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/pcb-rnd.git
More information about the Pkg-electronics-commits
mailing list