Index: trunk/Makefile =================================================================== --- trunk/Makefile (revision 5781) +++ trunk/Makefile (revision 5782) @@ -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 && $(MAKE) clean: FORCE - cd src && make clean - cd util && make clean - cd pcblib && make clean - cd doc && make clean + cd src && $(MAKE) clean + cd util && $(MAKE) clean + cd pcblib && $(MAKE) clean + cd doc && $(MAKE) clean distclean: FORCE - make clean ; true - cd doc && 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 && $(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 && make install + cd src && $(MAKE) install + cd util && $(MAKE) install + cd pcblib && $(MAKE) install + cd doc && $(MAKE) install linstall: FORCE - cd src && make linstall - cd util && make linstall - cd pcblib && make linstall - cd doc && make linstall + cd src && $(MAKE) linstall + cd util && $(MAKE) linstall + cd pcblib && $(MAKE) linstall + cd doc && $(MAKE) linstall uninstall: FORCE - cd src && make uninstall - cd util && make uninstall - cd pcblib && make uninstall - cd doc && make uninstall + cd src && $(MAKE) uninstall + cd util && $(MAKE) uninstall + cd pcblib && $(MAKE) uninstall + cd doc && $(MAKE) uninstall FORCE: Index: trunk/data/Makefile =================================================================== --- trunk/data/Makefile (revision 5781) +++ trunk/data/Makefile (revision 5782) @@ -51,10 +51,10 @@ -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 Index: trunk/doc/Makefile =================================================================== --- trunk/doc/Makefile (revision 5781) +++ trunk/doc/Makefile (revision 5782) @@ -13,16 +13,16 @@ $(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 Index: trunk/doc/man/Makefile =================================================================== --- trunk/doc/man/Makefile (revision 5781) +++ trunk/doc/man/Makefile (revision 5782) @@ -49,10 +49,10 @@ $(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 Index: trunk/doc/user/06_feature/djopt/Makefile =================================================================== --- trunk/doc/user/06_feature/djopt/Makefile (revision 5781) +++ trunk/doc/user/06_feature/djopt/Makefile (revision 5782) @@ -9,16 +9,16 @@ 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) Index: trunk/pcblib/Makefile =================================================================== --- trunk/pcblib/Makefile (revision 5781) +++ trunk/pcblib/Makefile (revision 5782) @@ -16,12 +16,12 @@ $(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" Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 5781) +++ trunk/src/Makefile.in (revision 5782) @@ -249,8 +249,8 @@ SPHASH=$(SPHASH_PATH)/sphash all: - make revcheck - make all_exe + $(MAKE) revcheck + $(MAKE) all_exe include ../Makefile.conf @@ -319,10 +319,10 @@ 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: Index: trunk/src_plugins/acompnet/Makefile =================================================================== --- trunk/src_plugins/acompnet/Makefile (revision 5781) +++ trunk/src_plugins/acompnet/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_acompnet + cd ../../src && $(MAKE) mod_acompnet clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/autocrop/Makefile =================================================================== --- trunk/src_plugins/autocrop/Makefile (revision 5781) +++ trunk/src_plugins/autocrop/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_autocrop + cd ../../src && $(MAKE) mod_autocrop clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/autoplace/Makefile =================================================================== --- trunk/src_plugins/autoplace/Makefile (revision 5781) +++ trunk/src_plugins/autoplace/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_autoplace + cd ../../src && $(MAKE) mod_autoplace clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/autoroute/Makefile =================================================================== --- trunk/src_plugins/autoroute/Makefile (revision 5781) +++ trunk/src_plugins/autoroute/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_autoroute + cd ../../src && $(MAKE) mod_autoroute clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/boardflip/Makefile =================================================================== --- trunk/src_plugins/boardflip/Makefile (revision 5781) +++ trunk/src_plugins/boardflip/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_boardflip + cd ../../src && $(MAKE) mod_boardflip clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/dbus/Makefile =================================================================== --- trunk/src_plugins/dbus/Makefile (revision 5781) +++ trunk/src_plugins/dbus/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_dbus + cd ../../src && $(MAKE) mod_dbus clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/diag/Makefile =================================================================== --- trunk/src_plugins/diag/Makefile (revision 5781) +++ trunk/src_plugins/diag/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_diag + cd ../../src && $(MAKE) mod_diag clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/distalign/Makefile =================================================================== --- trunk/src_plugins/distalign/Makefile (revision 5781) +++ trunk/src_plugins/distalign/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_distalign + cd ../../src && $(MAKE) mod_distalign clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/distaligntext/Makefile =================================================================== --- trunk/src_plugins/distaligntext/Makefile (revision 5781) +++ trunk/src_plugins/distaligntext/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_distaligntext + cd ../../src && $(MAKE) mod_distaligntext clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/djopt/Makefile =================================================================== --- trunk/src_plugins/djopt/Makefile (revision 5781) +++ trunk/src_plugins/djopt/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_djopt + cd ../../src && $(MAKE) mod_djopt clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/draw_fab/Makefile =================================================================== --- trunk/src_plugins/draw_fab/Makefile (revision 5781) +++ trunk/src_plugins/draw_fab/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_draw_fab + cd ../../src && $(MAKE) mod_draw_fab clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/export_bboard/Makefile =================================================================== --- trunk/src_plugins/export_bboard/Makefile (revision 5781) +++ trunk/src_plugins/export_bboard/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_bom/Makefile =================================================================== --- trunk/src_plugins/export_bom/Makefile (revision 5781) +++ trunk/src_plugins/export_bom/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_dsn/Makefile =================================================================== --- trunk/src_plugins/export_dsn/Makefile (revision 5781) +++ trunk/src_plugins/export_dsn/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_dxf/Makefile =================================================================== --- trunk/src_plugins/export_dxf/Makefile (revision 5781) +++ trunk/src_plugins/export_dxf/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_gcode/Makefile =================================================================== --- trunk/src_plugins/export_gcode/Makefile (revision 5781) +++ trunk/src_plugins/export_gcode/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_gerber/Makefile =================================================================== --- trunk/src_plugins/export_gerber/Makefile (revision 5781) +++ trunk/src_plugins/export_gerber/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_ipcd356/Makefile =================================================================== --- trunk/src_plugins/export_ipcd356/Makefile (revision 5781) +++ trunk/src_plugins/export_ipcd356/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_lpr/Makefile =================================================================== --- trunk/src_plugins/export_lpr/Makefile (revision 5781) +++ trunk/src_plugins/export_lpr/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_nelma/Makefile =================================================================== --- trunk/src_plugins/export_nelma/Makefile (revision 5781) +++ trunk/src_plugins/export_nelma/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_openscad/Makefile =================================================================== --- trunk/src_plugins/export_openscad/Makefile (revision 5781) +++ trunk/src_plugins/export_openscad/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_png/Makefile =================================================================== --- trunk/src_plugins/export_png/Makefile (revision 5781) +++ trunk/src_plugins/export_png/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_ps/Makefile =================================================================== --- trunk/src_plugins/export_ps/Makefile (revision 5781) +++ trunk/src_plugins/export_ps/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_stat/Makefile =================================================================== --- trunk/src_plugins/export_stat/Makefile (revision 5781) +++ trunk/src_plugins/export_stat/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_export_stat + cd ../../src && $(MAKE) mod_export_stat clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/export_svg/Makefile =================================================================== --- trunk/src_plugins/export_svg/Makefile (revision 5781) +++ trunk/src_plugins/export_svg/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/export_test/Makefile =================================================================== --- trunk/src_plugins/export_test/Makefile (revision 5781) +++ trunk/src_plugins/export_test/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_export_test + cd ../../src && $(MAKE) mod_export_test clean: Index: trunk/src_plugins/export_xy/Makefile =================================================================== --- trunk/src_plugins/export_xy/Makefile (revision 5781) +++ trunk/src_plugins/export_xy/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/fontmode/Makefile =================================================================== --- trunk/src_plugins/fontmode/Makefile (revision 5781) +++ trunk/src_plugins/fontmode/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_fontmode + cd ../../src && $(MAKE) mod_fontmode clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/fp_fs/Makefile =================================================================== --- trunk/src_plugins/fp_fs/Makefile (revision 5781) +++ trunk/src_plugins/fp_fs/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/fp_wget/Makefile =================================================================== --- trunk/src_plugins/fp_wget/Makefile (revision 5781) +++ trunk/src_plugins/fp_wget/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/gpmi/Makefile =================================================================== --- trunk/src_plugins/gpmi/Makefile (revision 5781) +++ trunk/src_plugins/gpmi/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/gpmi/pcb-gpmi/Makefile =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/Makefile (revision 5781) +++ trunk/src_plugins/gpmi/pcb-gpmi/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile (revision 5781) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/Makefile (revision 5782) @@ -34,4 +34,4 @@ 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 Index: trunk/src_plugins/hid_batch/Makefile =================================================================== --- trunk/src_plugins/hid_batch/Makefile (revision 5781) +++ trunk/src_plugins/hid_batch/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/hid_gtk/Makefile =================================================================== --- trunk/src_plugins/hid_gtk/Makefile (revision 5781) +++ trunk/src_plugins/hid_gtk/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/hid_lesstif/Makefile =================================================================== --- trunk/src_plugins/hid_lesstif/Makefile (revision 5781) +++ trunk/src_plugins/hid_lesstif/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/hid_remote/Makefile =================================================================== --- trunk/src_plugins/hid_remote/Makefile (revision 5781) +++ trunk/src_plugins/hid_remote/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_hid_remote + cd ../../src && $(MAKE) mod_hid_remote clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/import_dsn/Makefile =================================================================== --- trunk/src_plugins/import_dsn/Makefile (revision 5781) +++ trunk/src_plugins/import_dsn/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/import_edif/Makefile =================================================================== --- trunk/src_plugins/import_edif/Makefile (revision 5781) +++ trunk/src_plugins/import_edif/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/import_hyp/Makefile =================================================================== --- trunk/src_plugins/import_hyp/Makefile (revision 5781) +++ trunk/src_plugins/import_hyp/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_import_hyp + cd ../../src && $(MAKE) mod_import_hyp hyp_l.o: hyp_y.h Index: trunk/src_plugins/import_netlist/Makefile =================================================================== --- trunk/src_plugins/import_netlist/Makefile (revision 5781) +++ trunk/src_plugins/import_netlist/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/import_sch/Makefile =================================================================== --- trunk/src_plugins/import_sch/Makefile (revision 5781) +++ trunk/src_plugins/import_sch/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_autoplace + cd ../../src && $(MAKE) mod_autoplace clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/io_kicad/Makefile =================================================================== --- trunk/src_plugins/io_kicad/Makefile (revision 5781) +++ trunk/src_plugins/io_kicad/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/io_kicad_legacy/Makefile =================================================================== --- trunk/src_plugins/io_kicad_legacy/Makefile (revision 5781) +++ trunk/src_plugins/io_kicad_legacy/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/io_lihata/Makefile =================================================================== --- trunk/src_plugins/io_lihata/Makefile (revision 5781) +++ trunk/src_plugins/io_lihata/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/io_pcb/Makefile =================================================================== --- trunk/src_plugins/io_pcb/Makefile (revision 5781) +++ trunk/src_plugins/io_pcb/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/jostle/Makefile =================================================================== --- trunk/src_plugins/jostle/Makefile (revision 5781) +++ trunk/src_plugins/jostle/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_jostle + cd ../../src && $(MAKE) mod_jostle clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/lib_gensexpr/Makefile =================================================================== --- trunk/src_plugins/lib_gensexpr/Makefile (revision 5781) +++ trunk/src_plugins/lib_gensexpr/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/lib_legacy_func/Makefile =================================================================== --- trunk/src_plugins/lib_legacy_func/Makefile (revision 5781) +++ trunk/src_plugins/lib_legacy_func/Makefile (revision 5782) @@ -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 Index: trunk/src_plugins/loghid/Makefile =================================================================== --- trunk/src_plugins/loghid/Makefile (revision 5781) +++ trunk/src_plugins/loghid/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_loghid + cd ../../src && $(MAKE) mod_loghid clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/mincut/Makefile =================================================================== --- trunk/src_plugins/mincut/Makefile (revision 5781) +++ trunk/src_plugins/mincut/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_mincut + cd ../../src && $(MAKE) mod_mincut clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/oldactions/Makefile =================================================================== --- trunk/src_plugins/oldactions/Makefile (revision 5781) +++ trunk/src_plugins/oldactions/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_oldactions + cd ../../src && $(MAKE) mod_oldactions clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/polycombine/Makefile =================================================================== --- trunk/src_plugins/polycombine/Makefile (revision 5781) +++ trunk/src_plugins/polycombine/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_polycombine + cd ../../src && $(MAKE) mod_polycombine clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/polystitch/Makefile =================================================================== --- trunk/src_plugins/polystitch/Makefile (revision 5781) +++ trunk/src_plugins/polystitch/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_polystitch + cd ../../src && $(MAKE) mod_polystitch clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/propedit/Makefile =================================================================== --- trunk/src_plugins/propedit/Makefile (revision 5781) +++ trunk/src_plugins/propedit/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_propedit + cd ../../src && $(MAKE) mod_propedit clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/puller/Makefile =================================================================== --- trunk/src_plugins/puller/Makefile (revision 5781) +++ trunk/src_plugins/puller/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_puller + cd ../../src && $(MAKE) mod_puller clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/query/Makefile =================================================================== --- trunk/src_plugins/query/Makefile (revision 5781) +++ trunk/src_plugins/query/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_query + cd ../../src && $(MAKE) mod_query clean: Index: trunk/src_plugins/renumber/Makefile =================================================================== --- trunk/src_plugins/renumber/Makefile (revision 5781) +++ trunk/src_plugins/renumber/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_renumber + cd ../../src && $(MAKE) mod_renumber clean: Index: trunk/src_plugins/report/Makefile =================================================================== --- trunk/src_plugins/report/Makefile (revision 5781) +++ trunk/src_plugins/report/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_report + cd ../../src && $(MAKE) mod_report clean: Index: trunk/src_plugins/rubberband_orig/Makefile =================================================================== --- trunk/src_plugins/rubberband_orig/Makefile (revision 5781) +++ trunk/src_plugins/rubberband_orig/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_rubberband_orig + cd ../../src && $(MAKE) mod_rubberband_orig clean: Index: trunk/src_plugins/shand_cmd/Makefile =================================================================== --- trunk/src_plugins/shand_cmd/Makefile (revision 5781) +++ trunk/src_plugins/shand_cmd/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_shand_cmd + cd ../../src && $(MAKE) mod_shand_cmd clean: Index: trunk/src_plugins/smartdisperse/Makefile =================================================================== --- trunk/src_plugins/smartdisperse/Makefile (revision 5781) +++ trunk/src_plugins/smartdisperse/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_smartdisperse + cd ../../src && $(MAKE) mod_smartdisperse clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/stroke/Makefile =================================================================== --- trunk/src_plugins/stroke/Makefile (revision 5781) +++ trunk/src_plugins/stroke/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_stroke + cd ../../src && $(MAKE) mod_stroke clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/teardrops/Makefile =================================================================== --- trunk/src_plugins/teardrops/Makefile (revision 5781) +++ trunk/src_plugins/teardrops/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_teardrops + cd ../../src && $(MAKE) mod_teardrops clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/toporouter/Makefile =================================================================== --- trunk/src_plugins/toporouter/Makefile (revision 5781) +++ trunk/src_plugins/toporouter/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_toporouter + cd ../../src && $(MAKE) mod_toporouter clean: rm *.o *.so 2>/dev/null ; true Index: trunk/src_plugins/vendordrill/Makefile =================================================================== --- trunk/src_plugins/vendordrill/Makefile (revision 5781) +++ trunk/src_plugins/vendordrill/Makefile (revision 5782) @@ -1,5 +1,5 @@ all: - cd ../../src && make mod_vendordrill + cd ../../src && $(MAKE) mod_vendordrill clean: rm *.o *.so 2>/dev/null ; true Index: trunk/tests/Makefile =================================================================== --- trunk/tests/Makefile (revision 5781) +++ trunk/tests/Makefile (revision 5782) @@ -1,8 +1,8 @@ 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 remote && 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 + cd remote && $(MAKE) all && $(MAKE) test Index: trunk/tests/conf/Makefile =================================================================== --- trunk/tests/conf/Makefile (revision 5781) +++ trunk/tests/conf/Makefile (revision 5782) @@ -52,4 +52,4 @@ cd ../../src && make test: - cd tests && make all + cd tests && $(MAKE) all Index: trunk/util/Makefile =================================================================== --- trunk/util/Makefile (revision 5781) +++ trunk/util/Makefile (revision 5782) @@ -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,13 +14,13 @@ $(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" @@ -27,4 +27,4 @@ $(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 Index: trunk/util/gsch2pcb-rnd/Makefile.in =================================================================== --- trunk/util/gsch2pcb-rnd/Makefile.in (revision 5781) +++ trunk/util/gsch2pcb-rnd/Makefile.in (revision 5782) @@ -59,8 +59,8 @@ method_import.o all: - make revcheck - make gsch2pcb-rnd$(EXE) + $(MAKE) revcheck + $(MAKE) gsch2pcb-rnd$(EXE) revcheck: cd ../../scconfig && ./revtest Rev.stamp < Rev.tab @@ -118,10 +118,10 @@ $(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)"