command: Use common subdirs - src, data

11 files changed, 87 insertions, 60 deletions

diff --git a/command/Makefile.am b/command/Makefile.am
index 81debe28..5d55ad08 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -1,62 +1,3 @@
-AM_CPPFLAGS = \
-	$(MATE_APPLETS4_CFLAGS) \
-	-I$(srcdir) \
-	$(DISABLE_DEPRECATED_CFLAGS)
-
-APPLET_LOCATION = $(libexecdir)/command-applet
-
-libexec_PROGRAMS = command-applet
-
-BUILT_SOURCES = command-resources.c command-resources.h
-nodist_command_applet_SOURCES = $(BUILT_SOURCES)
-command_applet_SOURCES = command.c ma-command.c ma-command.h
-command_applet_LDADD = $(MATE_APPLETS4_LIBS)
-command_applet_CFLAGS = $(WARN_CFLAGS)
-
-command-resources.c: command-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/command-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name command $<
-
-command-resources.h: command-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/command-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name command $<
-
-appletsdir       = $(datadir)/mate-panel/applets
-applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in
-applets_DATA     = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
-
-$(applets_in_files): $(applets_in_files).in Makefile
-	$(AM_V_GEN)sed \
-		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-		$< > $@
-
-$(applets_DATA): $(applets_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.CommandAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.CommandAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
-		$< > $@
-
-command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in
-gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml)
-@GSETTINGS_RULES@
-
-EXTRA_DIST = \
-	$(applets_in_files).in \
-	$(service_in_files) \
-	$(command_gschema_in_files) \
-	command-preferences.ui \
-	command-resources.gresource.xml
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(applets_DATA) \
-	$(applets_in_files) \
-	$(service_DATA) \
-	$(gsettings_SCHEMAS) \
-	*.gschema.valid
+SUBDIRS = data src
 
 -include $(top_srcdir)/git.mk
diff --git a/command/data/Makefile.am b/command/data/Makefile.am
new file mode 100644
index 00000000..b94e9523
--- /dev/null
+++ b/command/data/Makefile.am
@@ -0,0 +1,42 @@
+APPLET_LOCATION = $(libexecdir)/command-applet
+
+appletsdir       = $(datadir)/mate-panel/applets
+applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in
+applets_DATA     = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
+
+$(applets_in_files): $(applets_in_files).in Makefile
+	$(AM_V_GEN)sed \
+		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
+
+$(applets_DATA): $(applets_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.CommandAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.CommandAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+		-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
+		$< > $@
+
+command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in
+gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml)
+@GSETTINGS_RULES@
+
+EXTRA_DIST = \
+	$(applets_in_files).in \
+	$(service_in_files) \
+	$(command_gschema_in_files) \
+	command-preferences.ui \
+	command-resources.gresource.xml
+
+CLEANFILES = \
+	$(applets_DATA) \
+	$(applets_in_files) \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS) \
+	*.gschema.valid
+
+-include $(top_srcdir)/git.mk
diff --git a/command/command-preferences.ui b/command/data/command-preferences.ui
index 9a2d5435..9a2d5435 100644
--- a/command/command-preferences.ui
+++ b/command/data/command-preferences.ui
diff --git a/command/command-resources.gresource.xml b/command/data/command-resources.gresource.xml
index 72f8ac4c..72f8ac4c 100644
--- a/command/command-resources.gresource.xml
+++ b/command/data/command-resources.gresource.xml
diff --git a/command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
index 04f76f4a..04f76f4a 100644
--- a/command/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
+++ b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in
diff --git a/command/org.mate.panel.applet.CommandAppletFactory.service.in b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in
index a4e04846..a4e04846 100644
--- a/command/org.mate.panel.applet.CommandAppletFactory.service.in
+++ b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in
diff --git a/command/org.mate.panel.applet.command.gschema.xml.in b/command/data/org.mate.panel.applet.command.gschema.xml.in
index b352a21b..b352a21b 100644
--- a/command/org.mate.panel.applet.command.gschema.xml.in
+++ b/command/data/org.mate.panel.applet.command.gschema.xml.in
diff --git a/command/src/Makefile.am b/command/src/Makefile.am
new file mode 100644
index 00000000..d0d2065a
--- /dev/null
+++ b/command/src/Makefile.am
@@ -0,0 +1,44 @@
+NULL =
+
+AM_CPPFLAGS =			\
+	$(MATE_APPLETS4_CFLAGS)	\
+	-I$(srcdir)		\
+	$(DISABLE_DEPRECATED_CFLAGS) \
+	$(NULL)
+
+libexec_PROGRAMS = command-applet
+
+BUILT_SOURCES =			\
+	command-resources.c	\
+	command-resources.h	\
+	$(NULL)
+
+nodist_command_applet_SOURCES = \
+	$(BUILT_SOURCES)	\
+	$(NULL)
+
+command_applet_SOURCES =	\
+	command.c		\
+	ma-command.c		\
+	ma-command.h		\
+	$(NULL)
+
+command_applet_LDADD =		\
+	$(MATE_APPLETS4_LIBS)	\
+	$(NULL)
+
+command_applet_CFLAGS =		\
+	$(WARN_CFLAGS)		\
+	$(NULL)
+
+command-resources.c: $(srcdir)/../data/command-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/command-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name command $<
+
+command-resources.h: $(srcdir)/../data/command-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/command-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name command $<
+
+CLEANFILES =			\
+	$(BUILT_SOURCES)	\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/command/command.c b/command/src/command.c
index f53bef43..f53bef43 100644
--- a/command/command.c
+++ b/command/src/command.c
diff --git a/command/ma-command.c b/command/src/ma-command.c
index da0e8795..da0e8795 100644
--- a/command/ma-command.c
+++ b/command/src/ma-command.c
diff --git a/command/ma-command.h b/command/src/ma-command.h
index 8fb51ab3..8fb51ab3 100644
--- a/command/ma-command.h
+++ b/command/src/ma-command.h