diff options
| -rw-r--r-- | netspeed/data/Makefile.am | 8 | ||||
| -rw-r--r-- | netspeed/data/netspeed-details.ui (renamed from netspeed/src/netspeed-details.ui) | 0 | ||||
| -rw-r--r-- | netspeed/data/netspeed-preferences.ui (renamed from netspeed/src/netspeed-preferences.ui) | 0 | ||||
| -rw-r--r-- | netspeed/data/netspeed-resources.gresource.xml (renamed from netspeed/src/netspeed-resources.gresource.xml) | 0 | ||||
| -rw-r--r-- | netspeed/src/Makefile.am | 18 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 |
6 files changed, 13 insertions, 17 deletions
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am index 7875af7d..54cd6597 100644 --- a/netspeed/data/Makefile.am +++ b/netspeed/data/Makefile.am @@ -1,3 +1,5 @@ +NULL = + APPLET_LOCATION = $(libexecdir)/mate-netspeed-applet appletdir = $(datadir)/mate-panel/applets @@ -32,7 +34,11 @@ EXTRA_DIST = \ $(applet_in_files).in \ $(xmlui_DATA) \ $(service_in_files) \ - $(netspeed_gschema_in_files) + $(netspeed_gschema_in_files) \ + netspeed-details.ui \ + netspeed-preferences.ui \ + netspeed-resources.gresource.xml \ + $(NULL) CLEANFILES = \ $(gsettings_SCHEMAS) \ diff --git a/netspeed/src/netspeed-details.ui b/netspeed/data/netspeed-details.ui index a537555f..a537555f 100644 --- a/netspeed/src/netspeed-details.ui +++ b/netspeed/data/netspeed-details.ui diff --git a/netspeed/src/netspeed-preferences.ui b/netspeed/data/netspeed-preferences.ui index 62b0e601..62b0e601 100644 --- a/netspeed/src/netspeed-preferences.ui +++ b/netspeed/data/netspeed-preferences.ui diff --git a/netspeed/src/netspeed-resources.gresource.xml b/netspeed/data/netspeed-resources.gresource.xml index d083d9c7..d083d9c7 100644 --- a/netspeed/src/netspeed-resources.gresource.xml +++ b/netspeed/data/netspeed-resources.gresource.xml diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am index 04e934f1..dae9df37 100644 --- a/netspeed/src/Makefile.am +++ b/netspeed/src/Makefile.am @@ -1,10 +1,5 @@ NULL = -builder_files = \ - netspeed-details.ui \ - netspeed-preferences.ui \ - $(NULL) - AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(includedir) \ @@ -46,19 +41,14 @@ if HAVE_NL mate_netspeed_applet_LDADD += $(NL_LIBS) endif -netspeed-resources.c: netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/netspeed-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name netspeed $< +netspeed-resources.c: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< -netspeed-resources.h: netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/netspeed-resources.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name netspeed $< +netspeed-resources.h: $(srcdir)/../data/netspeed-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/netspeed-resources.gresource.xml) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name netspeed $< CLEANFILES = \ $(BUILT_SOURCES) \ $(NULL) -EXTRA_DIST = \ - $(builder_files) \ - netspeed-resources.gresource.xml \ - $(NULL) - -include $(top_srcdir)/git.mk diff --git a/po/POTFILES.in b/po/POTFILES.in index 4c140cc9..ea0cb3e1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -50,12 +50,12 @@ multiload/netspeed.c multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in multiload/org.mate.panel.applet.multiload.gschema.xml.in multiload/properties.c +netspeed/data/netspeed-details.ui +netspeed/data/netspeed-preferences.ui netspeed/data/org.mate.panel.applet.netspeed.gschema.xml.in netspeed/data/org.mate.applets.NetspeedApplet.mate-panel-applet.desktop.in.in netspeed/src/backend.c netspeed/src/netspeed.c -netspeed/src/netspeed-details.ui -netspeed/src/netspeed-preferences.ui # NB. these are actually separate files stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.desktop.in.in stickynotes/stickynotes.c |