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.

11 files changed, 19 insertions, 21 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index f8f4e92e8..2672fc333 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/data/ui/Makefile.am b/data/ui/Makefile.am
deleted file mode 100644
index 20dfcfdb8..000000000
--- a/data/ui/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-UI_FILES = \
-	epiphany-bookmark-editor-ui.xml	\
-	epiphany-ui.xml			\
-	epiphany-history-window-ui.xml  \
-	epiphany.ui			\
-	epiphany-application-menu.ui	\
-	prefs-dialog.ui			\
-	epiphany.css                    \
-	$(NULL)
-
-EXTRA_DIST = \
-	$(UI_FILES) \
-	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c3e5bbe0d..e0d42c4df 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 d9cb01db3..9e34a652f 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
index 3bddf1b4f..3bddf1b4f 100644
--- a/data/ui/epiphany-application-menu.ui
+++ b/src/epiphany-application-menu.ui
diff --git a/data/ui/epiphany-bookmark-editor-ui.xml b/src/epiphany-bookmark-editor-ui.xml
index 2998d4792..2998d4792 100644
--- a/data/ui/epiphany-bookmark-editor-ui.xml
+++ b/src/epiphany-bookmark-editor-ui.xml
diff --git a/data/ui/epiphany-history-window-ui.xml b/src/epiphany-history-window-ui.xml
index 5592ec2ef..5592ec2ef 100644
--- a/data/ui/epiphany-history-window-ui.xml
+++ b/src/epiphany-history-window-ui.xml
diff --git a/data/ui/epiphany-ui.xml b/src/epiphany-ui.xml
index c4789036f..c4789036f 100644
--- a/data/ui/epiphany-ui.xml
+++ b/src/epiphany-ui.xml
diff --git a/data/ui/epiphany.css b/src/epiphany.css
index b3b9757e3..b3b9757e3 100644
--- a/data/ui/epiphany.css
+++ b/src/epiphany.css
diff --git a/data/ui/epiphany.ui b/src/epiphany.ui
index 57e440ada..57e440ada 100644
--- a/data/ui/epiphany.ui
+++ b/src/epiphany.ui
diff --git a/data/ui/prefs-dialog.ui b/src/prefs-dialog.ui
index 471ef77b5..471ef77b5 100644
--- a/data/ui/prefs-dialog.ui
+++ b/src/prefs-dialog.ui