geyes: Use common subdirs - src, icons, data

20 files changed, 115 insertions, 126 deletions

diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 466e7ea7..4bc566b5 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -1,134 +1,11 @@
 NULL =
 
-SUBDIRS = themes docs
-
-AM_CPPFLAGS =						\
-	-I.						\
-	-I$(srcdir) 					\
-	$(MATE_APPLETS4_CFLAGS)				\
-	-I$(includedir) 				\
-	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"	\
-	-DGEYES_RESOURCE_PATH=\""/org/mate/mate-applets/eyes/"\" \
-	${WARN_CFLAGS}
-
-libexec_PROGRAMS = mate-geyes-applet
-
-BUILT_SOURCES = geyes-resources.c geyes-resources.h
-nodist_mate_geyes_applet_SOURCES = $(BUILT_SOURCES)
-mate_geyes_applet_SOURCES =	\
-	geyes.c			\
-	geyes.h			\
-	themes.c		\
-	$(NULL)
-
-mate_geyes_applet_LDADD =	\
-	$(MATE_APPLETS4_LIBS)	\
-	-lm
-
-geyes-resources.c: geyes-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/geyes-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name eyes $<
-
-geyes-resources.h: geyes-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/geyes-resources.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name eyes $<
-
-appletdir       = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.GeyesApplet.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.GeyesAppletFactory.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files)
-	$(AM_V_GEN)sed \
-            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
-            $< > $@
-
-geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in
-gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml)
-@GSETTINGS_RULES@
+SUBDIRS = data themes docs icons src
 
 themesdir = $(pkgdatadir)/geyes
 
-icons =	\
-	mate-eyes-applet.svg		\
-	mate-eyes-applet.256.png	\
-	mate-eyes-applet.64.png		\
-	mate-eyes-applet.32.png		\
-	mate-eyes-applet.24.png		\
-	mate-eyes-applet.22.png		\
-	mate-eyes-applet.16.png
-
-CLEANFILES = \
-	$(BUILT_SOURCES)		\
-	$(applet_DATA)			\
-	$(applet_in_files)		\
-	$(service_DATA)			\
-	$(gsettings_SCHEMAS)		\
-	*.gschema.valid			\
+EXTRA_DIST =		\
+	README.themes	\
 	$(NULL)
 
-EXTRA_DIST = \
-	geyes-applet-menu.xml		\
-	geyes-resources.gresource.xml	\
-	themes.ui			\
-	README.themes			\
-	$(applet_in_files).in		\
-	$(service_in_files)		\
-	$(geyes_gschema_in_files)	\
-	$(icons)			\
-	$(NULL)
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-uninstall-local:
-	for icon in $(icons); do \
-		SIZE=`echo $$icon | cut -d. -f2`; \
-		FILE=`echo $$icon | cut -d. -f1,3`; \
-		if [ "$$SIZE" = "svg" ]; then \
-			SIZE="scalable"; \
-			FILE="$$FILE.svg"; \
-		else \
-			SIZE="$${SIZE}x$${SIZE}"; \
-		fi; \
-		rm -f $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
-	done
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated. After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-install-data-local:
-	for icon in $(icons); do \
-		SIZE=`echo $$icon | cut -d. -f2`; \
-		FILE=`echo $$icon | cut -d. -f1,3`; \
-		if [ "$$SIZE" = "svg" ]; then \
-			SIZE="scalable"; \
-			FILE="$$FILE.svg"; \
-		else \
-			SIZE="$${SIZE}x$${SIZE}"; \
-		fi; \
-		mkdir -p $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/; \
-		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(iconsdir)/hicolor/$$SIZE/apps/$$FILE; \
-	done
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated. After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
 -include $(top_srcdir)/git.mk
diff --git a/geyes/data/Makefile.am b/geyes/data/Makefile.am
new file mode 100644
index 00000000..0342bdaf
--- /dev/null
+++ b/geyes/data/Makefile.am
@@ -0,0 +1,46 @@
+NULL =
+
+appletdir       = $(datadir)/mate-panel/applets
+applet_in_files = org.mate.applets.GeyesApplet.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.GeyesAppletFactory.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files)
+	$(AM_V_GEN)sed \
+            -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
+            $< > $@
+
+geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in
+gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml)
+@GSETTINGS_RULES@
+
+CLEANFILES = \
+	$(applet_DATA)			\
+	$(applet_in_files)		\
+	$(service_DATA)			\
+	$(gsettings_SCHEMAS)		\
+	*.gschema.valid			\
+	$(NULL)
+
+EXTRA_DIST = \
+	geyes-applet-menu.xml		\
+	geyes-resources.gresource.xml	\
+	themes.ui			\
+	$(applet_in_files).in		\
+	$(service_in_files)		\
+	$(geyes_gschema_in_files)	\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/geyes/geyes-applet-menu.xml b/geyes/data/geyes-applet-menu.xml
index 860052ae..860052ae 100644
--- a/geyes/geyes-applet-menu.xml
+++ b/geyes/data/geyes-applet-menu.xml
diff --git a/geyes/geyes-resources.gresource.xml b/geyes/data/geyes-resources.gresource.xml
index 4a7dc547..4a7dc547 100644
--- a/geyes/geyes-resources.gresource.xml
+++ b/geyes/data/geyes-resources.gresource.xml
diff --git a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in b/geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
index eaadb5f3..eaadb5f3 100644
--- a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
+++ b/geyes/data/org.mate.applets.GeyesApplet.mate-panel-applet.desktop.in.in
diff --git a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in b/geyes/data/org.mate.panel.applet.GeyesAppletFactory.service.in
index 2f490e7b..2f490e7b 100644
--- a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in
+++ b/geyes/data/org.mate.panel.applet.GeyesAppletFactory.service.in
diff --git a/geyes/org.mate.panel.applet.geyes.gschema.xml.in b/geyes/data/org.mate.panel.applet.geyes.gschema.xml.in
index aad28f71..aad28f71 100644
--- a/geyes/org.mate.panel.applet.geyes.gschema.xml.in
+++ b/geyes/data/org.mate.panel.applet.geyes.gschema.xml.in
diff --git a/geyes/themes.ui b/geyes/data/themes.ui
index 70409f3b..70409f3b 100644
--- a/geyes/themes.ui
+++ b/geyes/data/themes.ui
diff --git a/geyes/mate-eyes-applet.16.png b/geyes/icons/16x16/apps/mate-eyes-applet.png
index dbf835b1..dbf835b1 100644
--- a/geyes/mate-eyes-applet.16.png
+++ b/geyes/icons/16x16/apps/mate-eyes-applet.png
diff --git a/geyes/mate-eyes-applet.22.png b/geyes/icons/22x22/apps/mate-eyes-applet.png
index dac46187..dac46187 100644
--- a/geyes/mate-eyes-applet.22.png
+++ b/geyes/icons/22x22/apps/mate-eyes-applet.png
diff --git a/geyes/mate-eyes-applet.24.png b/geyes/icons/24x24/apps/mate-eyes-applet.png
index 49531a98..49531a98 100644
--- a/geyes/mate-eyes-applet.24.png
+++ b/geyes/icons/24x24/apps/mate-eyes-applet.png
diff --git a/geyes/mate-eyes-applet.256.png b/geyes/icons/256x256/apps/mate-eyes-applet.png
index c0509438..c0509438 100644
--- a/geyes/mate-eyes-applet.256.png
+++ b/geyes/icons/256x256/apps/mate-eyes-applet.png
diff --git a/geyes/mate-eyes-applet.32.png b/geyes/icons/32x32/apps/mate-eyes-applet.png
index 08e531c9..08e531c9 100644
--- a/geyes/mate-eyes-applet.32.png
+++ b/geyes/icons/32x32/apps/mate-eyes-applet.png
diff --git a/geyes/mate-eyes-applet.64.png b/geyes/icons/64x64/apps/mate-eyes-applet.png
index ae7a2226..ae7a2226 100644
--- a/geyes/mate-eyes-applet.64.png
+++ b/geyes/icons/64x64/apps/mate-eyes-applet.png
diff --git a/geyes/icons/Makefile.am b/geyes/icons/Makefile.am
new file mode 100644
index 00000000..92fa7f75
--- /dev/null
+++ b/geyes/icons/Makefile.am
@@ -0,0 +1,30 @@
+iconsdir = $(datadir)/icons/hicolor
+
+png_icons = \
+	16x16/apps/mate-eyes-applet.png \
+	22x22/apps/mate-eyes-applet.png \
+	24x24/apps/mate-eyes-applet.png \
+	32x32/apps/mate-eyes-applet.png \
+	64x64/apps/mate-eyes-applet.png \
+	256x256/apps/mate-eyes-applet.png \
+	$(NULL)
+
+nobase_dist_icons_DATA = \
+	$(png_icons) \
+	scalable/apps/mate-eyes-applet.svg \
+	$(NULL)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated. After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/geyes/mate-eyes-applet.svg b/geyes/icons/scalable/apps/mate-eyes-applet.svg
index 1128d45e..1128d45e 100644
--- a/geyes/mate-eyes-applet.svg
+++ b/geyes/icons/scalable/apps/mate-eyes-applet.svg
diff --git a/geyes/src/Makefile.am b/geyes/src/Makefile.am
new file mode 100644
index 00000000..22856564
--- /dev/null
+++ b/geyes/src/Makefile.am
@@ -0,0 +1,36 @@
+NULL =
+
+AM_CPPFLAGS =						\
+	-I.						\
+	-I$(srcdir) 					\
+	$(MATE_APPLETS4_CFLAGS)				\
+	-I$(includedir) 				\
+	-DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"	\
+	-DGEYES_RESOURCE_PATH=\""/org/mate/mate-applets/eyes/"\" \
+	${WARN_CFLAGS}
+
+libexec_PROGRAMS = mate-geyes-applet
+
+BUILT_SOURCES = geyes-resources.c geyes-resources.h
+nodist_mate_geyes_applet_SOURCES = $(BUILT_SOURCES)
+mate_geyes_applet_SOURCES =	\
+	geyes.c			\
+	geyes.h			\
+	themes.c		\
+	$(NULL)
+
+mate_geyes_applet_LDADD =	\
+	$(MATE_APPLETS4_LIBS)	\
+	-lm
+
+geyes-resources.c: $(srcdir)/../data/geyes-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/geyes-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name eyes $<
+
+geyes-resources.h: $(srcdir)/../data/geyes-resources.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/../data --generate-dependencies $(srcdir)/../data/geyes-resources.gresource.xml)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/../data --generate --c-name eyes $<
+
+CLEANFILES =			\
+	$(BUILT_SOURCES)	\
+	$(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/geyes/geyes.c b/geyes/src/geyes.c
index 4adf7e87..4adf7e87 100644
--- a/geyes/geyes.c
+++ b/geyes/src/geyes.c
diff --git a/geyes/geyes.h b/geyes/src/geyes.h
index 3fb24457..3fb24457 100644
--- a/geyes/geyes.h
+++ b/geyes/src/geyes.h
diff --git a/geyes/themes.c b/geyes/src/themes.c
index 6eed8cc9..6eed8cc9 100644
--- a/geyes/themes.c
+++ b/geyes/src/themes.c