[epiphany] Make the resources depend on the actual UI files

[Xan Lopez <xan src gnome org>]

commit f1b56402b69be4b7f0507c7154765d7ff8260ef2
Author: Xan Lopez <xan igalia com>
Date:   Tue Mar 27 22:15:47 2012 +0200

    Make the resources depend on the actual UI files
    
    Otherwise we won't update them if the UI files change. To do this we
    need to move them from data/ui/ to src/, which is not great. Things
    would be easier with non-recursive Makefiles.

 data/Makefile.am                                 |    2 +-
 data/ui/Makefile.am                              |   13 -------------
 po/POTFILES.in                                   |    6 +++---
 src/Makefile.am                                  |   19 +++++++++++++++----
 {data/ui => src}/epiphany-application-menu.ui    |    0
 {data/ui => src}/epiphany-bookmark-editor-ui.xml |    0
 {data/ui => src}/epiphany-history-window-ui.xml  |    0
 {data/ui => src}/epiphany-ui.xml                 |    0
 {data/ui => src}/epiphany.css                    |    0
 {data/ui => src}/epiphany.ui                     |    0
 {data/ui => src}/prefs-dialog.ui                 |    0
 11 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index f8f4e92..2672fc3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = pages ui
+SUBDIRS = pages
 
 @INTLTOOL_SERVER_RULE@
 @INTLTOOL_DESKTOP_RULE@
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3e5bbe..e0d42c4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,9 +3,6 @@
 # Please keep this file sorted alphabetically.
 [type: gettext/xml]data/default-bookmarks.rdf.in
 data/epiphany.desktop.in.in
-[type: gettext/glade]data/ui/epiphany-application-menu.ui
-[type: gettext/glade]data/ui/epiphany.ui
-[type: gettext/glade]data/ui/prefs-dialog.ui
 data/org.gnome.epiphany.gschema.xml.in
 embed/ephy-download.c
 embed/ephy-embed.c
@@ -56,7 +53,10 @@ src/ephy-notebook.c
 src/ephy-session.c
 src/ephy-shell.c
 src/ephy-window.c
+[type: gettext/glade]src/epiphany-application-menu.ui
+[type: gettext/glade]src/epiphany.ui
 src/pdm-dialog.c
 src/popup-commands.c
 src/prefs-dialog.c
+[type: gettext/glade]src/prefs-dialog.ui
 src/window-commands.c
diff --git a/src/Makefile.am b/src/Makefile.am
index d9cb01d..9e34a65 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,7 @@ bin_PROGRAMS = epiphany
 
 EXTRA_DIST = \
 	epiphany.gresource.xml \
+	$(UI_FILES)            \
 	$(NULL)
 
 headerdir = $(prefix)/include/epiphany/$(EPIPHANY_MAJOR)/epiphany
@@ -108,11 +109,21 @@ libephymain_la_CFLAGS = \
 	$(WEBKIT_CFLAGS)	  \
 	$(AM_CFLAGS)
 
-epiphany-resources.c: epiphany.gresource.xml
-	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data/ui --generate-source --c-name epiphany $(srcdir)/epiphany.gresource.xml
+UI_FILES = \
+	epiphany-bookmark-editor-ui.xml	\
+	epiphany-history-window-ui.xml  \
+	epiphany-ui.xml			\
+	epiphany.ui			\
+	epiphany-application-menu.ui	\
+	prefs-dialog.ui			\
+	epiphany.css                    \
+	$(NULL)
+
+epiphany-resources.c: epiphany.gresource.xml $(UI_FILES)
+	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name epiphany $(srcdir)/epiphany.gresource.xml
 
-epiphany-resources.h: epiphany.gresource.xml
-	glib-compile-resources --target=$@ --sourcedir=$(top_srcdir)/data/ui --generate-header --c-name epiphany $(srcdir)/epiphany.gresource.xml
+epiphany-resources.h: epiphany.gresource.xml $(UI_FILES)
+	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name epiphany $(srcdir)/epiphany.gresource.xml
 
 EPIPHANY_RESOURCES = \
 	epiphany-resources.c \
diff --git a/data/ui/epiphany-application-menu.ui b/src/epiphany-application-menu.ui
similarity index 100%
rename from data/ui/epiphany-application-menu.ui
rename to src/epiphany-application-menu.ui
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/src/epiphany-bookmark-editor-ui.xml
similarity index 100%
rename from data/ui/epiphany-bookmark-editor-ui.xml
rename to src/epiphany-bookmark-editor-ui.xml
diff --git a/data/ui/epiphany-history-window-ui.xml b/src/epiphany-history-window-ui.xml
similarity index 100%
rename from data/ui/epiphany-history-window-ui.xml
rename to src/epiphany-history-window-ui.xml
diff --git a/data/ui/epiphany-ui.xml b/src/epiphany-ui.xml
similarity index 100%
rename from data/ui/epiphany-ui.xml
rename to src/epiphany-ui.xml
diff --git a/data/ui/epiphany.css b/src/epiphany.css
similarity index 100%
rename from data/ui/epiphany.css
rename to src/epiphany.css
diff --git a/data/ui/epiphany.ui b/src/epiphany.ui
similarity index 100%
rename from data/ui/epiphany.ui
rename to src/epiphany.ui
diff --git a/data/ui/prefs-dialog.ui b/src/prefs-dialog.ui
similarity index 100%
rename from data/ui/prefs-dialog.ui
rename to src/prefs-dialog.ui