mateweather: Use common subdirs - src, data

20 files changed, 83 insertions, 79 deletions

diff --git a/configure.ac b/configure.ac
index 3e5884dc..b48b1015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -572,7 +572,9 @@ charpick/Makefile
 charpick/org.mate.panel.applet.charpick.gschema.xml
 charpick/help/Makefile
 mateweather/Makefile
+mateweather/data/Makefile
 mateweather/docs/Makefile
+mateweather/src/Makefile
 geyes/Makefile
 geyes/data/Makefile
 geyes/data/org.mate.panel.applet.geyes.gschema.xml
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index 07e7884c..576d2297 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -1,74 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = docs
-
-AM_CPPFLAGS =					\
-	-I$(srcdir)				\
-	-I$(top_srcdir)				\
-	-DWEATHER_RESOURCE_PATH=\""/org/mate/mate-applets/mateweather/"\" \
-	$(MATE_APPLETS4_CFLAGS)			\
-	$(LIBNOTIFY_CFLAGS)			\
-	$(LIBMATEWEATHER_CFLAGS)		\
-	${WARN_CFLAGS}
-
-libexec_PROGRAMS = mateweather-applet
-
-BUILT_SOURCES = mateweather-resources.c mateweather-resources.h
-nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES)
-mateweather_applet_SOURCES = \
-	mateweather.h \
-	main.c \
-	mateweather-about.c mateweather-about.h \
-	mateweather-pref.c mateweather-pref.h \
-	mateweather-dialog.c mateweather-dialog.h \
-	mateweather-applet.c mateweather-applet.h
-
-mateweather_applet_LDADD = 	\
-	$(LIBNOTIFY_LIBS) 	\
-	$(MATE_APPLETS4_LIBS)	\
-	$(MATE_LIBS2_LIBS)	\
-	$(LIBMATEWEATHER_LIBS)
-
-mateweather-resources.c: mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/mateweather-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name mateweather $<
-
-mateweather-resources.h: mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/mateweather-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name mateweather $<
-
-appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in
-applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applet_in_files): $(applet_in_files).in Makefile
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
-
-$(applet_DATA): $(applet_in_files) Makefile
-	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
-
-servicedir       = $(datadir)/dbus-1/services
-service_in_files = org.mate.panel.applet.MateWeatherAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.MateWeatherAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
-CLEANFILES =			\
-	$(applet_DATA)		\
-	$(applet_in_files)	\
-	$(service_DATA)		\
-	$(BUILT_SOURCES)
-
-EXTRA_DIST =					\
-	mateweather-applet-menu.xml		\
-	mateweather-dialog.ui			\
-	mateweather-resources.gresource.xml	\
-	$(applet_in_files).in			\
-	$(service_in_files)			\
-	$(ui_DATA)
+SUBDIRS = docs data src
 
 -include $(top_srcdir)/git.mk
diff --git a/mateweather/data/Makefile.am b/mateweather/data/Makefile.am
new file mode 100644
index 00000000..4dfe4884
--- /dev/null
+++ b/mateweather/data/Makefile.am
@@ -0,0 +1,36 @@
+appletdir       = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in
+applet_DATA     = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applet_in_files): $(applet_in_files).in Makefile
+	$(AM_V_GEN)sed \
+            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+            $< > $@
+
+$(applet_DATA): $(applet_in_files) Makefile
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
+
+servicedir       = $(datadir)/dbus-1/services
+service_in_files = org.mate.panel.applet.MateWeatherAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.MateWeatherAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            $< > $@
+
+CLEANFILES =			\
+	$(applet_DATA)		\
+	$(applet_in_files)	\
+	$(service_DATA)
+
+EXTRA_DIST =					\
+	mateweather-applet-menu.xml		\
+	mateweather-dialog.ui			\
+	mateweather-resources.gresource.xml	\
+	$(applet_in_files:=.in)			\
+	$(service_in_files)			\
+	$(ui_DATA)
+
+-include $(top_srcdir)/git.mk
diff --git a/mateweather/mateweather-applet-menu.xml b/mateweather/data/mateweather-applet-menu.xml
index 8fc0a357..8fc0a357 100644
--- a/mateweather/mateweather-applet-menu.xml
+++ b/mateweather/data/mateweather-applet-menu.xml
diff --git a/mateweather/mateweather-dialog.ui b/mateweather/data/mateweather-dialog.ui
index e370ac7e..e370ac7e 100644
--- a/mateweather/mateweather-dialog.ui
+++ b/mateweather/data/mateweather-dialog.ui
diff --git a/mateweather/mateweather-resources.gresource.xml b/mateweather/data/mateweather-resources.gresource.xml
index db4b5d57..db4b5d57 100644
--- a/mateweather/mateweather-resources.gresource.xml
+++ b/mateweather/data/mateweather-resources.gresource.xml
diff --git a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in b/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
index 03d2b621..03d2b621 100644
--- a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
+++ b/mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
diff --git a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in
index e1d0174a..e1d0174a 100644
--- a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
+++ b/mateweather/data/org.mate.panel.applet.MateWeatherAppletFactory.service.in
diff --git a/mateweather/src/Makefile.am b/mateweather/src/Makefile.am
new file mode 100644
index 00000000..b01bc226
--- /dev/null
+++ b/mateweather/src/Makefile.am
@@ -0,0 +1,37 @@
+AM_CPPFLAGS =					\
+	-I$(srcdir)				\
+	-I$(top_srcdir)				\
+	-DWEATHER_RESOURCE_PATH=\""/org/mate/mate-applets/mateweather/"\" \
+	$(MATE_APPLETS4_CFLAGS)			\
+	$(LIBNOTIFY_CFLAGS)			\
+	$(LIBMATEWEATHER_CFLAGS)		\
+	${WARN_CFLAGS}
+
+libexec_PROGRAMS = mateweather-applet
+
+BUILT_SOURCES = mateweather-resources.c mateweather-resources.h
+nodist_mateweather_applet_SOURCES = $(BUILT_SOURCES)
+mateweather_applet_SOURCES = \
+	mateweather.h \
+	main.c \
+	mateweather-about.c mateweather-about.h \
+	mateweather-pref.c mateweather-pref.h \
+	mateweather-dialog.c mateweather-dialog.h \
+	mateweather-applet.c mateweather-applet.h
+
+mateweather_applet_LDADD = 	\
+	$(LIBNOTIFY_LIBS) 	\
+	$(MATE_APPLETS4_LIBS)	\
+	$(MATE_LIBS2_LIBS)	\
+	$(LIBMATEWEATHER_LIBS)
+
+mateweather-resources.c: ../data/mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/mateweather-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name mateweather $<
+
+mateweather-resources.h: ../data/mateweather-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/mateweather-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name mateweather $<
+
+CLEANFILES =			\
+	$(BUILT_SOURCES)
+
+-include $(top_srcdir)/git.mk
diff --git a/mateweather/main.c b/mateweather/src/main.c
index de8d8436..de8d8436 100644
--- a/mateweather/main.c
+++ b/mateweather/src/main.c
diff --git a/mateweather/mateweather-about.c b/mateweather/src/mateweather-about.c
index 5c1389f3..5c1389f3 100644
--- a/mateweather/mateweather-about.c
+++ b/mateweather/src/mateweather-about.c
diff --git a/mateweather/mateweather-about.h b/mateweather/src/mateweather-about.h
index 6d5bed01..6d5bed01 100644
--- a/mateweather/mateweather-about.h
+++ b/mateweather/src/mateweather-about.h
diff --git a/mateweather/mateweather-applet.c b/mateweather/src/mateweather-applet.c
index 7785744f..7785744f 100644
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/src/mateweather-applet.c
diff --git a/mateweather/mateweather-applet.h b/mateweather/src/mateweather-applet.h
index eef4f8bb..eef4f8bb 100644
--- a/mateweather/mateweather-applet.h
+++ b/mateweather/src/mateweather-applet.h
diff --git a/mateweather/mateweather-dialog.c b/mateweather/src/mateweather-dialog.c
index 02ca824c..02ca824c 100644
--- a/mateweather/mateweather-dialog.c
+++ b/mateweather/src/mateweather-dialog.c
diff --git a/mateweather/mateweather-dialog.h b/mateweather/src/mateweather-dialog.h
index 0eaf0b50..0eaf0b50 100644
--- a/mateweather/mateweather-dialog.h
+++ b/mateweather/src/mateweather-dialog.h
diff --git a/mateweather/mateweather-pref.c b/mateweather/src/mateweather-pref.c
index ac41e149..ac41e149 100644
--- a/mateweather/mateweather-pref.c
+++ b/mateweather/src/mateweather-pref.c
diff --git a/mateweather/mateweather-pref.h b/mateweather/src/mateweather-pref.h
index f3cc901b..f3cc901b 100644
--- a/mateweather/mateweather-pref.h
+++ b/mateweather/src/mateweather-pref.h
diff --git a/mateweather/mateweather.h b/mateweather/src/mateweather.h
index fa492849..fa492849 100644
--- a/mateweather/mateweather.h
+++ b/mateweather/src/mateweather.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index aa7d1bc8..3ab8cee2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,13 +34,13 @@ geyes/data/org.mate.panel.applet.geyes.gschema.xml.in
 geyes/data/themes.ui
 geyes/src/geyes.c
 geyes/src/themes.c
-mateweather/mateweather-about.c
-mateweather/mateweather-applet.c
-mateweather/mateweather-dialog.c
-mateweather/mateweather-dialog.ui
-mateweather/mateweather-pref.c
-mateweather/main.c
-mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
+mateweather/data/mateweather-dialog.ui
+mateweather/data/org.mate.applets.MateWeatherApplet.mate-panel-applet.desktop.in.in
+mateweather/src/mateweather-about.c
+mateweather/src/mateweather-applet.c
+mateweather/src/mateweather-dialog.c
+mateweather/src/mateweather-pref.c
+mateweather/src/main.c
 # NB. these are actually separate files
 multiload/data/org.mate.applets.MultiLoadApplet.mate-panel-applet.desktop.in.in
 multiload/data/org.mate.panel.applet.multiload.gschema.xml.in