Index: trunk/doc/developer/packaging/packages.sh =================================================================== --- trunk/doc/developer/packaging/packages.sh (revision 6231) +++ trunk/doc/developer/packaging/packages.sh (revision 6232) @@ -249,7 +249,7 @@ PUPEXTDEPS[pkg] = PUPEXTDEPS[pkg] " " tmp } - ($1 ~ "[.]tmpasm$") && ($3 == "/local/pcb/mod/CONFFILE") { + ($1 ~ "[.]tmpasm$") && ($3 == "/local/rnd/mod/CONFFILE") { fn=$4 sub("[{][ \t]*", "", fn) sub("[ \t]*[}]", "", fn) Index: trunk/src/plugins/Buildin.tmpasm =================================================================== --- trunk/src/plugins/Buildin.tmpasm (revision 6231) +++ trunk/src/plugins/Buildin.tmpasm (revision 6232) @@ -1,19 +1,19 @@ # tmpasm script for compiling a plugin_src/ module as a buildin # Requires variables before the include: -# /local/pcb/mod basename of the module (e.g. autoplace) -# /local/pcb/mod/OBJS full path of all object files -# /local/pcb/mod/OBJS_C99 full path of all object files for non-c89 -# /local/pcb/mod/CONF config file name +# /local/rnd/mod basename of the module (e.g. autoplace) +# /local/rnd/mod/OBJS full path of all object files +# /local/rnd/mod/OBJS_C99 full path of all object files for non-c89 +# /local/rnd/mod/CONF config file name -append /local/csch/buildin_pups [@@/local/pcb/mod@=@/local/pcb/mod@/@/local/pcb/mod@.pup@] {\n} +append /local/csch/buildin_pups [@@/local/rnd/mod@=@/local/rnd/mod@/@/local/rnd/mod@.pup@] {\n} -append /local/csch/MOD_OBJS ?/local/pcb/mod/OBJS -append /local/csch/MOD_OBJS_C99 ?/local/pcb/mod/OBJS_C99 -append /local/csch/MOD_LDFLAGS /local/pcb/mod/LDFLAGS -append /local/csch/MOD_CFLAGS /local/pcb/mod/CFLAGS +append /local/csch/MOD_OBJS ?/local/rnd/mod/OBJS +append /local/csch/MOD_OBJS_C99 ?/local/rnd/mod/OBJS_C99 +append /local/csch/MOD_LDFLAGS /local/rnd/mod/LDFLAGS +append /local/csch/MOD_CFLAGS /local/rnd/mod/CFLAGS append /local/csch/MOD_RULES [@ -mod_@/local/pcb/mod@: all +mod_@/local/rnd/mod@: all @] Index: trunk/src/plugins/Common_enabled.tmpasm =================================================================== --- trunk/src/plugins/Common_enabled.tmpasm (revision 6231) +++ trunk/src/plugins/Common_enabled.tmpasm (revision 6232) @@ -1,10 +1,10 @@ # explicit rules: .y -> .c # do not assume old yacc to work to different file names, do the generation # in a separate directory to allow parallel compilation with -j -switch /local/pcb/mod/YACC +switch /local/rnd/mod/YACC case {^$} end default - foreach /local/n in /local/pcb/mod/YACC + foreach /local/n in /local/rnd/mod/YACC put /local/bn /local/n sub {/local/bn} {^.*/} {} put /local/dn /local/n @@ -13,13 +13,13 @@ if /local/csch/want_parsgen then append /local/rnd/RULES [@ -# yacc for @/local/pcb/mod@ +# yacc for @/local/rnd/mod@ @/local/n@.c @/local/n@.h: @/local/n@.y cd @/local/dn@ && bison --defines=@/local/bn@.h --output=@/local/bn@.c --report-file=@/local/bn@.output -d @/local/bn@.y @] else append /local/rnd/RULES [@ -# dummy yacc for @/local/pcb/mod@ +# dummy yacc for @/local/rnd/mod@ @/local/n@.c @/local/n@.h: echo "skipping yacc..." @] @@ -31,10 +31,10 @@ # explicit rules: .l -> .c # do not assume old lex to work to different file names, do the generation # in a separate directory to allow parallel compilation with -j -switch /local/pcb/mod/LEX +switch /local/rnd/mod/LEX case {^$} end default - foreach /local/n in /local/pcb/mod/LEX + foreach /local/n in /local/rnd/mod/LEX if /local/csch/want_parsgen then put /local/bn /local/n @@ -43,13 +43,13 @@ sub {/local/dn} {/[^/]*$} {} append /local/rnd/RULES [@ -# lex for @/local/pcb/mod@ +# lex for @/local/rnd/mod@ @/local/n@.c @/local/n@.h: @/local/n@.l cd @/local/dn@ && flex --outfile=@/local/bn@.c --header-file=@/local/bn@.h @/local/bn@.l @] else append /local/rnd/RULES [@ -# dummy lex for @/local/pcb/mod@ +# dummy lex for @/local/rnd/mod@ @/local/n@.c: echo "skipping flex..." @] @@ -58,26 +58,26 @@ end end -put /local/pcb/mod/enabled {1} +put /local/rnd/mod/enabled {1} include /local/csch/tmpasm/plugin_conf include /local/csch/tmpasm/plugin_sphash include /local/csch/tmpasm/plugin_intconf -append /local/rnd/CLEANFILES ?/local/pcb/mod/CLEANFILES -append /local/rnd/DISTCLEANFILES ?/local/pcb/mod/DISTCLEANFILES +append /local/rnd/CLEANFILES ?/local/rnd/mod/CLEANFILES +append /local/rnd/DISTCLEANFILES ?/local/rnd/mod/DISTCLEANFILES -put /local/pcb/mod/enabled {} -put /local/pcb/mod/OBJS {} -put /local/pcb/mod/OBJS_C99 {} -put /local/pcb/mod/LDFLAGS {} -put /local/pcb/mod/CFLAGS {} -put /local/pcb/mod/YACC {} -put /local/pcb/mod/LEX {} -put /local/pcb/mod/SPHASH {} -put /local/pcb/mod/SPHASH_ARGS {} -put /local/pcb/mod/CLEANFILES {} -put /local/pcb/mod/DISTCLEANFILES {} -put /local/pcb/mod {} -put /local/pcb/mod/CONFFILE {} -put /local/pcb/mod/CONFVAR {} +put /local/rnd/mod/enabled {} +put /local/rnd/mod/OBJS {} +put /local/rnd/mod/OBJS_C99 {} +put /local/rnd/mod/LDFLAGS {} +put /local/rnd/mod/CFLAGS {} +put /local/rnd/mod/YACC {} +put /local/rnd/mod/LEX {} +put /local/rnd/mod/SPHASH {} +put /local/rnd/mod/SPHASH_ARGS {} +put /local/rnd/mod/CLEANFILES {} +put /local/rnd/mod/DISTCLEANFILES {} +put /local/rnd/mod {} +put /local/rnd/mod/CONFFILE {} +put /local/rnd/mod/CONFVAR {} Index: trunk/src/plugins/Disable.tmpasm =================================================================== --- trunk/src/plugins/Disable.tmpasm (revision 6231) +++ trunk/src/plugins/Disable.tmpasm (revision 6232) @@ -1,24 +1,24 @@ # tmpasm script for disable a plugin_src/ module # Requires variables before the include: -# /local/pcb/mod/OBJS full path of all object files +# /local/rnd/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 -append /local/pcb/DEPSRCS ?/local/pcb/mod/OBJS_C99 +append /local/pcb/DEPSRCS ?/local/rnd/mod/OBJS +append /local/pcb/DEPSRCS ?/local/rnd/mod/OBJS_C99 -put /local/pcb/mod/enabled {0} +put /local/rnd/mod/enabled {0} include /local/csch/tmpasm/plugin_conf include /local/csch/tmpasm/plugin_sphash include /local/csch/tmpasm/plugin_intconf -put /local/pcb/mod/enabled {} -put /local/pcb/mod/OBJS {} -put /local/pcb/mod/OBJS_C99 {} -put /local/pcb/mod/CONF {} -put /local/pcb/mod/LDFLAGS {} -put /local/pcb/mod/CFLAGS {} -put /local/pcb/mod {} -put /local/pcb/mod/CONFFILE {} -put /local/pcb/mod/CONFVAR {} +put /local/rnd/mod/enabled {} +put /local/rnd/mod/OBJS {} +put /local/rnd/mod/OBJS_C99 {} +put /local/rnd/mod/CONF {} +put /local/rnd/mod/LDFLAGS {} +put /local/rnd/mod/CFLAGS {} +put /local/rnd/mod {} +put /local/rnd/mod/CONFFILE {} +put /local/rnd/mod/CONFVAR {} Index: trunk/src/plugins/Plugin.tmpasm =================================================================== --- trunk/src/plugins/Plugin.tmpasm (revision 6231) +++ trunk/src/plugins/Plugin.tmpasm (revision 6232) @@ -1,49 +1,49 @@ # tmpasm script for compiling a plugin_src/ module as a plugin # Requires variables before the include: -# /local/pcb/mod basename of the module (e.g. autoplace) -# /local/pcb/mod/OBJS full path of all object files -# /local/pcb/mod/OBJS_C99 full path of all object files for non-c89 +# /local/rnd/mod basename of the module (e.g. autoplace) +# /local/rnd/mod/OBJS full path of all object files +# /local/rnd/mod/OBJS_C99 full path of all object files for non-c89 # clean up input vars -uniq /local/pcb/mod/OBJS -uniq /local/pcb/mod/OBJS_C99 -uniq /local/pcb/mod/CFLAGS -uniq /local/pcb/mod/LDFLAGS -uniq /local/pcb/mod/LIBS +uniq /local/rnd/mod/OBJS +uniq /local/rnd/mod/OBJS_C99 +uniq /local/rnd/mod/CFLAGS +uniq /local/rnd/mod/LDFLAGS +uniq /local/rnd/mod/LIBS # generate .c -> .o rules in /local/comp/output -put /local/comp/OBJS_C89 ?/local/pcb/mod/OBJS -put /local/comp/OBJS_C99 ?/local/pcb/mod/OBJS_C99 -put /local/comp/C89FLAGS [@ $(C89FLAGS) @/local/pcb/mod/CFLAGS@ @] -put /local/comp/C99FLAGS [@ $(CFLAGS) @/local/pcb/mod/CFLAGS@ @] +put /local/comp/OBJS_C89 ?/local/rnd/mod/OBJS +put /local/comp/OBJS_C99 ?/local/rnd/mod/OBJS_C99 +put /local/comp/C89FLAGS [@ $(C89FLAGS) @/local/rnd/mod/CFLAGS@ @] +put /local/comp/C99FLAGS [@ $(CFLAGS) @/local/rnd/mod/CFLAGS@ @] include /local/csch/tmpasm/comp_var -append /local/pcb/all [@ $(PLUGIDIR)/@/local/pcb/mod@.so @] +append /local/pcb/all [@ $(PLUGIDIR)/@/local/rnd/mod@.so @] append /local/rnd/rules/install_ [@ - $(SCCBOX) $(HOW) "$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so" "$(LIBDIR)/plugins/@/local/pcb/mod@.so" - $(SCCBOX) $(HOW) "$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.pup" "$(LIBDIR)/plugins/@/local/pcb/mod@.pup"@] + $(SCCBOX) $(HOW) "$(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.so" "$(LIBDIR)/plugins/@/local/rnd/mod@.so" + $(SCCBOX) $(HOW) "$(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.pup" "$(LIBDIR)/plugins/@/local/rnd/mod@.pup"@] -append /local/rnd/CLEANFILES [@ $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so $(PLUGIDIR)/@/local/pcb/mod@.so $(PLUGIDIR)/@/local/pcb/mod@.pup @/local/pcb/mod/OBJS@ @/local/pcb/mod/OBJS_C99@ @] +append /local/rnd/CLEANFILES [@ $(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.so $(PLUGIDIR)/@/local/rnd/mod@.so $(PLUGIDIR)/@/local/rnd/mod@.pup @/local/rnd/mod/OBJS@ @/local/rnd/mod/OBJS_C99@ @] append /local/csch/MOD_RULES [@ -### Module @/local/pcb/mod@: plugin ### +### Module @/local/rnd/mod@: plugin ### -$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so: @/local/pcb/mod/OBJS@ @/local/pcb/mod/OBJS_C99@ - $(CC) -shared @cc/rdynamic@ -o $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so @/local/pcb/mod/OBJS@ @/local/pcb/mod/OBJS_C99@ $(LDFLAGS) @/local/pcb/mod/LDFLAGS@ +$(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.so: @/local/rnd/mod/OBJS@ @/local/rnd/mod/OBJS_C99@ + $(CC) -shared @cc/rdynamic@ -o $(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.so @/local/rnd/mod/OBJS@ @/local/rnd/mod/OBJS_C99@ $(LDFLAGS) @/local/rnd/mod/LDFLAGS@ -mod_@/local/pcb/mod@: $(PLUGIDIR)/@/local/pcb/mod@.so +mod_@/local/rnd/mod@: $(PLUGIDIR)/@/local/rnd/mod@.so -$(PLUGIDIR)/@/local/pcb/mod@.so: $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so +$(PLUGIDIR)/@/local/rnd/mod@.so: $(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.so $(MKDIR) $(PLUGIDIR) - $(CP) $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.so $(PLUGIDIR)/@/local/pcb/mod@.so - $(CP) $(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod@.pup $(PLUGIDIR)/@/local/pcb/mod@.pup + $(CP) $(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.so $(PLUGIDIR)/@/local/rnd/mod@.so + $(CP) $(PLUGDIR)/@/local/rnd/mod@/@/local/rnd/mod@.pup $(PLUGIDIR)/@/local/rnd/mod@.pup # module .c -> .o rules @/local/comp/output@ -### Module @/local/pcb/mod@ end ### +### Module @/local/rnd/mod@ end ### @] include /local/csch/tmpasm/common_enabled Index: trunk/src/plugins/act_draw/Plug.tmpasm =================================================================== --- trunk/src/plugins/act_draw/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/act_draw/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {act_draw} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {act_draw} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/act_draw/act_draw.o @] Index: trunk/src/plugins/act_read/Plug.tmpasm =================================================================== --- trunk/src/plugins/act_read/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/act_read/Plug.tmpasm (revision 6232) @@ -1,9 +1,9 @@ -put /local/pcb/mod {act_read} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {act_read} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/act_read/act_read.o $(PLUGDIR)/act_read/keywords_sphash.o @] -put /local/pcb/mod/SPHASH {$(PLUGDIR)/act_read/keywords.sphash} +put /local/rnd/mod/SPHASH {$(PLUGDIR)/act_read/keywords.sphash} switch /local/pcb/act_read/controls Index: trunk/src/plugins/backann/Plug.tmpasm =================================================================== --- trunk/src/plugins/backann/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/backann/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {backann} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {backann} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/backann/backann.o $(PLUGDIR)/backann/bap_sphash.o $(PLUGDIR)/backann/check_ba.o @@ -6,7 +6,7 @@ $(PLUGDIR)/backann/auto_ba.o @] -put /local/pcb/mod/SPHASH {$(PLUGDIR)/backann/bap.sphash} +put /local/rnd/mod/SPHASH {$(PLUGDIR)/backann/bap.sphash} switch /local/pcb/backann/controls case {buildin} include /local/csch/tmpasm/buildin; end; Index: trunk/src/plugins/construct/Plug.tmpasm =================================================================== --- trunk/src/plugins/construct/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/construct/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {construct} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {construct} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/construct/construct.o @] Index: trunk/src/plugins/diag/Plug.tmpasm =================================================================== --- trunk/src/plugins/diag/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/diag/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {diag} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {diag} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/diag/diag.o @] Index: trunk/src/plugins/export_abst/Plug.tmpasm =================================================================== --- trunk/src/plugins/export_abst/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/export_abst/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {export_abst} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {export_abst} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_abst/export_abst.o @] Index: trunk/src/plugins/export_lpr/Plug.tmpasm =================================================================== --- trunk/src/plugins/export_lpr/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/export_lpr/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {export_lpr} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {export_lpr} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_lpr/lpr.o @] Index: trunk/src/plugins/export_png/Plug.tmpasm =================================================================== --- trunk/src/plugins/export_png/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/export_png/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {export_png} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {export_png} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_png/export_png.o @] Index: trunk/src/plugins/export_ps/Plug.tmpasm =================================================================== --- trunk/src/plugins/export_ps/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/export_ps/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {export_ps} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {export_ps} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_ps/export_ps.o $(PLUGDIR)/export_ps/ps.o $(PLUGDIR)/export_ps/eps.o Index: trunk/src/plugins/export_svg/Plug.tmpasm =================================================================== --- trunk/src/plugins/export_svg/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/export_svg/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {export_svg} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {export_svg} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_svg/export_svg.o @] Index: trunk/src/plugins/export_tedax/Plug.tmpasm =================================================================== --- trunk/src/plugins/export_tedax/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/export_tedax/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {export_tedax} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {export_tedax} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/export_tedax/export_tedax.o @] Index: trunk/src/plugins/gui/Plug.tmpasm =================================================================== --- trunk/src/plugins/gui/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/gui/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {gui} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {gui} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/gui/act.o $(PLUGDIR)/gui/layersel.o $(PLUGDIR)/gui/sheetsel.o Index: trunk/src/plugins/io_altium/Plug.tmpasm =================================================================== --- trunk/src/plugins/io_altium/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/io_altium/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {io_altium} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {io_altium} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/io_altium/io_altium.o $(PLUGDIR)/io_altium/read.o $(PLUGDIR)/io_altium/pcbdoc_ascii.o @@ -7,14 +7,14 @@ ../../src_3rd/libucdf/ucdf.o @] -put /local/pcb/mod/SPHASH {$(PLUGDIR)/io_altium/altium_kw.sphash} -put /local/pcb/mod/SPHASH_ARGS {--prefix altium_kw --multi -i} +put /local/rnd/mod/SPHASH {$(PLUGDIR)/io_altium/altium_kw.sphash} +put /local/rnd/mod/SPHASH_ARGS {--prefix altium_kw --multi -i} switch /local/pcb/io_altium/controls case {disable} end; default - put /local/pcb/mod/CFLAGS /target/libs/sul/libxml2/cflags - put /local/pcb/mod/LDFLAGS /target/libs/sul/libxml2/ldflags + put /local/rnd/mod/CFLAGS /target/libs/sul/libxml2/cflags + put /local/rnd/mod/LDFLAGS /target/libs/sul/libxml2/ldflags end end Index: trunk/src/plugins/io_geda/Plug.tmpasm =================================================================== --- trunk/src/plugins/io_geda/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/io_geda/Plug.tmpasm (revision 6232) @@ -1,12 +1,12 @@ -put /local/pcb/mod {io_geda} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {io_geda} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/io_geda/io_geda.o $(PLUGDIR)/io_geda/read.o @] -put /local/pcb/mod/CONFFILE {io_geda.conf} -put /local/pcb/mod/CONF {$(PLUGDIR)/io_geda/io_geda_conf.h} -put /local/pcb/mod/CONFVAR {io_geda_conf_internal} +put /local/rnd/mod/CONFFILE {io_geda.conf} +put /local/rnd/mod/CONF {$(PLUGDIR)/io_geda/io_geda_conf.h} +put /local/rnd/mod/CONFVAR {io_geda_conf_internal} switch /local/pcb/io_geda/controls Index: trunk/src/plugins/io_lihata/Plug.tmpasm =================================================================== --- trunk/src/plugins/io_lihata/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/io_lihata/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {io_lihata} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {io_lihata} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/io_lihata/io_lihata.o $(PLUGDIR)/io_lihata/read.o $(PLUGDIR)/io_lihata/write.o Index: trunk/src/plugins/io_tinycad/Plug.tmpasm =================================================================== --- trunk/src/plugins/io_tinycad/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/io_tinycad/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {io_tinycad} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {io_tinycad} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/io_tinycad/io_tinycad.o $(PLUGDIR)/io_tinycad/read.o @] @@ -7,8 +7,8 @@ switch /local/pcb/io_tinycad/controls case {disable} end; default - put /local/pcb/mod/CFLAGS /target/libs/sul/libxml2/cflags - put /local/pcb/mod/LDFLAGS /target/libs/sul/libxml2/ldflags + put /local/rnd/mod/CFLAGS /target/libs/sul/libxml2/cflags + put /local/rnd/mod/LDFLAGS /target/libs/sul/libxml2/ldflags end end Index: trunk/src/plugins/lib_alien/Plug.tmpasm =================================================================== --- trunk/src/plugins/lib_alien/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/lib_alien/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {lib_alien} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {lib_alien} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/lib_alien/lib_alien.o $(PLUGDIR)/lib_alien/read_helper.o @] Index: trunk/src/plugins/place/Plug.tmpasm =================================================================== --- trunk/src/plugins/place/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/place/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {place} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {place} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/place/place.o @] Index: trunk/src/plugins/propedit/Plug.tmpasm =================================================================== --- trunk/src/plugins/propedit/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/propedit/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {propedit} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {propedit} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/propedit/propedit.o $(PLUGDIR)/propedit/props.o $(PLUGDIR)/propedit/propsel.o Index: trunk/src/plugins/query/Plug.tmpasm =================================================================== --- trunk/src/plugins/query/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/query/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {query} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {query} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/query/query.o $(PLUGDIR)/query/query_access.o $(PLUGDIR)/query/query_act.o @@ -10,9 +10,9 @@ $(PLUGDIR)/query/fields_sphash.o $(PLUGDIR)/query/dlg_search.o @] -put /local/pcb/mod/YACC {$(PLUGDIR)/query/query_y} -put /local/pcb/mod/LEX {$(PLUGDIR)/query/query_l} -put /local/pcb/mod/SPHASH {$(PLUGDIR)/query/fields.sphash} +put /local/rnd/mod/YACC {$(PLUGDIR)/query/query_y} +put /local/rnd/mod/LEX {$(PLUGDIR)/query/query_l} +put /local/rnd/mod/SPHASH {$(PLUGDIR)/query/fields.sphash} switch /local/pcb/query/controls case {buildin} include /local/csch/tmpasm/buildin; end; Index: trunk/src/plugins/renumber/Plug.tmpasm =================================================================== --- trunk/src/plugins/renumber/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/renumber/Plug.tmpasm (revision 6232) @@ -1,11 +1,11 @@ -put /local/pcb/mod {renumber} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {renumber} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/renumber/renumber.o @] -put /local/pcb/mod/CONFFILE {renumber.conf} -put /local/pcb/mod/CONF {$(PLUGDIR)/renumber/renumber_conf.h} -put /local/pcb/mod/CONFVAR {renumber_conf_internal} +put /local/rnd/mod/CONFFILE {renumber.conf} +put /local/rnd/mod/CONF {$(PLUGDIR)/renumber/renumber_conf.h} +put /local/rnd/mod/CONFVAR {renumber_conf_internal} switch /local/pcb/renumber/controls case {buildin} include /local/csch/tmpasm/buildin; end; Index: trunk/src/plugins/sch_dialogs/Plug.tmpasm =================================================================== --- trunk/src/plugins/sch_dialogs/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/sch_dialogs/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {sch_dialogs} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {sch_dialogs} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/sch_dialogs/sch_dialogs.o $(PLUGDIR)/sch_dialogs/dlg_about.o $(PLUGDIR)/sch_dialogs/dlg_undo.o @@ -15,9 +15,9 @@ $(PLUGDIR)/sch_dialogs/abst_attr.o @] -put /local/pcb/mod/CONFFILE {adialogs.conf} -put /local/pcb/mod/CONF {$(PLUGDIR)/sch_dialogs/adialogs_conf.h} -put /local/pcb/mod/CONFVAR {adialogs_conf_internal} +put /local/rnd/mod/CONFFILE {adialogs.conf} +put /local/rnd/mod/CONF {$(PLUGDIR)/sch_dialogs/adialogs_conf.h} +put /local/rnd/mod/CONFVAR {adialogs_conf_internal} switch /local/pcb/sch_dialogs/controls case {buildin} include /local/csch/tmpasm/buildin; end; Index: trunk/src/plugins/std_cschem/Plug.tmpasm =================================================================== --- trunk/src/plugins/std_cschem/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/std_cschem/Plug.tmpasm (revision 6232) @@ -1,11 +1,11 @@ -put /local/pcb/mod {std_cschem} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {std_cschem} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/std_cschem/std_cschem.o @] -put /local/pcb/mod/CONFFILE {std_cschem.conf} -put /local/pcb/mod/CONF {$(PLUGDIR)/std_cschem/std_cschem_conf.h} -put /local/pcb/mod/CONFVAR {std_cschem_conf_internal} +put /local/rnd/mod/CONFFILE {std_cschem.conf} +put /local/rnd/mod/CONF {$(PLUGDIR)/std_cschem/std_cschem_conf.h} +put /local/rnd/mod/CONFVAR {std_cschem_conf_internal} switch /local/pcb/std_cschem/controls case {buildin} include /local/csch/tmpasm/buildin; end; Index: trunk/src/plugins/std_devmap/Plug.tmpasm =================================================================== --- trunk/src/plugins/std_devmap/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/std_devmap/Plug.tmpasm (revision 6232) @@ -1,11 +1,11 @@ -put /local/pcb/mod {std_devmap} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {std_devmap} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/std_devmap/std_devmap.o @] -put /local/pcb/mod/CONFFILE {std_devmap.conf} -put /local/pcb/mod/CONF {$(PLUGDIR)/std_devmap/std_devmap_conf.h} -put /local/pcb/mod/CONFVAR {std_devmap_conf_internal} +put /local/rnd/mod/CONFFILE {std_devmap.conf} +put /local/rnd/mod/CONF {$(PLUGDIR)/std_devmap/std_devmap_conf.h} +put /local/rnd/mod/CONFVAR {std_devmap_conf_internal} switch /local/pcb/std_devmap/controls case {buildin} include /local/csch/tmpasm/buildin; end; Index: trunk/src/plugins/std_forge/Plug.tmpasm =================================================================== --- trunk/src/plugins/std_forge/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/std_forge/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {std_forge} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {std_forge} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/std_forge/std_forge.o @] Index: trunk/src/plugins/std_tools/Plug.tmpasm =================================================================== --- trunk/src/plugins/std_tools/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/std_tools/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {std_tools} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {std_tools} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/std_tools/std_tools.o @] Index: trunk/src/plugins/symlib_fs/Plug.tmpasm =================================================================== --- trunk/src/plugins/symlib_fs/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/symlib_fs/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {symlib_fs} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {symlib_fs} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/symlib_fs/symlib_fs.o @] Index: trunk/src/plugins/symlib_local/Plug.tmpasm =================================================================== --- trunk/src/plugins/symlib_local/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/symlib_local/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {symlib_local} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {symlib_local} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/symlib_local/symlib_local.o @] Index: trunk/src/plugins/target_none/Plug.tmpasm =================================================================== --- trunk/src/plugins/target_none/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/target_none/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {target_none} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {target_none} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/target_none/target_none.o @] Index: trunk/src/plugins/target_pcb/Plug.tmpasm =================================================================== --- trunk/src/plugins/target_pcb/Plug.tmpasm (revision 6231) +++ trunk/src/plugins/target_pcb/Plug.tmpasm (revision 6232) @@ -1,5 +1,5 @@ -put /local/pcb/mod {target_pcb} -put /local/pcb/mod/OBJS [@ +put /local/rnd/mod {target_pcb} +put /local/rnd/mod/OBJS [@ $(PLUGDIR)/target_pcb/target_pcb.o @] Index: trunk/src/sch-rnd/Makefile.in =================================================================== --- trunk/src/sch-rnd/Makefile.in (revision 6231) +++ trunk/src/sch-rnd/Makefile.in (revision 6232) @@ -58,15 +58,15 @@ put /local/rnd/rules/install {} put /local/rnd/rules/linstall {} put /local/rnd/rules/uninstall {} -put /local/pcb/mod/OBJS {} -put /local/pcb/mod/OBJS_C99 {} -put /local/pcb/mod/CONF {} -put /local/pcb/mod/LDFLAGS {} -put /local/pcb/mod/CFLAGS {} -put /local/pcb/mod/YACC {} -put /local/pcb/mod/LEX {} -put /local/pcb/mod/BYACCIC {} -put /local/pcb/mod/UREGLEX {} +put /local/rnd/mod/OBJS {} +put /local/rnd/mod/OBJS_C99 {} +put /local/rnd/mod/CONF {} +put /local/rnd/mod/LDFLAGS {} +put /local/rnd/mod/CFLAGS {} +put /local/rnd/mod/YACC {} +put /local/rnd/mod/LEX {} +put /local/rnd/mod/BYACCIC {} +put /local/rnd/mod/UREGLEX {} put /local/csch/tmpasm/buildin {../src/plugins/Buildin.tmpasm} put /local/csch/tmpasm/plugin {../src/plugins/Plugin.tmpasm}