Index: trunk/doc-rnd/TODO =================================================================== --- trunk/doc-rnd/TODO (revision 1125) +++ trunk/doc-rnd/TODO (revision 1126) @@ -1,5 +1,4 @@ CLEANUP #2 - - Makefile.dep vs. plugins - warnings in util/ - scconfig: detect libstroke - libstroke: zoom Index: trunk/scconfig/Makefile.dep.inc =================================================================== --- trunk/scconfig/Makefile.dep.inc (revision 1125) +++ trunk/scconfig/Makefile.dep.inc (revision 1126) @@ -21,7 +21,11 @@ foreach /local/c in /local/dep/SRCS switch /local/c case {/src_plugins/} end - case {$(PLUGDIR)} end + case {$(PLUGDIR)} + put /local/o /local/c + sub {/local/o} {.c$} {.o} + print [@ gcc -MT @/local/o@ -MM @/local/c@ @/local/dep/CFLAGS@ @/local/pcb/DEPCFLAGS@ >> Makefile.dep +@]; end default print [@ gcc -MM @/local/c@ @/local/dep/CFLAGS@ >> Makefile.dep @]; end end Index: trunk/src/Makefile.dep =================================================================== --- trunk/src/Makefile.dep (revision 1125) +++ trunk/src/Makefile.dep (revision 1126) @@ -583,3 +583,110 @@ libpcb_fp.h data.h global.h misc.h ds.h mymem.h hid.h \ hid/lpr/../hidint.h hid/lpr/../ps/ps.h hid/common/hidnogui.h \ hid/common/hidinit.h +../src_plugins/autoplace/autoplace.o: \ + ../src_plugins/autoplace/autoplace.c ../config.h ../config.manual.h \ + ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + hid.h polyarea.h libpcb_fp.h ../src_plugins/autoplace/autoplace.h box.h \ + global.h misc.h ds.h mymem.h compat.h data.h draw.h error.h intersect.h \ + rtree.h macro.h mirror.h misc.h move.h mymem.h rats.h remove.h rotate.h +../src_plugins/autoplace/action.o: ../src_plugins/autoplace/action.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h \ + ../src_plugins/autoplace/autoplace.h dolists.h +../src_plugins/autoroute/autoroute.o: \ + ../src_plugins/autoroute/autoroute.c ../config.h ../config.manual.h \ + ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + hid.h polyarea.h libpcb_fp.h data.h global.h macro.h \ + ../src_plugins/autoroute/autoroute.h box.h misc.h ds.h mymem.h create.h \ + draw.h error.h find.h heap.h rtree.h misc.h \ + ../src_plugins/autoroute/mtspace.h vector.h mymem.h polygon.h rats.h \ + remove.h thermal.h undo.h pcb-printf.h +../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h box.h \ + global.h misc.h ds.h mymem.h heap.h rtree.h \ + ../src_plugins/autoroute/mtspace.h vector.h +../src_plugins/autoroute/action.o: ../src_plugins/autoroute/action.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h \ + ../src_plugins/autoroute/autoroute.h dolists.h +../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.c \ + ../config.h ../config.manual.h ../config.auto.h change.h global.h \ + const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ + libpcb_fp.h data.h draw.h error.h global.h resource.h set.h undo.h \ + ../src_plugins/vendordrill/vendor.h stub_vendor.h dolists.h +../src_plugins/puller/puller.o: ../src_plugins/puller/puller.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h \ + create.h global.h data.h draw.h misc.h ds.h mymem.h move.h pcb-printf.h \ + remove.h rtree.h strflags.h undo.h dolists.h +../src_plugins/edif/edif.o: ../src_plugins/edif/edif.c global.h \ + ../config.h ../config.manual.h ../config.auto.h const.h ../globalconst.h \ + ../config.h macro.h hid.h polyarea.h libpcb_fp.h data.h global.h \ + stub_edif.h +../src_plugins/toporouter/toporouter.o: \ + ../src_plugins/toporouter/toporouter.c \ + ../src_plugins/toporouter/toporouter.h data.h global.h ../config.h \ + ../config.manual.h ../config.auto.h const.h ../globalconst.h ../config.h \ + macro.h hid.h polyarea.h libpcb_fp.h macro.h \ + ../src_plugins/toporouter/../autoroute/autoroute.h global.h box.h misc.h \ + ds.h mymem.h create.h draw.h error.h find.h heap.h rtree.h misc.h \ + mymem.h polygon.h rats.h remove.h thermal.h undo.h ../src_3rd/gts/gts.h \ + pcb-printf.h +../src_plugins/oldactions/oldactions.o: \ + ../src_plugins/oldactions/oldactions.c ../config.h ../config.manual.h \ + ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + hid.h polyarea.h libpcb_fp.h data.h global.h action.h action_funclist.h \ + action_funchash.h change.h error.h undo.h dolists.h +../src_plugins/renumber/renumber.o: ../src_plugins/renumber/renumber.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h data.h \ + global.h action.h action_funclist.h action_funchash.h change.h error.h \ + undo.h pcb-printf.h dolists.h +../src_plugins/import_sch/import_sch.o: \ + ../src_plugins/import_sch/import_sch.c ../config.h ../config.manual.h \ + ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + hid.h polyarea.h libpcb_fp.h data.h global.h action.h action_funclist.h \ + action_funchash.h change.h error.h undo.h misc.h ds.h mymem.h \ + portability.h pcb-printf.h remove.h rats.h dolists.h +../src_plugins/autoroute/autoroute.o: \ + ../src_plugins/autoroute/autoroute.c ../config.h ../config.manual.h \ + ../config.auto.h global.h const.h ../globalconst.h ../config.h macro.h \ + hid.h polyarea.h libpcb_fp.h data.h global.h macro.h \ + ../src_plugins/autoroute/autoroute.h box.h misc.h ds.h mymem.h create.h \ + draw.h error.h find.h heap.h rtree.h misc.h \ + ../src_plugins/autoroute/mtspace.h vector.h mymem.h polygon.h rats.h \ + remove.h thermal.h undo.h pcb-printf.h +../src_plugins/autoroute/mtspace.o: ../src_plugins/autoroute/mtspace.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h box.h \ + global.h misc.h ds.h mymem.h heap.h rtree.h \ + ../src_plugins/autoroute/mtspace.h vector.h +../src_plugins/autoroute/action.o: ../src_plugins/autoroute/action.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h \ + ../src_plugins/autoroute/autoroute.h dolists.h +../src_plugins/vendordrill/vendor.o: ../src_plugins/vendordrill/vendor.c \ + ../config.h ../config.manual.h ../config.auto.h change.h global.h \ + const.h ../globalconst.h ../config.h macro.h hid.h polyarea.h \ + libpcb_fp.h data.h draw.h error.h global.h resource.h set.h undo.h \ + ../src_plugins/vendordrill/vendor.h stub_vendor.h dolists.h +../src_plugins/puller/puller.o: ../src_plugins/puller/puller.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h \ + create.h global.h data.h draw.h misc.h ds.h mymem.h move.h pcb-printf.h \ + remove.h rtree.h strflags.h undo.h dolists.h +../src_plugins/edif/edif.o: ../src_plugins/edif/edif.c global.h \ + ../config.h ../config.manual.h ../config.auto.h const.h ../globalconst.h \ + ../config.h macro.h hid.h polyarea.h libpcb_fp.h data.h global.h \ + stub_edif.h +../src_plugins/djopt/djopt.o: ../src_plugins/djopt/djopt.c ../config.h \ + ../config.manual.h ../config.auto.h global.h const.h ../globalconst.h \ + ../config.h macro.h hid.h polyarea.h libpcb_fp.h data.h global.h \ + create.h remove.h move.h draw.h undo.h strflags.h find.h pcb-printf.h \ + dolists.h +../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \ + ../config.h ../config.manual.h ../config.auto.h global.h const.h \ + ../globalconst.h ../config.h macro.h hid.h polyarea.h libpcb_fp.h data.h \ + global.h crosshair.h stub_stroke.h rotate.h undo.h set.h error.h misc.h \ + ds.h mymem.h Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 1125) +++ trunk/src/Makefile.in (revision 1126) @@ -7,6 +7,7 @@ append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -Iicons -DHAVE_CONFIG_H -g -DNDEBUG} append /local/pcb/LDFLAGS cc/ldflags append /local/pcb/LDFLAGS cc/rdynamic +put /local/pcb/DEPCFLAGS {} # main: objects @@ -326,4 +327,7 @@ # generate deps put /local/dep/CFLAGS /local/pcb/CFLAGS put /local/dep/SRCS /local/pcb/SRCS + +gsub /local/pcb/DEPSRCS {.o } {.c } +append /local/dep/SRCS /local/pcb/DEPSRCS include {../scconfig/Makefile.dep.inc} Index: trunk/src/Makefile.in.mod/Disable =================================================================== --- trunk/src/Makefile.in.mod/Disable (nonexistent) +++ trunk/src/Makefile.in.mod/Disable (revision 1126) @@ -0,0 +1,7 @@ +# tmpasm script for disable a plugin_src/ module +# Requires variables before the include: +# /local/pcb/mod/OBJS full path of all object files + +# append all objects to the source list used only for dependencies +# NOTE: .o suffixes will be replaced with .c before generating the dep +append /local/pcb/DEPSRCS /local/pcb/mod/OBJS Index: trunk/src_plugins/autoplace/Plug.tmpasm =================================================================== --- trunk/src_plugins/autoplace/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/autoplace/Plug.tmpasm (revision 1126) @@ -10,7 +10,6 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end - - - Index: trunk/src_plugins/autoroute/Plug.tmpasm =================================================================== --- trunk/src_plugins/autoroute/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/autoroute/Plug.tmpasm (revision 1126) @@ -10,4 +10,6 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/djopt/Plug.tmpasm =================================================================== --- trunk/src_plugins/djopt/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/djopt/Plug.tmpasm (revision 1126) @@ -5,8 +5,11 @@ append /local/pcb/mod/OBJS [@ $(PLUGDIR)/djopt/djopt.o @] if /local/pcb/djopt/enable then + if /local/pcb/djopt/buildin then include {Makefile.in.mod/Buildin} else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/edif/Plug.tmpasm =================================================================== --- trunk/src_plugins/edif/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/edif/Plug.tmpasm (revision 1126) @@ -11,4 +11,6 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/mincut/Plug.tmpasm =================================================================== --- trunk/src_plugins/mincut/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/mincut/Plug.tmpasm (revision 1126) @@ -10,4 +10,6 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/oldactions/Plug.tmpasm =================================================================== --- trunk/src_plugins/oldactions/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/oldactions/Plug.tmpasm (revision 1126) @@ -10,6 +10,8 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/puller/Plug.tmpasm =================================================================== --- trunk/src_plugins/puller/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/puller/Plug.tmpasm (revision 1126) @@ -10,4 +10,6 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/renumber/Plug.tmpasm =================================================================== --- trunk/src_plugins/renumber/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/renumber/Plug.tmpasm (revision 1126) @@ -10,6 +10,8 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/stroke/Plug.tmpasm =================================================================== --- trunk/src_plugins/stroke/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/stroke/Plug.tmpasm (revision 1126) @@ -11,6 +11,8 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/toporouter/Plug.tmpasm =================================================================== --- trunk/src_plugins/toporouter/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/toporouter/Plug.tmpasm (revision 1126) @@ -13,4 +13,6 @@ append /local/pcb/toporouter/OBJS { ../src_3rd/gts/libgts.a } include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end Index: trunk/src_plugins/vendordrill/Plug.tmpasm =================================================================== --- trunk/src_plugins/vendordrill/Plug.tmpasm (revision 1125) +++ trunk/src_plugins/vendordrill/Plug.tmpasm (revision 1126) @@ -10,4 +10,6 @@ else include {Makefile.in.mod/Plugin} end +else + include {Makefile.in.mod/Disable} end