Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 32611)
+++ trunk/scconfig/hooks.c	(revision 32612)
@@ -13,7 +13,8 @@
 
 #define version "2.2.4"
 
-#define LIBRND_ROOT "../src_3rd/librnd"
+#define LIBRND_ROOT         "../src_3rd/librnd"
+#define LIBRND_PLUGIN_ROOT  "../src_3rd/librnd_plugins"
 #include "../src_3rd/puplug/scconfig_hooks.h"
 #include "../src_3rd/libfungw/scconfig_hooks.h"
 #include "../src_3rd/libporty_net/hooks_net.c"
@@ -325,8 +326,6 @@
 
 	printf("Generating pcb-rnd config.h (%d)\n", generr |= tmpasm("..", "config.h.in", "config.h"));
 
-	printf("Generating opengl.h (%d)\n", generr |= tmpasm("../src_plugins/lib_hid_gl", "opengl.h.in", "opengl.h"));
-
 	printf("Generating tests/librnd/inc_all.h (%d)\n", generr |= tmpasm("../tests/librnd", "inc_all.h.in", "inc_all.h"));
 
 	if (plug_is_enabled("export_vfs_fuse"))
Index: trunk/scconfig/plugins.h
===================================================================
--- trunk/scconfig/plugins.h	(revision 32611)
+++ trunk/scconfig/plugins.h	(revision 32612)
@@ -7,16 +7,16 @@
 plugin_header("\nLibrary plugins:\n")
 plugin_def("lib_compat_help",  "#compatibility helper functions", sbuildin, 1, 0)
 plugin_def("lib_formula",      "mathematical forumlas",           sbuildin, 1, 0)
-plugin_def("lib_gensexpr",     "#s-expression library",           sdisable, 0, 0)
-plugin_def("lib_gtk_common",   "all-hid_gtk common code",         sdisable, 0, 0)
+plugin_def("lib_gensexpr",     "#s-expression library",           sdisable, 0, 1)
+plugin_def("lib_gtk_common",   "all-hid_gtk common code",         sdisable, 0, 1)
 plugin_def("lib_hid_common",   "all-gui-hid common code",         sdisable, 0, 1)
-plugin_def("lib_hid_gl",       "openGL rendering",                sdisable, 0, 0)
+plugin_def("lib_hid_gl",       "openGL rendering",                sdisable, 0, 1)
 plugin_def("lib_hid_pcbui",    "common PCB-related GUI elements", sdisable, 0, 0)
 plugin_def("lib_netmap",       "map nets and objects",            sdisable, 0, 0)
 plugin_def("lib_polyhelp",     "polygon helpers",                 sbuildin, 1, 0)
-plugin_def("lib_portynet",     "#IPv4 tcp",                       sbuildin, 1, 0)
+plugin_def("lib_portynet",     "#IPv4 tcp",                       sbuildin, 1, 1)
 plugin_def("lib_vfs",          "fetch data for VFS export",       sdisable, 0, 0)
-plugin_def("lib_wget",         "wget(1) wrapper",                 sdisable, 0, 0)
+plugin_def("lib_wget",         "wget(1) wrapper",                 sdisable, 0, 1)
 
 plugin_header("\nFeature plugins:\n")
 plugin_def("acompnet",         "net auto-completion",             sdisable, 1, 0)
@@ -40,9 +40,9 @@
 plugin_def("extedit",          "edit with external program",      sbuildin, 1, 0)
 plugin_def("exto_std",         "standard extended objects",       sbuildin, 1, 0)
 plugin_def("fontmode",         "font editor",                     sbuildin, 1, 0)
-plugin_def("irc",              "on-line support (IRC)",           sbuildin, 1, 0)
+plugin_def("irc",              "on-line support (IRC)",           sbuildin, 1, 1)
 plugin_def("jostle",           "push lines out of the way",       sbuildin, 1, 0)
-plugin_def("loghid",           "diagnostics: log HID calls",      sdisable, 1, 0)
+plugin_def("loghid",           "diagnostics: log HID calls",      sdisable, 1, 1)
 plugin_def("millpath",         "calculate toolpath for milling",  sdisable, 1, 0)
 plugin_def("mincut",           "minimal cut shorts",              sbuildin, 1, 0)
 plugin_def("oldactions",       "old/obsolete actions",            sdisable, 1, 0)
@@ -139,7 +139,7 @@
 plugin_def("hid_gtk2_gdk",     "GTK2 GUI, software render",       sbuildin, 1, 1)
 plugin_def("hid_gtk2_gl",      "GTK2 GUI, opengl render",         sbuildin, 1, 1)
 plugin_def("hid_lesstif",      "the lesstif gui",                 sbuildin, 1, 1)
-plugin_def("hid_remote",       "remote HID server",               sdisable, 0, 0)
+plugin_def("hid_remote",       "remote HID server",               sdisable, 0, 1)
 
 
 plugin_dep("ar_cpcb", "lib_compat_help", 0)
@@ -194,8 +194,8 @@
 plugin_dep("io_pcb", "lib_compat_help", 0)
 plugin_dep("io_tedax", "lib_compat_help", 0)
 plugin_dep("io_tedax", "lib_netmap", 0)
-plugin_dep("irc", "lib_portynet", 0)
-plugin_dep("lib_gtk_common", "lib_hid_common", 0)
+plugin_dep("irc", "lib_portynet", 01)
+plugin_dep("lib_gtk_common", "lib_hid_common", 01)
 plugin_dep("lib_hid_pcbui", "lib_hid_common", 0)
 plugin_dep("lib_vfs", "propedit", 0)
 plugin_dep("millpath", "lib_polyhelp", 0)
Index: trunk/scconfig/template/plugin_intconf.tmpasm
===================================================================
--- trunk/scconfig/template/plugin_intconf.tmpasm	(revision 32611)
+++ trunk/scconfig/template/plugin_intconf.tmpasm	(revision 32612)
@@ -4,9 +4,18 @@
 
 switch ?/local/pcb/mod/CONFFILE
 case {...}
-put /local/pcb/MCFG [@$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod/CONFFILE@@]
-put /local/pcb/ICFG [@$(PLUGDIR)/@/local/pcb/mod@/conf_internal.c@]
 
+put /local/pcb/mod/is_hidlib  [@/local/pcb/@/local/pcb/mod@/hidlib@]
+resolve /local/pcb/mod/is_hidlib ?/local/pcb/mod/is_hidlib
+if ?/local/pcb/mod/is_hidlib
+then
+	put /local/pcb/MCFG [@$(LIBRND_PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod/CONFFILE@@]
+	put /local/pcb/ICFG [@$(LIBRND_PLUGDIR)/@/local/pcb/mod@/conf_internal.c@]
+else
+	put /local/pcb/MCFG [@$(PLUGDIR)/@/local/pcb/mod@/@/local/pcb/mod/CONFFILE@@]
+	put /local/pcb/ICFG [@$(PLUGDIR)/@/local/pcb/mod@/conf_internal.c@]
+end
+
 append /local/pcb/DEPDEPS [@ @/local/pcb/ICFG@ @]
 append /local/pcb/DISTCLEANFILES [@ @/local/pcb/ICFG@ @]
 append /local/pcb/RULES [@
Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 32611)
+++ trunk/src/Makefile.dep	(revision 32612)
@@ -1128,7 +1128,7 @@
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h funchash_core.h \
  ../src_3rd/librnd/core/funchash.h funchash_core_list.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h ../src_3rd/librnd/core/conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h ../src_3rd/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_plugins/dialogs/dlg_test.c board.h \
@@ -1293,8 +1293,8 @@
  ../src_3rd/librnd/core/hid_dad.h ../src_3rd/librnd/core/compat_misc.h ../src_3rd/librnd/core/hid_attrib.h \
  ../src_3rd/librnd/core/hid_cfg.h ../src_3rd/librnd/core/hid_menu.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/librnd/core/rnd_printf.h ../src_3rd/librnd/core/hid_dad_spin.h \
- ../src_plugins/lib_hid_common/xpm.h \
- ../src_plugins/lib_hid_common/dlg_comm_m.h plug_io.h vtlibrary.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/xpm.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dlg_comm_m.h plug_io.h vtlibrary.h \
  ../src_3rd/genvector/vts0.h ../src_3rd/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/librnd/core/list_conf.h
 ../src_plugins/dialogs/dlg_layer_binding.o: \
@@ -1452,7 +1452,7 @@
  ../src_3rd/librnd/core/hid_dad_spin.h ../src_3rd/librnd/core/compat_fs.h conf_core.h \
  ../src_3rd/librnd/core/conf.h ../src_3rd/liblihata/lihata.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/librnd/core/hidlib_conf.h plug_io.h vtlibrary.h \
- ../src_3rd/genvector/vts0.h ../src_plugins/lib_hid_common/dialogs_conf.h \
+ ../src_3rd/genvector/vts0.h ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h \
  ../src_plugins/dialogs/dlg_loadsave.h
 ../src_plugins/dialogs/dlg_padstack.o: \
  ../src_plugins/dialogs/dlg_padstack.c ../config.h ../src_3rd/librnd/config.h \
@@ -1530,7 +1530,7 @@
  ../src_3rd/librnd/core/paths.h ../src_plugins/dialogs/dlg_pref_layer.c stub_draw.h \
  draw.h ../src_plugins/dialogs/dlg_pref_color.c \
  ../src_plugins/dialogs/dlg_pref_win.c ../src_3rd/librnd/core/hidlib_conf.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h \
  ../src_plugins/dialogs/dlg_pref_key.c ../src_3rd/librnd/core/hid_cfg_input.h \
  ../src_plugins/dialogs/dlg_pref_menu.c ../src_3rd/librnd/core/hid_menu.h \
  ../src_3rd/librnd/core/safe_fs.h ../src_plugins/dialogs/dlg_pref_conf.c \
@@ -2045,7 +2045,7 @@
  ../src_3rd/librnd/core/hid_dad.h ../src_3rd/librnd/core/hid_cfg.h ../src_3rd/librnd/core/hid_menu.h \
  ../src_3rd/librnd/core/hid_dad_spin.h conf_core.h ../src_3rd/librnd/core/hidlib_conf.h \
  ../src_3rd/librnd/core/actions.h ../src_plugins/export_excellon/aperture.h \
- ../src_plugins/lib_hid_common/xpm.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/xpm.h \
  ../src_plugins/export_gerber/gerber_conf_fields.h
 ../src_plugins/export_ipcd356/ipcd356.o: \
  ../src_plugins/export_ipcd356/ipcd356.c ../config.h ../src_3rd/librnd/config.h \
@@ -2889,8 +2889,8 @@
  ../src_3rd/genvector/vtp0.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h globalconst.h ../src_3rd/librnd/core/globalconst.h \
- ../src_plugins/lib_wget/lib_wget.h
-../src_plugins/hid_batch/batch.o: ../src_plugins/hid_batch/batch.c \
+ ../src_3rd/librnd_plugins/lib_wget/lib_wget.h
+../src_3rd/librnd_plugins/hid_batch/batch.o: ../src_3rd/librnd_plugins/hid_batch/batch.c \
  ../config.h ../src_3rd/librnd/config.h ../src_3rd/librnd/core/hid.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/librnd/core/error.h \
@@ -2944,7 +2944,7 @@
  ../src_plugins/lib_gtk_common/coord_conv.h \
  ../src_plugins/lib_gtk_common/hid_gtk_conf.h \
  ../src_plugins/lib_gtk_common/lib_gtk_config.h \
- ../src_plugins/lib_hid_common/clip.h
+ ../src_3rd/librnd_plugins/lib_hid_common/clip.h
 ../src_plugins/hid_gtk2_gdk/gtkhid-main.o: \
  ../src_plugins/hid_gtk2_gdk/gtkhid-main.c ../config.h ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/plugins.h ../src_3rd/puplug/puplug.h \
@@ -2991,7 +2991,7 @@
  ../src_3rd/genvector/vtp0.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/librnd/core/pixmap.h \
- ../src_3rd/librnd/core/globalconst.h ../src_plugins/lib_hid_common/clip.h \
+ ../src_3rd/librnd/core/globalconst.h ../src_3rd/librnd_plugins/lib_hid_common/clip.h \
  ../src_plugins/lib_gtk_common/hid_gtk_conf.h \
  ../src_plugins/lib_gtk_common/lib_gtk_config.h ../src_3rd/librnd/core/event.h \
  ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd/core/conf_hid.h \
@@ -3079,7 +3079,7 @@
  ../src_plugins/hid_lesstif/dlg_attr_misc.c \
  ../src_plugins/hid_lesstif/wt_xpm.h \
  ../src_plugins/hid_lesstif/wt_colorbtn.h ../src_3rd/librnd/core/hid_dad.h \
- ../src_3rd/librnd/core/hid_dad_spin.h ../src_plugins/lib_hid_common/dad_markup.h \
+ ../src_3rd/librnd/core/hid_dad_spin.h ../src_3rd/librnd_plugins/lib_hid_common/dad_markup.h \
  ../src_plugins/hid_lesstif/wt_preview.h \
  ../src_plugins/hid_lesstif/dlg_attr_box.c \
  ../src_plugins/hid_lesstif/Pages.h \
@@ -3143,10 +3143,10 @@
  ../src_plugins/hid_lesstif/wt_preview.h \
  ../src_plugins/hid_lesstif/dlg_fileselect.h \
  ../src_plugins/hid_lesstif/FillBox.h \
- ../src_plugins/lib_hid_common/lib_hid_common.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h \
- ../src_plugins/lib_hid_common/clip.h \
- ../src_plugins/lib_hid_common/cli_history.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/clip.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/cli_history.h \
  ../src_plugins/hid_lesstif/mouse.c ../src_3rd/genvector/genvector_impl.c \
  ../src_plugins/hid_lesstif/wt_preview.c
 ../src_plugins/hid_lesstif/menu.o: ../src_plugins/hid_lesstif/menu.c \
@@ -3168,7 +3168,7 @@
  ../src_3rd/librnd/core/paths.h ../src_3rd/librnd/core/actions.h ../src_3rd/libfungw/fungw.h \
  ../src_plugins/hid_lesstif/ltf_stdarg.h ../src_3rd/librnd/core/color.h \
  ../src_3rd/librnd/core/event.h ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd/core/compat_misc.h \
- ../src_3rd/genht/hash.h ../src_plugins/lib_hid_common/menu_helper.h
+ ../src_3rd/genht/hash.h ../src_3rd/librnd_plugins/lib_hid_common/menu_helper.h
 ../src_plugins/hid_lesstif/wt_colorbtn.o: \
  ../src_plugins/hid_lesstif/wt_colorbtn.c ../src_3rd/librnd/core/compat_misc.h \
  ../src_3rd/librnd/config.h ../src_3rd/librnd/core/color.h ../src_3rd/librnd/core/global_typedefs.h \
@@ -5503,7 +5503,7 @@
  ../src_plugins/lib_gtk_common/bu_menu.h \
  ../src_plugins/lib_gtk_common/bu_command.h ../src_3rd/librnd/core/event.h \
  ../src_3rd/librnd/core/hidlib.h ../src_plugins/lib_gtk_common/hid_gtk_conf.h \
- ../src_plugins/lib_hid_common/cli_history.h
+ ../src_3rd/librnd_plugins/lib_hid_common/cli_history.h
 ../src_plugins/lib_gtk_common/bu_dwg_tooltip.o: \
  ../src_plugins/lib_gtk_common/bu_dwg_tooltip.c ../config.h \
  ../src_3rd/librnd/config.h ../src_3rd/librnd/core/actions.h ../src_3rd/librnd/core/hid.h \
@@ -5542,7 +5542,7 @@
  ../src_plugins/lib_gtk_common/bu_command.h ../src_3rd/librnd/core/event.h \
  ../src_plugins/lib_gtk_common/in_keyboard.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h \
- ../src_plugins/lib_hid_common/menu_helper.h
+ ../src_3rd/librnd_plugins/lib_hid_common/menu_helper.h
 ../src_plugins/lib_gtk_common/dlg_attribute.o: \
  ../src_plugins/lib_gtk_common/dlg_attribute.c ../config.h \
  ../src_3rd/librnd/config.h ../src_3rd/librnd/core/hidlib_conf.h ../src_3rd/librnd/core/conf.h \
@@ -5580,7 +5580,7 @@
  ../src_plugins/lib_gtk_common/dlg_attr_misc.c \
  ../src_plugins/lib_gtk_common/wt_preview.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h \
- ../src_plugins/lib_hid_common/dad_markup.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dad_markup.h \
  ../src_plugins/lib_gtk_common/dlg_attr_txt.c \
  ../src_plugins/lib_gtk_common/dlg_attr_box.c
 ../src_plugins/lib_gtk_common/dlg_fileselect.o: \
@@ -5719,9 +5719,9 @@
  ../src_plugins/lib_gtk_common/hid_gtk_conf.h \
  ../src_plugins/lib_gtk_common/lib_gtk_config.h \
  ../src_plugins/lib_gtk_common/glue_common.h \
- ../src_plugins/lib_hid_common/lib_hid_common.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h \
- ../src_plugins/lib_hid_common/menu_helper.h
+ ../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/menu_helper.h
 ../src_plugins/lib_gtk_common/in_keyboard.o: \
  ../src_plugins/lib_gtk_common/in_keyboard.c ../config.h ../src_3rd/librnd/config.h \
  ../src_plugins/lib_gtk_common/in_keyboard.h ../src_3rd/librnd/core/hid_cfg_input.h \
@@ -5820,8 +5820,8 @@
  ../src_3rd/puplug/puplug.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/os_dep.h ../src_3rd/puplug/config.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/error.h \
- ../src_plugins/lib_hid_common/place.h \
- ../src_plugins/lib_gtk_common/hid_gtk_conf_fields.h
+ ../src_3rd/librnd_plugins/lib_hid_common/place.h \
+ ../src_3rd/librnd_plugins/lib_gtk_common/hid_gtk_conf_fields.h
 ../src_plugins/lib_gtk_common/ui_crosshair.o: \
  ../src_plugins/lib_gtk_common/ui_crosshair.c ../config.h ../src_3rd/librnd/config.h \
  ../src_plugins/lib_gtk_common/ui_crosshair.h \
@@ -5994,8 +5994,8 @@
  ../src_3rd/librnd/core/hidlib.h ../src_plugins/lib_gtk_common/in_keyboard.h \
  ../src_plugins/lib_gtk_common/ui_zoompan.h \
  ../src_plugins/lib_gtk_common/wt_preview.h ../src_3rd/librnd/core/globalconst.h
-../src_plugins/lib_hid_common/act_dad.o: \
- ../src_plugins/lib_hid_common/act_dad.c ../src_3rd/librnd/config.h \
+../src_3rd/librnd_plugins/lib_hid_common/act_dad.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/act_dad.c ../src_3rd/librnd/config.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/genht/hash.h \
  ../src_3rd/genvector/vts0.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src_3rd/librnd/core/actions.h \
@@ -6009,13 +6009,13 @@
  ../src_3rd/librnd/core/hid_menu.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/librnd/core/hid_dad_spin.h ../src_3rd/librnd/core/hid_dad_tree.h \
- ../src_plugins/lib_hid_common/act_dad.h
-../src_plugins/lib_hid_common/cli_history.o: \
- ../src_plugins/lib_hid_common/cli_history.c ../src_3rd/librnd/config.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/act_dad.h
+../src_3rd/librnd_plugins/lib_hid_common/cli_history.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/cli_history.c ../src_3rd/librnd/config.h \
  ../src_3rd/genlist/gendlist.h \
- ../src_plugins/lib_hid_common/cli_history.h \
- ../src_plugins/lib_hid_common/lib_hid_common.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h ../src_3rd/librnd/core/conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/cli_history.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h ../src_3rd/librnd/core/conf.h \
  ../src_3rd/librnd/core/global_typedefs.h ../src_3rd/librnd/core/rnd_bool.h \
  ../src_3rd/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -6026,8 +6026,8 @@
  ../src_3rd/genvector/vtp0.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/librnd/core/safe_fs.h ../src_3rd/librnd/core/paths.h
-../src_plugins/lib_hid_common/dlg_comm_m.o: \
- ../src_plugins/lib_hid_common/dlg_comm_m.c ../src_3rd/librnd/config.h \
+../src_3rd/librnd_plugins/lib_hid_common/dlg_comm_m.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/dlg_comm_m.c ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/actions.h ../src_3rd/librnd/core/hid.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/librnd/core/error.h \
@@ -6041,15 +6041,15 @@
  ../src_3rd/librnd/core/hid_menu.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/librnd/core/hid_dad_spin.h ../src_3rd/librnd/core/hidlib.h \
- ../src_plugins/lib_hid_common/xpm.h \
- ../src_plugins/lib_hid_common/dlg_comm_m.h \
- ../src_plugins/lib_hid_common/lib_hid_common.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h ../src_3rd/librnd/core/conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/xpm.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dlg_comm_m.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h ../src_3rd/librnd/core/conf.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h
-../src_plugins/lib_hid_common/dlg_log.o: \
- ../src_plugins/lib_hid_common/dlg_log.c ../src_3rd/librnd/config.h \
+../src_3rd/librnd_plugins/lib_hid_common/dlg_log.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/dlg_log.c ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/actions.h ../src_3rd/librnd/core/hid.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/librnd/core/error.h \
@@ -6065,9 +6065,9 @@
  ../src_3rd/librnd/core/compat_misc.h ../src_3rd/librnd/core/hid_attrib.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/librnd/core/color.h ../src_3rd/librnd/core/hid_cfg.h \
  ../src_3rd/librnd/core/hid_menu.h ../src_3rd/librnd/core/hid_dad_spin.h ../src_3rd/librnd/core/event.h \
- ../src_3rd/librnd/core/hidlib.h ../src_plugins/lib_hid_common/dlg_log.h
-../src_plugins/lib_hid_common/grid_menu.o: \
- ../src_plugins/lib_hid_common/grid_menu.c ../src_3rd/librnd/config.h \
+ ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd_plugins/lib_hid_common/dlg_log.h
+../src_3rd/librnd_plugins/lib_hid_common/grid_menu.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/grid_menu.c ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/conf.h ../src_3rd/librnd/core/global_typedefs.h ../src_3rd/librnd/core/rnd_bool.h \
  ../src_3rd/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
  ../src_3rd/genvector/genvector_impl.h \
@@ -6082,9 +6082,9 @@
  ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd/core/hid_cfg.h ../src_3rd/librnd/core/hid.h \
  ../src_3rd/librnd/core/error.h ../src_3rd/librnd/core/box.h ../src_3rd/librnd/core/math_helper.h \
  ../src_3rd/librnd/core/misc_util.h ../src_3rd/librnd/core/hid_menu.h ../src_3rd/librnd/core/hid_menu.h \
- ../src_plugins/lib_hid_common/grid_menu.h
-../src_plugins/lib_hid_common/lead_user.o: \
- ../src_plugins/lib_hid_common/lead_user.c ../src_3rd/librnd/config.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/grid_menu.h
+../src_3rd/librnd_plugins/lib_hid_common/lead_user.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/lead_user.c ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/unit.h ../src_3rd/librnd/core/global_typedefs.h ../src_3rd/librnd/core/rnd_bool.h \
  ../src_3rd/librnd/core/event.h ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd/core/hid.h \
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
@@ -6091,8 +6091,8 @@
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
  ../src_3rd/genht/ht.h ../src_3rd/librnd/core/error.h ../src_3rd/librnd/core/box.h \
  ../src_3rd/librnd/core/math_helper.h ../src_3rd/librnd/core/misc_util.h
-../src_plugins/lib_hid_common/lib_hid_common.o: \
- ../src_plugins/lib_hid_common/lib_hid_common.c ../src_3rd/librnd/config.h \
+../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.c ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/plugins.h ../src_3rd/puplug/puplug.h \
  ../src_3rd/puplug/libs.h ../src_3rd/puplug/os_dep.h \
  ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
@@ -6111,20 +6111,20 @@
  ../src_3rd/librnd/core/hid.h ../src_3rd/librnd/core/box.h ../src_3rd/librnd/core/math_helper.h \
  ../src_3rd/librnd/core/misc_util.h ../src_3rd/librnd/core/hid_menu.h ../src_3rd/librnd/core/actions.h \
  ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
- ../src_plugins/lib_hid_common/grid_menu.h \
- ../src_plugins/lib_hid_common/cli_history.h \
- ../src_plugins/lib_hid_common/lead_user.h \
- ../src_plugins/lib_hid_common/place.h \
- ../src_plugins/lib_hid_common/lib_hid_common.h \
- ../src_plugins/lib_hid_common/dialogs_conf.h \
- ../src_plugins/lib_hid_common/dlg_comm_m.h \
- ../src_plugins/lib_hid_common/dlg_log.h \
- ../src_plugins/lib_hid_common/act_dad.h \
- ../src_plugins/lib_hid_common/zoompan.h \
- ../src_plugins/lib_hid_common/conf_internal.c \
- ../src_plugins/lib_hid_common/dialogs_conf_fields.h
-../src_plugins/lib_hid_common/menu_helper.o: \
- ../src_plugins/lib_hid_common/menu_helper.c ../src_3rd/librnd/config.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/grid_menu.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/cli_history.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/lead_user.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/place.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/lib_hid_common.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dlg_comm_m.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/dlg_log.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/act_dad.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/zoompan.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/conf_internal.c \
+ ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf_fields.h
+../src_3rd/librnd_plugins/lib_hid_common/menu_helper.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/menu_helper.c ../src_3rd/librnd/config.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/tree.h \
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/genht/htsp.h \
@@ -6138,9 +6138,9 @@
  ../src_3rd/librnd/core/hid.h ../src_3rd/librnd/core/box.h ../src_3rd/librnd/core/math_helper.h \
  ../src_3rd/librnd/core/misc_util.h ../src_3rd/libfungw/fungw.h \
  ../src_3rd/genht/htpp.h ../src_3rd/librnd/core/hid_cfg.h ../src_3rd/librnd/core/hid_menu.h \
- ../src_3rd/librnd/core/compat_misc.h ../src_plugins/lib_hid_common/menu_helper.h
-../src_plugins/lib_hid_common/place.o: \
- ../src_plugins/lib_hid_common/place.c ../src_3rd/librnd/config.h \
+ ../src_3rd/librnd/core/compat_misc.h ../src_3rd/librnd_plugins/lib_hid_common/menu_helper.h
+../src_3rd/librnd_plugins/lib_hid_common/place.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/place.c ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/event.h ../src_3rd/librnd/core/unit.h ../src_3rd/librnd/core/global_typedefs.h \
  ../src_3rd/librnd/core/rnd_bool.h ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd/core/compat_misc.h \
  ../src_3rd/librnd/core/error.h ../src_3rd/librnd/core/conf.h ../src_3rd/librnd/core/rnd_printf.h \
@@ -6151,11 +6151,11 @@
  ../src_3rd/genht/ht.h ../src_3rd/genvector/vtp0.h \
  ../src_3rd/librnd/core/list_conf.h ../src_3rd/genlist/gentdlist_undef.h \
  ../src_3rd/genlist/gentdlist_impl.h ../src_3rd/genlist/gendlist.h \
- ../src_3rd/librnd/core/safe_fs.h ../src_plugins/lib_hid_common/dialogs_conf.h \
+ ../src_3rd/librnd/core/safe_fs.h ../src_3rd/librnd_plugins/lib_hid_common/dialogs_conf.h \
  ../src_3rd/genht/ht.h ../src_3rd/genht/ht.c \
  ../src_3rd/genht/ht_inlines.h ../src_3rd/genht/hash.h
-../src_plugins/lib_hid_common/toolbar.o: \
- ../src_plugins/lib_hid_common/toolbar.c ../src_3rd/librnd/config.h \
+../src_3rd/librnd_plugins/lib_hid_common/toolbar.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/toolbar.c ../src_3rd/librnd/config.h \
  ../src_3rd/genvector/vti0.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src_3rd/liblihata/tree.h \
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
@@ -6171,14 +6171,14 @@
  ../src_3rd/librnd/core/conf.h ../src_3rd/liblihata/lihata.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
  ../src_3rd/genlist/gendlist.h ../src_3rd/librnd/core/conf_hid.h \
- ../src_plugins/lib_hid_common/toolbar.h ../src_3rd/librnd/core/event.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/toolbar.h ../src_3rd/librnd/core/event.h \
  ../src_3rd/librnd/core/hidlib.h
-../src_plugins/lib_hid_common/xpm.o: ../src_plugins/lib_hid_common/xpm.c \
+../src_3rd/librnd_plugins/lib_hid_common/xpm.o: ../src_3rd/librnd_plugins/lib_hid_common/xpm.c \
  ../config.h ../src_3rd/librnd/config.h \
- ../src_plugins/lib_hid_common/xpm/question.xpm \
- ../src_plugins/lib_hid_common/xpm/warning.xpm
-../src_plugins/lib_hid_common/zoompan.o: \
- ../src_plugins/lib_hid_common/zoompan.c ../config.h ../src_3rd/librnd/config.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/xpm/question.xpm \
+ ../src_3rd/librnd_plugins/lib_hid_common/xpm/warning.xpm
+../src_3rd/librnd_plugins/lib_hid_common/zoompan.o: \
+ ../src_3rd/librnd_plugins/lib_hid_common/zoompan.c ../config.h ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/actions.h ../src_3rd/librnd/core/hid.h ../src_3rd/liblihata/dom.h \
  ../src_3rd/liblihata/lihata.h ../src_3rd/liblihata/parser.h \
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h ../src_3rd/librnd/core/error.h \
@@ -6186,7 +6186,7 @@
  ../src_3rd/librnd/core/math_helper.h ../src_3rd/librnd/core/misc_util.h ../src_3rd/librnd/core/unit.h \
  ../src_3rd/libfungw/fungw.h ../src_3rd/genht/htpp.h \
  ../src_3rd/librnd/core/compat_misc.h ../src_3rd/librnd/core/hidlib.h \
- ../src_plugins/lib_hid_common/zoompan.h
+ ../src_3rd/librnd_plugins/lib_hid_common/zoompan.h
 ../src_plugins/lib_hid_gl/hidgl.o: ../src_plugins/lib_hid_gl/hidgl.c \
  ../config.h ../src_3rd/librnd/config.h ../src_3rd/librnd/core/hidlib_conf.h ../src_3rd/librnd/core/conf.h \
  ../src_3rd/librnd/core/global_typedefs.h ../src_3rd/librnd/core/rnd_bool.h \
@@ -6244,7 +6244,7 @@
  ../src_3rd/genrtree/genrtree_api.h ht_subc.h ../src_3rd/genht/ht.h \
  ../src_3rd/genht/hash.h obj_pstk_list.h obj_pstk.h vtpadstack.h \
  obj_pstk_shape.h polygon.h vtpadstack_t.h \
- ../src_plugins/lib_hid_common/zoompan.h \
+ ../src_3rd/librnd_plugins/lib_hid_common/zoompan.h \
  ../src_plugins/lib_hid_pcbui/util.h data.h \
  ../src_plugins/lib_hid_pcbui/act.h
 ../src_plugins/lib_hid_pcbui/layer_menu.o: \
@@ -6331,7 +6331,7 @@
  ../src_3rd/librnd/core/hid.h ../src_3rd/librnd/core/box.h ../src_3rd/librnd/core/math_helper.h \
  ../src_3rd/librnd/core/misc_util.h ../src_3rd/libfungw/fungw.h \
  ../src_3rd/genht/htpp.h \
- ../src_plugins/lib_hid_pcbui/../../src_plugins/lib_hid_common/toolbar.h \
+ ../src_plugins/lib_hid_pcbui/../../src_3rd/librnd_plugins/lib_hid_common/toolbar.h \
  ../src_plugins/lib_hid_pcbui/status.h ../src_plugins/lib_hid_pcbui/act.h \
  ../src_plugins/lib_hid_pcbui/util.c ../src_plugins/lib_hid_pcbui/util.h \
  data.h globalconst.h ../src_3rd/librnd/core/globalconst.h layer.h \
@@ -6570,7 +6570,7 @@
  ../src_3rd/liblihata/lihata.h ../src_3rd/librnd/core/list_conf.h \
  ../src_plugins/propedit/props.h ../src_3rd/genvector/vtl0.h idpath.h \
  ../src_plugins/propedit/propsel.h ../src_plugins/lib_vfs/lib_vfs.h
-../src_plugins/lib_wget/lib_wget.o: ../src_plugins/lib_wget/lib_wget.c \
+../src_3rd/librnd_plugins/lib_wget/lib_wget.o: ../src_3rd/librnd_plugins/lib_wget/lib_wget.c \
  ../config.h ../src_3rd/librnd/config.h ../src_3rd/librnd/core/rnd_printf.h \
  ../src_3rd/genvector/gds_char.h ../src_3rd/genvector/genvector_impl.h \
  ../src_3rd/genvector/genvector_undef.h ../src_3rd/librnd/core/unit.h \
@@ -6584,7 +6584,7 @@
  ../src_3rd/genht/htsp.h ../src_3rd/genht/ht.h \
  ../src_3rd/genvector/vtp0.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/genlist/gentdlist_undef.h ../src_3rd/genlist/gentdlist_impl.h \
- ../src_3rd/genlist/gendlist.h ../src_plugins/lib_wget/lib_wget.h
+ ../src_3rd/genlist/gendlist.h ../src_3rd/librnd_plugins/lib_wget/lib_wget.h
 ../src_plugins/loghid/hid-logger.o: ../src_plugins/loghid/hid-logger.c \
  ../config.h ../src_3rd/librnd/config.h ../src_plugins/loghid/hid-logger.h \
  ../src_3rd/librnd/core/hid.h ../src_3rd/liblihata/dom.h \
@@ -6817,7 +6817,7 @@
  ../src_3rd/liblihata/dom.h ../src_3rd/liblihata/lihata.h \
  ../src_3rd/liblihata/parser.h ../src_3rd/librnd/core/list_conf.h \
  ../src_3rd/librnd/core/paths.h ../src_3rd/librnd/core/compat_fs.h \
- ../src_plugins/lib_wget/lib_wget.h ../src_plugins/order/order.h \
+ ../src_3rd/librnd_plugins/lib_wget/lib_wget.h ../src_plugins/order/order.h \
  ../src_3rd/librnd/core/hid_dad.h ../src_3rd/librnd/core/compat_misc.h ../src_3rd/librnd/core/hid_attrib.h \
  ../src_3rd/librnd/core/hid.h ../src_3rd/librnd/core/error.h ../src_3rd/librnd/core/hid_cfg.h \
  ../src_3rd/librnd/core/hid_menu.h ../src_3rd/librnd/core/hid_dad_spin.h \
@@ -7839,7 +7839,7 @@
  ../src_3rd/puplug/error.h ../src_3rd/librnd/core/actions.h obj_subc.h \
  obj_subc_parent.h data.h obj_term.h funchash_core.h \
  ../src_3rd/librnd/core/funchash.h funchash_core_list.h
-../src_plugins/stroke/stroke.o: ../src_plugins/stroke/stroke.c \
+../src_3rd/librnd_plugins/stroke/stroke.o: ../src_3rd/librnd_plugins/stroke/stroke.c \
  ../config.h ../src_3rd/librnd/config.h ../src_3rd/librnd/core/hidlib_conf.h ../src_3rd/librnd/core/conf.h \
  ../src_3rd/librnd/core/global_typedefs.h ../src_3rd/librnd/core/rnd_bool.h \
  ../src_3rd/librnd/core/rnd_printf.h ../src_3rd/genvector/gds_char.h \
@@ -7859,9 +7859,9 @@
  ../src_3rd/puplug/config.h ../src_3rd/puplug/libs.h \
  ../src_3rd/puplug/error.h ../src_3rd/librnd/core/compat_misc.h ../src_3rd/librnd/core/event.h \
  ../src_3rd/librnd/core/hidlib.h ../src_3rd/librnd/core/tool.h \
- ../src_plugins/stroke/conf_internal.c \
- ../src_plugins/stroke/stroke_conf.h \
- ../src_plugins/stroke/stroke_conf_fields.h
+ ../src_3rd/librnd_plugins/stroke/conf_internal.c \
+ ../src_3rd/librnd_plugins/stroke/stroke_conf.h \
+ ../src_3rd/librnd_plugins/stroke/stroke_conf_fields.h
 ../src_plugins/teardrops/teardrops.o: \
  ../src_plugins/teardrops/teardrops.c ../config.h ../src_3rd/librnd/config.h \
  ../src_3rd/librnd/core/math_helper.h board.h ../src_3rd/genht/htsp.h \
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 32611)
+++ trunk/src/Makefile.in	(revision 32612)
@@ -1,4 +1,4 @@
-append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src -I../src_3rd/liblihata }
+append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src_3rd/librnd_plugins -I../src -I../src_3rd/liblihata }
 append /local/pcb/LDFLAGS cc/ldflags
 append /local/pcb/LDFLAGS cc/rdynamic
 append /local/pcb/LDFLAGS ?/local/pcb/cflags_profile
@@ -347,6 +347,7 @@
 
 # plugin source
 PLUGDIR=$(ROOT)/src_plugins
+LIBRND_PLUGDIR=$(ROOT)/src_3rd/librnd_plugins
 
 # plugin source install - so that pcb-rnd runs from source properly
 PLUGIDIR=plugins
@@ -467,7 +468,7 @@
 	$(PUPLUG) buildin.h > buildin.h
 
 buildin.hidlib.c: $(PLUGDIR)/.builtin.hidlib.pups $(PUPLUG)
-	cd $(PLUGDIR) && $(PUPLUG) buildin.c "-" < $(PLUGDIR)/.builtin.hidlib.pups > $(ROOT)/src/buildin.hidlib.c
+	cd $(LIBRND_PLUGDIR) && ../$(PUPLUG) buildin.c "-" < ../$(PLUGDIR)/.builtin.hidlib.pups > ../$(ROOT)/src/buildin.hidlib.c
 
 $(LIBRND)/core/buildin.hidlib.h: $(PLUGDIR)/.builtin.hidlib.pups $(PUPLUG)
 	$(PUPLUG) buildin.h > $(LIBRND)/core/buildin.hidlib.h
Index: trunk/src_3rd
===================================================================
--- trunk/src_3rd	(revision 32611)
+++ trunk/src_3rd	(revision 32612)

Property changes on: trunk/src_3rd
___________________________________________________________________
Modified: svn:externals
## -14,4 +14,5 ##
 fast89-poly2tri svn://svn.repo.hu/fast89-poly2tri/trunk/src
 libulzw svn://svn.repo.hu/libulzw/trunk/libulzw
 librnd svn://svn.repo.hu/librnd/trunk/src/librnd
+librnd_plugins svn://svn.repo.hu/librnd/trunk/src_plugins
 
Index: trunk/src_plugins/Buildin.tmpasm
===================================================================
--- trunk/src_plugins/Buildin.tmpasm	(revision 32611)
+++ trunk/src_plugins/Buildin.tmpasm	(revision 32612)
@@ -7,7 +7,6 @@
 
 append /local/pcb/buildin_init_extern    [@extern pcb_uninit_t hid_@/local/pcb/mod@_init();@] {\n}
 
-append /local/pcb/buildin_pups [@@/local/pcb/mod@=@/local/pcb/mod@/@/local/pcb/mod@.pup@] {\n}
 
 append /local/pcb/buildin_init_code    [@
 	uninit_func = hid_@/local/pcb/mod@_init();
@@ -37,6 +36,8 @@
 
 	append /local/pcb/LDFLAGS_HIDLIB_STATIC   /local/pcb/mod/LDFLAGS
 	append /local/pcb/CFLAGS_HIDLIB_STATIC    /local/pcb/mod/CFLAGS
+else
+	append /local/pcb/buildin_pups [@@/local/pcb/mod@=@/local/pcb/mod@/@/local/pcb/mod@.pup@] {\n}
 end
 
 include /local/pcb/tmpasm/common_enabled
Index: trunk/src_plugins/dialogs/dialogs.c
===================================================================
--- trunk/src_plugins/dialogs/dialogs.c	(revision 32611)
+++ trunk/src_plugins/dialogs/dialogs.c	(revision 32612)
@@ -34,7 +34,7 @@
 #include <librnd/core/hid_dad.h>
 #include <librnd/core/plugins.h>
 #include "funchash_core.h"
-#include "../src_plugins/lib_hid_common/dialogs_conf.h"
+#include "lib_hid_common/dialogs_conf.h"
 
 /* from lib_hid_common */
 extern conf_dialogs_t dialogs_conf;
Index: trunk/src_plugins/dialogs/dlg_infobar.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_infobar.c	(revision 32611)
+++ trunk/src_plugins/dialogs/dlg_infobar.c	(revision 32612)
@@ -32,8 +32,8 @@
 #include <librnd/core/actions.h>
 #include "board.h"
 #include <librnd/core/hid_dad.h>
-#include "../src_plugins/lib_hid_common/xpm.h"
-#include "../src_plugins/lib_hid_common/dlg_comm_m.h"
+#include "lib_hid_common/xpm.h"
+#include "lib_hid_common/dlg_comm_m.h"
 #include "plug_io.h"
 
 static void ifb_file_chg_reload_cb(void *hid_ctx, void *caller_data, rnd_hid_attribute_t *attr)
Index: trunk/src_plugins/dialogs/dlg_loadsave.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_loadsave.c	(revision 32611)
+++ trunk/src_plugins/dialogs/dlg_loadsave.c	(revision 32612)
@@ -36,7 +36,7 @@
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
 #include "plug_io.h"
-#include "../src_plugins/lib_hid_common/dialogs_conf.h"
+#include "lib_hid_common/dialogs_conf.h"
 
 #include "dlg_loadsave.h"
 
Index: trunk/src_plugins/dialogs/dlg_pref_win.c
===================================================================
--- trunk/src_plugins/dialogs/dlg_pref_win.c	(revision 32611)
+++ trunk/src_plugins/dialogs/dlg_pref_win.c	(revision 32612)
@@ -30,7 +30,7 @@
 #include <librnd/core/conf.h>
 #include "conf_core.h"
 #include <librnd/core/hidlib_conf.h>
-#include "../src_plugins/lib_hid_common/dialogs_conf.h"
+#include "lib_hid_common/dialogs_conf.h"
 
 extern conf_dialogs_t dialogs_conf;
 extern void pcb_wplc_save_to_role(rnd_conf_role_t role);
Index: trunk/src_plugins/export_gerber/gerber.c
===================================================================
--- trunk/src_plugins/export_gerber/gerber.c	(revision 32611)
+++ trunk/src_plugins/export_gerber/gerber.c	(revision 32612)
@@ -39,7 +39,7 @@
 
 #include "../src_plugins/export_excellon/aperture.h"
 
-#include "../src_plugins/lib_hid_common/xpm.h"
+#include "lib_hid_common/xpm.h"
 
 
 const char *gerber_cookie = "gerber HID";
Index: trunk/src_plugins/fp_wget/wget_common.c
===================================================================
--- trunk/src_plugins/fp_wget/wget_common.c	(revision 32611)
+++ trunk/src_plugins/fp_wget/wget_common.c	(revision 32612)
@@ -33,7 +33,7 @@
 #include <librnd/core/safe_fs.h>
 #include "globalconst.h"
 
-#include "../src_plugins/lib_wget/lib_wget.h"
+#include "lib_wget/lib_wget.h"
 
 int fp_wget_offline = 0;
 
Index: trunk/src_plugins/lib_hid_pcbui/act.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/act.c	(revision 32611)
+++ trunk/src_plugins/lib_hid_pcbui/act.c	(revision 32612)
@@ -39,7 +39,7 @@
 #include "search.h"
 #include "obj_subc_parent.h"
 
-#include "../src_plugins/lib_hid_common/zoompan.h"
+#include "lib_hid_common/zoompan.h"
 
 #include "util.h"
 #include "act.h"
Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c
===================================================================
--- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c	(revision 32611)
+++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c	(revision 32612)
@@ -34,7 +34,7 @@
 #include "layer_menu.h"
 #include "layersel.h"
 #include "routest.h"
-#include "../../src_plugins/lib_hid_common/toolbar.h"
+#include "lib_hid_common/toolbar.h"
 #include "status.h"
 #include "act.h"
 
Index: trunk/src_plugins/map_plugins.sh
===================================================================
--- trunk/src_plugins/map_plugins.sh	(revision 32611)
+++ trunk/src_plugins/map_plugins.sh	(revision 32612)
@@ -7,9 +7,13 @@
 export LANG=C
 PUPLUG=../src_3rd/puplug/util/puplug
 
+dirs="../src_plugins ../src_3rd/librnd_plugins"
 
 # generate scconfig's 3 state plugin list
-$PUPLUG findpups . '%$class$|%N|%3|%A|%$short$|0%$hidlib$\n' | sed '
+for dir in $dirs
+do
+	$PUPLUG findpups "$dir" '%$class$|%N|%3|%A|%$short$|0%$hidlib$\n'
+done | sed '
 s/^lib/1|lib/
 s/^feature/2|feature/
 s/^fp/3|fp/
@@ -51,9 +55,15 @@
 
 ' > ../scconfig/plugins.h
 
-$PUPLUG findpups . "" 'plugin_dep("%N", "%m", 0%$hidlib$)\n' | sort >> ../scconfig/plugins.h
+for dir in $dirs
+do
+	$PUPLUG findpups "$dir" "" 'plugin_dep("%N", "%m", 0%$hidlib$)\n'
+done | sort >> ../scconfig/plugins.h
 
 
 # Generate the plugin list
 echo "# List of all plugins - generated by make map_plugins - do NOT edit" > plugins_ALL.tmpasm
-$PUPLUG findpups . "include {../src_plugins/%D/Plug.tmpasm}\n" | sort >> plugins_ALL.tmpasm
+for dir in $dirs
+do
+	$PUPLUG findpups "$dir" "include {$dir/%D/Plug.tmpasm}\n" 
+done | sort >> plugins_ALL.tmpasm
Index: trunk/src_plugins/order_pcbway/pcbway.c
===================================================================
--- trunk/src_plugins/order_pcbway/pcbway.c	(revision 32611)
+++ trunk/src_plugins/order_pcbway/pcbway.c	(revision 32612)
@@ -38,7 +38,7 @@
 #include <librnd/core/safe_fs.h>
 #include <librnd/core/paths.h>
 #include <librnd/core/compat_fs.h>
-#include "../src_plugins/lib_wget/lib_wget.h"
+#include "lib_wget/lib_wget.h"
 #include "../src_plugins/order/order.h"
 #include "order_pcbway_conf.h"
 #include "../src_plugins/order_pcbway/conf_internal.c"
Index: trunk/src_plugins/plugins_ALL.tmpasm
===================================================================
--- trunk/src_plugins/plugins_ALL.tmpasm	(revision 32611)
+++ trunk/src_plugins/plugins_ALL.tmpasm	(revision 32612)
@@ -1,4 +1,18 @@
 # List of all plugins - generated by make map_plugins - do NOT edit
+include {../src_3rd/librnd_plugins/hid_batch/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/hid_gtk2_gdk/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/hid_gtk2_gl/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/hid_lesstif/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/hid_remote/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/irc/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/lib_gensexpr/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/lib_gtk_common/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/lib_hid_common/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/lib_hid_gl/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/lib_portynet/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/lib_wget/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/loghid/Plug.tmpasm}
+include {../src_3rd/librnd_plugins/stroke/Plug.tmpasm}
 include {../src_plugins/acompnet/Plug.tmpasm}
 include {../src_plugins/act_draw/Plug.tmpasm}
 include {../src_plugins/act_read/Plug.tmpasm}
@@ -46,11 +60,6 @@
 include {../src_plugins/fp_board/Plug.tmpasm}
 include {../src_plugins/fp_fs/Plug.tmpasm}
 include {../src_plugins/fp_wget/Plug.tmpasm}
-include {../src_plugins/hid_batch/Plug.tmpasm}
-include {../src_plugins/hid_gtk2_gdk/Plug.tmpasm}
-include {../src_plugins/hid_gtk2_gl/Plug.tmpasm}
-include {../src_plugins/hid_lesstif/Plug.tmpasm}
-include {../src_plugins/hid_remote/Plug.tmpasm}
 include {../src_plugins/import_accel_net/Plug.tmpasm}
 include {../src_plugins/import_calay/Plug.tmpasm}
 include {../src_plugins/import_dsn/Plug.tmpasm}
@@ -84,21 +93,13 @@
 include {../src_plugins/io_mentor_cell/Plug.tmpasm}
 include {../src_plugins/io_pcb/Plug.tmpasm}
 include {../src_plugins/io_tedax/Plug.tmpasm}
-include {../src_plugins/irc/Plug.tmpasm}
 include {../src_plugins/jostle/Plug.tmpasm}
 include {../src_plugins/lib_compat_help/Plug.tmpasm}
 include {../src_plugins/lib_formula/Plug.tmpasm}
-include {../src_plugins/lib_gensexpr/Plug.tmpasm}
-include {../src_plugins/lib_gtk_common/Plug.tmpasm}
-include {../src_plugins/lib_hid_common/Plug.tmpasm}
-include {../src_plugins/lib_hid_gl/Plug.tmpasm}
 include {../src_plugins/lib_hid_pcbui/Plug.tmpasm}
 include {../src_plugins/lib_netmap/Plug.tmpasm}
 include {../src_plugins/lib_polyhelp/Plug.tmpasm}
-include {../src_plugins/lib_portynet/Plug.tmpasm}
 include {../src_plugins/lib_vfs/Plug.tmpasm}
-include {../src_plugins/lib_wget/Plug.tmpasm}
-include {../src_plugins/loghid/Plug.tmpasm}
 include {../src_plugins/millpath/Plug.tmpasm}
 include {../src_plugins/mincut/Plug.tmpasm}
 include {../src_plugins/oldactions/Plug.tmpasm}
@@ -118,7 +119,6 @@
 include {../src_plugins/shape/Plug.tmpasm}
 include {../src_plugins/sketch_route/Plug.tmpasm}
 include {../src_plugins/smartdisperse/Plug.tmpasm}
-include {../src_plugins/stroke/Plug.tmpasm}
 include {../src_plugins/teardrops/Plug.tmpasm}
 include {../src_plugins/tool_std/Plug.tmpasm}
 include {../src_plugins/vendordrill/Plug.tmpasm}
Index: trunk/src_plugins
===================================================================
--- trunk/src_plugins	(revision 32611)
+++ trunk/src_plugins	(revision 32612)

Property changes on: trunk/src_plugins
___________________________________________________________________
Deleted: svn:externals
## -1,14 +0,0 ##
-svn://svn.repo.hu/librnd/trunk/src_plugins/hid_batch       hid_batch
-svn://svn.repo.hu/librnd/trunk/src_plugins/hid_gtk2_gdk    hid_gtk2_gdk
-svn://svn.repo.hu/librnd/trunk/src_plugins/hid_gtk2_gl     hid_gtk2_gl
-svn://svn.repo.hu/librnd/trunk/src_plugins/hid_lesstif     hid_lesstif
-svn://svn.repo.hu/librnd/trunk/src_plugins/hid_remote      hid_remote
-svn://svn.repo.hu/librnd/trunk/src_plugins/irc             irc
-svn://svn.repo.hu/librnd/trunk/src_plugins/lib_gensexpr    lib_gensexpr
-svn://svn.repo.hu/librnd/trunk/src_plugins/lib_gtk_common  lib_gtk_common
-svn://svn.repo.hu/librnd/trunk/src_plugins/lib_hid_common  lib_hid_common
-svn://svn.repo.hu/librnd/trunk/src_plugins/lib_hid_gl      lib_hid_gl
-svn://svn.repo.hu/librnd/trunk/src_plugins/lib_portynet    lib_portynet
-svn://svn.repo.hu/librnd/trunk/src_plugins/lib_wget        lib_wget
-svn://svn.repo.hu/librnd/trunk/src_plugins/loghid          loghid
-svn://svn.repo.hu/librnd/trunk/src_plugins/stroke          stroke