gtk-ui: Use gtkbuilder xml file as canonical source for UI

Stop running gtkbuilder-convert on build. This was done to workaround
a glade bug but is not necessary anymore
This commit is contained in:
Jussi Kukkonen 2011-08-25 11:18:56 +03:00 committed by Patrick Ohly
parent 6813388e82
commit 2314724acc
3 changed files with 1064 additions and 911 deletions

View file

@ -588,7 +588,6 @@ if test $enable_gui != "no"; then
PKG_CHECK_MODULES(GUI, $gui_modules)
AC_PATH_PROG([GTK_BUILDER_CONV], gtk-builder-convert)
elif test "$enable_dbus_service" = "yes"; then
# syncevo-dbus-server needs localization
:

View file

@ -39,12 +39,8 @@ dist_src_gtk_ui_themerc_DATA = $(src_gtk_ui_themercfiles)
src_gtk_ui_desktopdir = $(datadir)/applications
dist_noinst_DATA += \
src/gtk-ui/ui.glade \
$(src_gtk_ui_applications_in_files)
src/gtk-ui/ui.xml: src/gtk-ui/ui.glade
$(AM_V_GEN)$(GTK_BUILDER_CONV) $< $@
# sync-ui: default GUI, could be plain GTK or Moblin UX
# sync-ui-gtk: GTK GUI
# sync-ui-moblin: Moblin UX
@ -99,6 +95,5 @@ src_gtk_ui_sync_ui_moblin_CFLAGS = $(src_gtk_ui_sync_ui_CFLAGS)
src_gtk_ui_sync_ui_moblin_CPPFLAGS = $(src_gtk_ui_sync_ui_CPPFLAGS) -DUSE_MOBLIN_UX
CLEANFILES += \
src/gtk-ui/ui.xml \
src/gtk-ui/sync-moblin.desktop \
$(src_gtk_ui_applications_generated)

File diff suppressed because it is too large Load diff