Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 19613) +++ trunk/src/Makefile.in (revision 19614) @@ -265,6 +265,7 @@ put /local/pcb/tmpasm/common_enabled {../src_plugins/Common_enabled.tmpasm} put /local/pcb/tmpasm/plugin_sphash {../scconfig/template/plugin_sphash.tmpasm} put /local/pcb/tmpasm/plugin_conf {../scconfig/template/plugin_conf.tmpasm} +put /local/pcb/tmpasm/plugin_intconf {../scconfig/template/plugin_intconf.tmpasm} include {../src_plugins/plugins_ALL.tmpasm} Index: trunk/src_plugins/Common_enabled.tmpasm =================================================================== --- trunk/src_plugins/Common_enabled.tmpasm (revision 19613) +++ trunk/src_plugins/Common_enabled.tmpasm (revision 19614) @@ -58,11 +58,15 @@ end end +put /local/pcb/mod/enabled {1} + include /local/pcb/tmpasm/plugin_conf include /local/pcb/tmpasm/plugin_sphash +include /local/pcb/tmpasm/plugin_intconf append /local/pcb/CLEANFILES ?/local/pcb/mod/CLEANFILES +put /local/pcb/mod/enabled {} put /local/pcb/mod/OBJS {} put /local/pcb/mod/OBJS_C99 {} put /local/pcb/mod/LDFLAGS {} @@ -72,4 +76,5 @@ put /local/pcb/mod/SPHASH {} put /local/pcb/mod/CLEANFILES {} put /local/pcb/mod {} - +put /local/pcb/mod/CONFFILE {} +put /local/pcb/mod/CONFVAR {} Index: trunk/src_plugins/Disable.tmpasm =================================================================== --- trunk/src_plugins/Disable.tmpasm (revision 19613) +++ trunk/src_plugins/Disable.tmpasm (revision 19614) @@ -7,10 +7,13 @@ append /local/pcb/DEPSRCS ?/local/pcb/mod/OBJS append /local/pcb/DEPSRCS ?/local/pcb/mod/OBJS_C99 +put /local/pcb/mod/enabled {0} include /local/pcb/tmpasm/plugin_conf include /local/pcb/tmpasm/plugin_sphash +include /local/pcb/tmpasm/plugin_intconf +put /local/pcb/mod/enabled {} put /local/pcb/mod/OBJS {} put /local/pcb/mod/OBJS_C99 {} put /local/pcb/mod/CONF {} @@ -17,3 +20,5 @@ put /local/pcb/mod/LDFLAGS {} put /local/pcb/mod/CFLAGS {} put /local/pcb/mod {} +put /local/pcb/mod/CONFFILE {} +put /local/pcb/mod/CONFVAR {} Index: trunk/src_plugins/cam/Plug.tmpasm =================================================================== --- trunk/src_plugins/cam/Plug.tmpasm (revision 19613) +++ trunk/src_plugins/cam/Plug.tmpasm (revision 19614) @@ -1,6 +1,8 @@ put /local/pcb/mod {cam} put /local/pcb/mod/OBJS [@ $(PLUGDIR)/cam/cam.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/cam/cam_conf.h} +put /local/pcb/mod/CONFFILE {cam.conf} +put /local/pcb/mod/CONFVAR {cam_conf_internal} switch /local/pcb/cam/controls case {buildin} include /local/pcb/tmpasm/buildin; end; @@ -8,16 +10,3 @@ case {disable} include /local/pcb/tmpasm/disable; end; end -append /local/pcb/DEPDEPS { ../src_plugins/cam/conf_internal.c } -append /local/pcb/DISTCLEANFILES { ../src_plugins/cam/conf_internal.c } -append /local/pcb/RULES [@ -../src_plugins/cam/conf_internal.c: ../src_plugins/cam/cam.conf $(CQUOTE) - $(CQUOTE) -n cam_conf_internal < ../src_plugins/cam/cam.conf > ../src_plugins/cam/conf_internal.c -@] - -switch /local/pcb/cam/controls - case {disable} end; - default - append /local/pcb/rules/install_ {\n $(SCCBOX) $(HOW) "../src_plugins/cam/cam.conf" "$(DATADIR)/cam.conf"} - end -end Index: trunk/src_plugins/export_xy/Plug.tmpasm =================================================================== --- trunk/src_plugins/export_xy/Plug.tmpasm (revision 19613) +++ trunk/src_plugins/export_xy/Plug.tmpasm (revision 19614) @@ -1,6 +1,8 @@ put /local/pcb/mod {export_xy} put /local/pcb/mod/OBJS [@ $(PLUGDIR)/export_xy/xy.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/export_xy/xy_conf.h} +put /local/pcb/mod/CONFFILE {export_xy.conf} +put /local/pcb/mod/CONFVAR {export_xy_conf_internal} switch /local/pcb/export_xy/controls case {buildin} include /local/pcb/tmpasm/buildin; end; @@ -7,17 +9,3 @@ case {plugin} include /local/pcb/tmpasm/plugin; end; case {disable} include /local/pcb/tmpasm/disable; end; end - -append /local/pcb/DEPDEPS { ../src_plugins/export_xy/conf_internal.c } -append /local/pcb/DISTCLEANFILES { ../src_plugins/export_xy/conf_internal.c } -append /local/pcb/RULES [@ -../src_plugins/export_xy/conf_internal.c: ../src_plugins/export_xy/export_xy.conf $(CQUOTE) - $(CQUOTE) -n export_xy_conf_internal < ../src_plugins/export_xy/export_xy.conf > ../src_plugins/export_xy/conf_internal.c -@] - -switch /local/pcb/export_xy/controls - case {disable} end; - default - append /local/pcb/rules/install_ {\n $(SCCBOX) $(HOW) "../src_plugins/export_xy/export_xy.conf" "$(DATADIR)/export_xy.conf"} - end -end Index: trunk/src_plugins/fp_wget/Plug.tmpasm =================================================================== --- trunk/src_plugins/fp_wget/Plug.tmpasm (revision 19613) +++ trunk/src_plugins/fp_wget/Plug.tmpasm (revision 19614) @@ -6,6 +6,8 @@ $(PLUGDIR)/fp_wget/edakrill.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/fp_wget/fp_wget_conf.h} +put /local/pcb/mod/CONFFILE {fp_wget.conf} +put /local/pcb/mod/CONFVAR {fp_wget_conf_internal} switch /local/pcb/fp_wget/controls case {buildin} include /local/pcb/tmpasm/buildin; end; @@ -12,17 +14,3 @@ case {plugin} include /local/pcb/tmpasm/plugin; end; case {disable} include /local/pcb/tmpasm/disable; end; end - -append /local/pcb/DEPDEPS { ../src_plugins/fp_wget/conf_internal.c } -append /local/pcb/DISTCLEANFILES { ../src_plugins/fp_wget/conf_internal.c } -append /local/pcb/RULES [@ -../src_plugins/fp_wget/conf_internal.c: ../src_plugins/fp_wget/fp_wget.conf $(CQUOTE) - $(CQUOTE) -n fp_wget_conf_internal < ../src_plugins/fp_wget/fp_wget.conf > ../src_plugins/fp_wget/conf_internal.c -@] - -switch /local/pcb/fp_wget/controls - case {disable} end; - default - append /local/pcb/rules/install_ {\n $(SCCBOX) $(HOW) "../src_plugins/fp_wget/fp_wget.conf" "$(DATADIR)/fp_wget.conf"} - end -end Index: trunk/src_plugins/stroke/Plug.tmpasm =================================================================== --- trunk/src_plugins/stroke/Plug.tmpasm (revision 19613) +++ trunk/src_plugins/stroke/Plug.tmpasm (revision 19614) @@ -1,6 +1,8 @@ put /local/pcb/mod {stroke} put /local/pcb/mod/OBJS [@ $(PLUGDIR)/stroke/stroke.o @] put /local/pcb/mod/CONF {$(PLUGDIR)/stroke/stroke_conf.h} +put /local/pcb/mod/CONFFILE {stroke.conf} +put /local/pcb/mod/CONFVAR {stroke_conf_internal} switch /local/pcb/stroke/controls case {disable} end; @@ -16,17 +18,3 @@ case {plugin} include /local/pcb/tmpasm/plugin; end; case {disable} include /local/pcb/tmpasm/disable; end; end - -append /local/pcb/DEPDEPS { ../src_plugins/stroke/conf_internal.c } -append /local/pcb/DISTCLEANFILES { ../src_plugins/stroke/conf_internal.c } -append /local/pcb/RULES [@ -../src_plugins/stroke/conf_internal.c: ../src_plugins/stroke/stroke.conf $(CQUOTE) - $(CQUOTE) -n stroke_conf_internal < ../src_plugins/stroke/stroke.conf > ../src_plugins/stroke/conf_internal.c -@] - -switch /local/pcb/stroke/controls - case {disable} end; - default - append /local/pcb/rules/install_ {\n $(SCCBOX) $(HOW) "../src_plugins/stroke/stroke.conf" "$(DATADIR)/stroke.conf"} - end -end