drivemount: Use common subdirs - data, src

15 files changed, 95 insertions, 86 deletions

diff --git a/configure.ac b/configure.ac
index f93f81f3..7b5df13c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -559,8 +559,10 @@ accessx-status/docs/Makefile
 accessx-status/icons/Makefile
 accessx-status/src/Makefile
 drivemount/Makefile
+drivemount/data/Makefile
+drivemount/data/org.mate.drivemount.gschema.xml
 drivemount/help/Makefile
-drivemount/org.mate.drivemount.gschema.xml
+drivemount/src/Makefile
 multiload/Makefile
 multiload/org.mate.panel.applet.multiload.gschema.xml
 multiload/docs/Makefile
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 16088a47..04c1df64 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -1,84 +1,3 @@
-NULL =
-
-SUBDIRS = help
-
-AM_CPPFLAGS =				\
-	-I.				\
-	-I$(srcdir)			\
-	-DDRIVEMOUNT_RESOURCE_PATH=\""/org/mate/mate-applets/drivemount/"\" \
-	${WARN_CFLAGS}			\
-	$(MATE_APPLETS4_CFLAGS)		\
-	$(NULL)
-
-libexec_PROGRAMS = mate-drivemount-applet
-
-BUILT_SOURCES =				\
-	drivemount-resources.c		\
-	drivemount-resources.h		\
-	$(NULL)
-
-nodist_mate_drivemount_applet_SOURCES =	\
-	$(BUILT_SOURCES)		\
-	$(NULL)
-
-mate_drivemount_applet_SOURCES =	\
-	drivemount.c			\
-	drive-list.c			\
-	drive-list.h			\
-	drive-button.c			\
-	drive-button.h			\
-	$(NULL)
-
-mate_drivemount_applet_LDADD =		\
-	$(MATE_APPLETS4_LIBS)
-
-drivemount-resources.c: drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/drivemount-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name drivemount $<
-
-drivemount-resources.h: drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/drivemount-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name drivemount $<
-
-drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in
-gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml)
-@GSETTINGS_RULES@
-
-appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.DriveMountApplet.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.DriveMountAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
-CLEANFILES =				\
-	$(applet_DATA)			\
-	$(applet_in_files)		\
-	$(service_DATA)			\
-	$(gsettings_SCHEMAS)		\
-	$(BUILT_SOURCES)		\
-	*.gschema.valid			\
-	$(NULL)
-
-EXTRA_DIST =				\
-	$(applet_in_files).in		\
-	$(service_in_files)		\
-	$(drivemount_gschema_in_files)	\
-	drivemount-applet-menu.xml	\
-	drivemount-resources.gresource.xml \
-	$(NULL)
+SUBDIRS = help data src
 
 -include $(top_srcdir)/git.mk
diff --git a/drivemount/data/Makefile.am b/drivemount/data/Makefile.am
new file mode 100644
index 00000000..b0dc7718
--- /dev/null
+++ b/drivemount/data/Makefile.am
@@ -0,0 +1,45 @@
+NULL =
+
+drivemount_gschema_in_files = org.mate.drivemount.gschema.xml.in
+gsettings_SCHEMAS = $(drivemount_gschema_in_files:.xml.in=.xml)
+@GSETTINGS_RULES@
+
+appletdir       = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.DriveMountApplet.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.DriveMountAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.DriveMountAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            $< > $@
+
+CLEANFILES =				\
+	$(applet_DATA)			\
+	$(applet_in_files)		\
+	$(service_DATA)			\
+	$(gsettings_SCHEMAS)		\
+	*.gschema.valid			\
+	$(NULL)
+
+EXTRA_DIST =				\
+	$(applet_in_files:=.in)		\
+	$(drivemount_gschema_in_files)	\
+	$(service_in_files)		\
+	drivemount-applet-menu.xml	\
+	drivemount-resources.gresource.xml \
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/drivemount/drivemount-applet-menu.xml b/drivemount/data/drivemount-applet-menu.xml
index efc26591..efc26591 100644
--- a/drivemount/drivemount-applet-menu.xml
+++ b/drivemount/data/drivemount-applet-menu.xml
diff --git a/drivemount/drivemount-resources.gresource.xml b/drivemount/data/drivemount-resources.gresource.xml
index 3a8c57a8..3a8c57a8 100644
--- a/drivemount/drivemount-resources.gresource.xml
+++ b/drivemount/data/drivemount-resources.gresource.xml
diff --git a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
index 637628d2..637628d2 100644
--- a/drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
+++ b/drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
diff --git a/drivemount/org.mate.drivemount.gschema.xml.in b/drivemount/data/org.mate.drivemount.gschema.xml.in
index 24ffe871..24ffe871 100644
--- a/drivemount/org.mate.drivemount.gschema.xml.in
+++ b/drivemount/data/org.mate.drivemount.gschema.xml.in
diff --git a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in
index 90d44b42..90d44b42 100644
--- a/drivemount/org.mate.panel.applet.DriveMountAppletFactory.service.in
+++ b/drivemount/data/org.mate.panel.applet.DriveMountAppletFactory.service.in
diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am
new file mode 100644
index 00000000..28b273c0
--- /dev/null
+++ b/drivemount/src/Makefile.am
@@ -0,0 +1,43 @@
+NULL =
+
+AM_CPPFLAGS =				\
+	-I.				\
+	-I$(srcdir)			\
+	-DDRIVEMOUNT_RESOURCE_PATH=\""/org/mate/mate-applets/drivemount/"\" \
+	${WARN_CFLAGS}			\
+	$(MATE_APPLETS4_CFLAGS)		\
+	$(NULL)
+
+libexec_PROGRAMS = mate-drivemount-applet
+
+BUILT_SOURCES =				\
+	drivemount-resources.c		\
+	drivemount-resources.h		\
+	$(NULL)
+
+nodist_mate_drivemount_applet_SOURCES =	\
+	$(BUILT_SOURCES)		\
+	$(NULL)
+
+mate_drivemount_applet_SOURCES =	\
+	drivemount.c			\
+	drive-list.c			\
+	drive-list.h			\
+	drive-button.c			\
+	drive-button.h			\
+	$(NULL)
+
+mate_drivemount_applet_LDADD =		\
+	$(MATE_APPLETS4_LIBS)
+
+drivemount-resources.c: ../data/drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/drivemount-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name drivemount $<
+
+drivemount-resources.h: ../data/drivemount-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data/ --generate-dependencies $(srcdir)/../data/drivemount-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data/ --generate --c-name drivemount $<
+
+CLEANFILES =				\
+	$(BUILT_SOURCES)		\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/drivemount/drive-button.c b/drivemount/src/drive-button.c
index f64f38c4..f64f38c4 100644
--- a/drivemount/drive-button.c
+++ b/drivemount/src/drive-button.c
diff --git a/drivemount/drive-button.h b/drivemount/src/drive-button.h
index fdab2f16..fdab2f16 100644
--- a/drivemount/drive-button.h
+++ b/drivemount/src/drive-button.h
diff --git a/drivemount/drive-list.c b/drivemount/src/drive-list.c
index b1840051..b1840051 100644
--- a/drivemount/drive-list.c
+++ b/drivemount/src/drive-list.c
diff --git a/drivemount/drive-list.h b/drivemount/src/drive-list.h
index e2da7333..e2da7333 100644
--- a/drivemount/drive-list.h
+++ b/drivemount/src/drive-list.h
diff --git a/drivemount/drivemount.c b/drivemount/src/drivemount.c
index d6a77f20..d6a77f20 100644
--- a/drivemount/drivemount.c
+++ b/drivemount/src/drivemount.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dcdf24c4..3f85ec69 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,9 +26,9 @@ cpufreq/src/cpufreq-monitor-cpuinfo.c
 cpufreq/src/cpufreq-monitor-factory.c
 cpufreq/src/cpufreq-popup.c
 cpufreq/src/cpufreq-selector/org.mate.cpufreqselector.policy.in
-drivemount/drive-button.c
-drivemount/drivemount.c
-drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
+drivemount/data/org.mate.applets.DriveMountApplet.mate-panel-applet.desktop.in.in
+drivemount/src/drive-button.c
+drivemount/src/drivemount.c
 geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
 geyes/data/org.mate.panel.applet.geyes.gschema.xml.in
 geyes/data/themes.ui