Index: scconfig/Rev.h =================================================================== --- scconfig/Rev.h (revision 6683) +++ scconfig/Rev.h (revision 6684) @@ -1 +1 @@ -static const int myrev = 6681; +static const int myrev = 6684; Index: scconfig/Rev.tab =================================================================== --- scconfig/Rev.tab (revision 6683) +++ scconfig/Rev.tab (revision 6684) @@ -1,4 +1,4 @@ -6681 configure gtk splitup +6684 configure gtk splitup 6392 configure draw cross section plugin (gtk and lesstif depend on it) 6365 configure gtk splitup 6111 configure layer vs. layer group code split Index: src/Makefile.dep =================================================================== --- src/Makefile.dep (revision 6683) +++ src/Makefile.dep (revision 6684) @@ -1361,7 +1361,6 @@ ../src_plugins/lib_gtk_common/util_str.h \ ../src_plugins/lib_gtk_common/in_mouse.h \ ../src_plugins/lib_gtk_common/win_place.h -../src_plugins/hid_gtk/menu_lht.o: ../src_plugins/hid_gtk/menu_lht.c ../src_plugins/hid_lesstif/dialogs.o: \ ../src_plugins/hid_lesstif/dialogs.c \ ../src_plugins/hid_lesstif/xincludes.h ../config.h conf_core.h conf.h \ @@ -2398,6 +2397,8 @@ ../src_plugins/hid_gtk/gui.h ../src_plugins/lib_gtk_common/lib_gtk_common.o: \ ../src_plugins/lib_gtk_common/lib_gtk_common.c plugins.h +../src_plugins/lib_gtk_common/menu_lht.o: \ + ../src_plugins/lib_gtk_common/menu_lht.c ../src_plugins/lib_gtk_common/ui_zoompan.o: \ ../src_plugins/lib_gtk_common/ui_zoompan.c ../config.h \ ../src_plugins/lib_gtk_common/ui_zoompan.h unit.h pcb_bool.h \ Index: src_plugins/hid_gtk/Plug.tmpasm =================================================================== --- src_plugins/hid_gtk/Plug.tmpasm (revision 6683) +++ src_plugins/hid_gtk/Plug.tmpasm (revision 6684) @@ -14,7 +14,6 @@ $(PLUGDIR)/hid_gtk/gui-output-events.o $(PLUGDIR)/hid_gtk/gui-top-window.o $(PLUGDIR)/hid_gtk/gtkhid-gdk.o - $(PLUGDIR)/hid_gtk/menu_lht.o $(PLUGDIR)/hid_gtk/gtk_conf_list.o $(PLUGDIR)/hid_gtk/gschem_accel_label.o @] @@ -25,13 +24,6 @@ default put /local/pcb/mod/CFLAGS /target/libs/gui/gtk2/cflags put /local/pcb/mod/LDFLAGS /target/libs/gui/gtk2/ldflags - put /local/pcb/mod/CLEANFILES { $(PLUGDIR)/hid_gtk/menu_lht.c } - append /local/pcb/RULES [@ -### gtk menu embed -$(PLUGDIR)/hid_gtk/menu_lht.c: pcb-menu-gtk.lht - $(CQUOTE) -n hid_gtk_menu_default $(PLUGDIR)/hid_gtk/menu_lht.c -@] - end end Index: src_plugins/lib_gtk_common/Plug.tmpasm =================================================================== --- src_plugins/lib_gtk_common/Plug.tmpasm (revision 6683) +++ src_plugins/lib_gtk_common/Plug.tmpasm (revision 6684) @@ -25,6 +25,7 @@ $(PLUGDIR)/lib_gtk_common/dlg_search.o $(PLUGDIR)/lib_gtk_common/in_keyboard.o $(PLUGDIR)/lib_gtk_common/in_mouse.o + $(PLUGDIR)/lib_gtk_common/menu_lht.o $(PLUGDIR)/lib_gtk_common/ui_zoompan.o $(PLUGDIR)/lib_gtk_common/win_place.o $(PLUGDIR)/lib_gtk_common/wt_coord_entry.o @@ -39,3 +40,16 @@ case {plugin} include /local/pcb/tmpasm/plugin; end; case {disable} include /local/pcb/tmpasm/disable; end; end + +switch /local/pcb/lib_gtk_common/controls + case {disable} end; + default + put /local/pcb/mod/CLEANFILES { $(PLUGDIR)/hid_gtk/menu_lht.c } + append /local/pcb/RULES [@ +### gtk menu embed +$(PLUGDIR)/lib_gtk_common/menu_lht.c: pcb-menu-gtk.lht + $(CQUOTE) -n hid_gtk_menu_default $(PLUGDIR)/lib_gtk_common/menu_lht.c +@] + end +end +