build: fix makefiles for gresource use

5 files changed, 70 insertions, 11 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 59a15cdd..255020dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,8 +73,14 @@ nm_applet_LDADD = \
 	${top_builddir}/src/wireless-security/libwireless-security-libnm.la \
 	${top_builddir}/src/libnma/libnma.la
 
-applet-resources.h: applet.gresource.xml
+applet-resources.h: $(srcdir)/applet.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
 
-applet-resources.c: applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/applet.gresource.xml)
+applet-resources.c: $(srcdir)/applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/applet.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
+
+EXTRA_DIST = \
+	8021x.ui \
+	gsm-unlock.ui \
+	info.ui \
+	applet.gresource.xml
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index 03fbef9e..77bcab9c 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -99,8 +99,36 @@ nm_connection_editor_LDADD = \
 	$(JANSSON_LIBS) \
 	-lm
 
-ce-resources.h: ce.gresource.xml
+ce-resources.h: $(srcdir)/ce.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
 
-ce-resources.c: ce.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/ce.gresource.xml)
+ce-resources.c: $(srcdir)/ce.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/ce.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
+
+EXTRA_DIST = \
+	ce-ip4-routes.ui \
+	ce-ip6-routes.ui \
+	ce-new-connection.ui \
+	ce-page-bluetooth.ui \
+	ce-page-bond.ui \
+	ce-page-bridge-port.ui \
+	ce-page-bridge.ui \
+	ce-page-dcb.ui \
+	ce-page-dsl.ui \
+	ce-page-ethernet.ui \
+	ce-page-general.ui \
+	ce-page-infiniband.ui \
+	ce-page-ip4.ui \
+	ce-page-ip6.ui \
+	ce-page-ip-tunnel.ui \
+	ce-page-mobile.ui \
+	ce-page-ppp.ui \
+	ce-page-proxy.ui \
+	ce-page-team-port.ui \
+	ce-page-team.ui \
+	ce-page-vlan.ui \
+	ce-page-wifi-security.ui \
+	ce-page-wifi.ui \
+	ce-ppp-auth-methods.ui \
+	nm-connection-editor.ui \
+	ce.gresource.xml
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 1e5beceb..d6b95f58 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -54,10 +54,10 @@ EXTRA_libnm_gtk_la_DEPENDENCIES = $(srcdir)/libnm-gtk.ver
 libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \
 	-Wl,--version-script=$(srcdir)/libnm-gtk.ver
 
-nm-resources.h: nm.gresource.xml
+nm-resources.h: $(srcdir)/nm.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
 
-nm-resources.c: nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/nm.gresource.xml)
+nm-resources.c: $(srcdir)/nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/nm.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -93,4 +93,9 @@ check-local:
 CLEANFILES = $(gir_DATA) $(typelib_DATA)
 endif
 
-EXTRA_DIST = libnm-gtk.pc.in libnm-gtk.ver check-exports.sh
+EXTRA_DIST = \
+	libnm-gtk.pc.in \
+	libnm-gtk.ver \
+	check-exports.sh \
+	wifi.ui \
+	nm.gresource.xml
diff --git a/src/libnma/Makefile.am b/src/libnma/Makefile.am
index 9c9c0380..b861db6e 100644
--- a/src/libnma/Makefile.am
+++ b/src/libnma/Makefile.am
@@ -50,10 +50,10 @@ EXTRA_libnma_la_DEPENDENCIES = $(srcdir)/libnma.ver
 libnma_la_LDFLAGS = -Wl,-no-undefined \
 	-Wl,--version-script=$(srcdir)/libnma.ver
 
-nma-resources.h: nma.gresource.xml
+nma-resources.h: $(srcdir)/nma.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
 
-nma-resources.c: nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/nma.gresource.xml)
+nma-resources.c: $(srcdir)/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/nma.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -82,3 +82,9 @@ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES = $(gir_DATA) $(typelib_DATA)
 endif
+
+EXTRA_DIST = \
+	libnma.pc.in \
+	libnma.ver \
+	wifi.ui \
+	nma.gresource.xml
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index 08f07fc2..a9cee288 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -69,8 +69,22 @@ libwireless_security_libnm_la_LIBADD = \
 	$(LIBNM_LIBS) \
 	${top_builddir}/src/utils/libutils-libnm.la
 
-ws-resources.h: ws.gresource.xml
+ws-resources.h: $(srcdir)/ws.gresource.xml
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-header --internal
 
-ws-resources.c: ws.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/ws.gresource.xml)
+ws-resources.c: $(srcdir)/ws.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/ws.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) --generate-source --internal
+
+EXTRA_DIST = \
+	eap-method-fast.ui \
+	eap-method-leap.ui \
+	eap-method-peap.ui \
+	eap-method-simple.ui \
+	eap-method-tls.ui \
+	eap-method-ttls.ui \
+	ws-dynamic-wep.ui \
+	ws-leap.ui \
+	ws-wep-key.ui \
+	ws-wpa-eap.ui \
+	ws-wpa-psk.ui \
+	ws.gresource.xml