GNOME.org
 

[cheese] Make data directory build non-recursively

commit 8b76f7191613129bbd18a3dc5d72a63d8af308eb
Author: David King <amigadave amigadave com>
Date:   Sun Oct 16 09:55:10 2011 +0200

    Make data directory build non-recursively
    
    Additionally, make the GSettings schema translatable.

 Makefile.am                                        |  101 ++++++++++++++++++-
 configure.ac                                       |   16 ---
 data/Makefile.am                                   |   43 --------
 data/icons/16x16/Makefile.am                       |   10 --
 data/icons/16x16/actions/Makefile.am               |   13 ---
 data/icons/22x22/Makefile.am                       |   10 --
 data/icons/22x22/actions/Makefile.am               |   13 ---
 data/icons/24x24/Makefile.am                       |   10 --
 data/icons/24x24/actions/Makefile.am               |   13 ---
 data/icons/256x256/Makefile.am                     |    8 --
 data/icons/32x32/Makefile.am                       |   10 --
 data/icons/32x32/actions/Makefile.am               |   13 ---
 data/icons/48x48/Makefile.am                       |   10 --
 data/icons/48x48/actions/Makefile.am               |   13 ---
 data/icons/Makefile.am                             |   14 ---
 data/icons/scalable/Makefile.am                    |    7 --
 data/icons/scalable/actions/Makefile.am            |   13 ---
 ...gschema.xml => org.gnome.Cheese.gschema.xml.in} |  110 ++++++++++----------
 data/pixmaps/Makefile.am                           |   12 --
 po/POTFILES.in                                     |    1 +
 20 files changed, 156 insertions(+), 284 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 1002aea..c3b99c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = src po data help docs
+SUBDIRS = src po help docs
 
 marshal_data = \
 	libcheese/cheese-marshal.c \
@@ -238,9 +238,104 @@ tests_cheese_test_widget_LDADD = \
 	libcheese-gtk.la
 tests_test_webcam_button_LDADD = $(XTEST_LIBS)
 
+ INTLTOOL_DESKTOP_RULE@
+desktopdir = $(datadir)/applications
+desktop_in_files = data/cheese.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+ INTLTOOL_XML_NOMERGE_RULE@
+gsettings_in_file = data/org.gnome.Cheese.gschema.xml.in
+gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml)
+ GSETTINGS_RULES@
+
+dist_pkgdata_DATA = \
+	data/cheese.css \
+	data/cheese-about.ui \
+	data/cheese-actions.ui \
+	data/cheese-main-window.ui \
+	data/cheese-prefs.ui \
+	data/cheese-viewport.json
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+	data/cheese.pc \
+	data/cheese-gtk.pc
+
+iconthemedir = $(datadir)/icons/hicolor
+
+appsicon16dir = $(iconthemedir)/16x16/apps
+appsicon22dir = $(iconthemedir)/22x22/apps
+appsicon24dir = $(iconthemedir)/24x24/apps
+appsicon32dir = $(iconthemedir)/32x32/apps
+appsicon48dir = $(iconthemedir)/48x48/apps
+appsicon256dir = $(iconthemedir)/256x256/apps
+
+actionsicon16dir = $(iconthemedir)/16x16/actions
+actionsicon22dir = $(iconthemedir)/22x22/actions
+actionsicon24dir = $(iconthemedir)/24x24/actions
+actionsicon32dir = $(iconthemedir)/32x32/actions
+actionsicon48dir = $(iconthemedir)/48x48/actions
+actionsiconscalabledir = $(iconthemedir)/scalable/actions
+
+dist_appsicon16_DATA = data/icons/16x16/cheese.png
+dist_appsicon22_DATA = data/icons/22x22/cheese.png
+dist_appsicon24_DATA = data/icons/24x24/cheese.png
+dist_appsicon32_DATA = data/icons/32x32/cheese.png
+dist_appsicon48_DATA = data/icons/48x48/cheese.png
+dist_appsicon256_DATA = data/icons/256x256/cheese.png
+
+dist_actionsicon16_DATA = \
+	data/icons/16x16/actions/browse-webcam-effects.png \
+	data/icons/16x16/actions/cheese-take-burst.png \
+	data/icons/16x16/actions/cheese-take-photo.png
+dist_actionsicon22_DATA = \
+	data/icons/22x22/actions/browse-webcam-effects.png \
+	data/icons/22x22/actions/cheese-take-burst.png \
+	data/icons/22x22/actions/cheese-take-photo.png
+dist_actionsicon24_DATA = \
+	data/icons/24x24/actions/browse-webcam-effects.png \
+	data/icons/24x24/actions/cheese-take-burst.png \
+	data/icons/24x24/actions/cheese-take-photo.png
+dist_actionsicon32_DATA = \
+	data/icons/32x32/actions/browse-webcam-effects.png \
+	data/icons/32x32/actions/cheese-take-burst.png \
+	data/icons/32x32/actions/cheese-take-photo.png
+dist_actionsicon48_DATA = \
+	data/icons/48x48/actions/browse-webcam-effects.png \
+	data/icons/48x48/actions/cheese-take-burst.png \
+	data/icons/48x48/actions/cheese-take-photo.png
+dist_actionsiconscalable_DATA = \
+	data/icons/scalable/actions/browse-webcam-effects.svg \
+	data/icons/scalable/actions/cheese-take-burst.svg \
+	data/icons/scalable/actions/cheese-take-photo.svg
+
+update_icon_cache = gtk-update-icon-cache --ignore-theme-index --force
+
+install-data-hook: install-update-icon-cache
+uninstall-hook: uninstall-update-icon-cache
+
+install-update-icon-cache:
+	$(AM_V_at)$(POST_INSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+uninstall-update-icon-cache:
+	$(AM_V_at)$(POST_UNINSTALL)
+	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
+
+pixmapsdir = $(pkgdatadir)/pixmaps
+dist_pixmaps_DATA = \
+	data/pixmaps/thumbnail-frame.png \
+	data/pixmaps/camera-icon.svg \
+	data/pixmaps/cheese-1.svg \
+	data/pixmaps/cheese-2.svg \
+	data/pixmaps/cheese-3.svg
+
 dist_noinst_DATA = \
 	build-aux/gnome-doc-utils.make \
 	ChangeLog.pre-git \
+	$(desktop_in_files) \
+	$(gsettings_in_file) \
+	$(service_in_files) \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
@@ -254,6 +349,9 @@ dist_noinst_SCRIPTS = \
 	autogen.sh
 
 CLEANFILES = \
+	$(desktop_DATA) \
+	$(gsettings_SCHEMAS) \
+	$(pkgconfig_DATA) \
 	$(marshal_data) \
 	$(enum_data) \
 	$(gir_DATA) \
@@ -276,6 +374,7 @@ MAINTAINERCLEANFILES = \
 	build-aux/missing \
 	aclocal.m4 \
 	config.h.n \
+	$(gsettings_SCHEMAS:.xml=.valid) \
 	mkinstalldirs \
 	omf.make \
 	xmldocs.make
diff --git a/configure.ac b/configure.ac
index 9da4b74..a5867db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,25 +173,9 @@ Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
-data/Makefile
 data/cheese.pc
 data/cheese-gtk.pc
 data/cheese.desktop.in
-data/icons/Makefile
-data/icons/16x16/Makefile
-data/icons/22x22/Makefile
-data/icons/24x24/Makefile
-data/icons/32x32/Makefile
-data/icons/48x48/Makefile
-data/icons/256x256/Makefile
-data/icons/scalable/Makefile
-data/icons/16x16/actions/Makefile
-data/icons/22x22/actions/Makefile
-data/icons/24x24/actions/Makefile
-data/icons/32x32/actions/Makefile
-data/icons/48x48/actions/Makefile
-data/icons/scalable/actions/Makefile
-data/pixmaps/Makefile
 help/Makefile
 src/Makefile
 po/Makefile.in
diff --git a/data/org.gnome.Cheese.gschema.xml b/data/org.gnome.Cheese.gschema.xml.in
similarity index 63%
rename from data/org.gnome.Cheese.gschema.xml
rename to data/org.gnome.Cheese.gschema.xml.in
index 2f581ae..f484b99 100644
--- a/data/org.gnome.Cheese.gschema.xml
+++ b/data/org.gnome.Cheese.gschema.xml.in
@@ -1,151 +1,151 @@
 <schemalist>
   <schema id='org.gnome.Cheese' path='/apps/cheese/'>
     <key name='countdown' type='b'>
-      <summary>Use a countdown</summary>
-      <description>
+      <_summary>Use a countdown</_summary>
+      <_description>
         Set to True to show countdown when taking a photo
-      </description>
+      </_description>
       <default>true</default>
     </key>
 
     <key name='flash' type='b'>
-      <summary>Fire flash before taking a picture</summary>
-      <description>
+      <_summary>Fire flash before taking a picture</_summary>
+      <_description>
         Set to True to fire a flash before taking a picture
-      </description>
+      </_description>
       <default>true</default>
     </key>
 
     <key name='camera' type='s'>
-      <summary>Camera device string indicator</summary>
-      <description>
+      <_summary>Camera device string indicator</_summary>
+      <_description>
         The device which points to the camera (e.g. /dev/video0)
-      </description>
+      </_description>
       <default>''</default>
     </key>
 
     <key name='selected-effect' type='s'>
-      <summary>Name of last selected effect</summary>
-      <description>
+      <_summary>Name of last selected effect</_summary>
+      <_description>
         Name of installed effect that was selected last
-      </description>
+      </_description>
       <default>'identity'</default>
     </key>
 
     <key name='photo-x-resolution' type='i'>
-      <summary>Photo width resolution</summary>
-      <description>
+      <_summary>Photo width resolution</_summary>
+      <_description>
         The width resolution of the image captured from the camera
-      </description>
+      </_description>
       <default>0</default>
     </key>
 
     <key name='photo-y-resolution' type='i'>
-      <summary>Photo height resolution</summary>
-      <description>
+      <_summary>Photo height resolution</_summary>
+      <_description>
         The height resolution of the image captured from the camera
-      </description>
+      </_description>
       <default>0</default>
     </key>
 
     <key name='video-x-resolution' type='i'>
-      <summary>Video width resolution</summary>
-      <description>
+      <_summary>Video width resolution</_summary>
+      <_description>
         The width resolution of the video captured from the camera
-      </description>
+      </_description>
       <default>0</default>
     </key>
 
     <key name='video-y-resolution' type='i'>
-      <summary>Video height resolution</summary>
-      <description>
+      <_summary>Video height resolution</_summary>
+      <_description>
         The height resolution of the video captured from the camera
-      </description>
+      </_description>
       <default>0</default>
     </key>
 
     <key name='brightness' type='d'>
-      <summary>Picture brightness</summary>
-      <description>
+      <_summary>Picture brightness</_summary>
+      <_description>
         Adjusts brightness level of the picture coming from the camera
-      </description>
+      </_description>
       <default>0</default>
     </key>
 
     <key name='contrast' type='d'>
-      <summary>Picture contrast</summary>
-      <description>
+      <_summary>Picture contrast</_summary>
+      <_description>
         Adjusts contrast level of the picture coming from the camera
-      </description>
+      </_description>
       <default>1.0</default>
     </key>
 
     <key name='saturation' type='d'>
-      <summary>Picture saturation</summary>
-      <description>
+      <_summary>Picture saturation</_summary>
+      <_description>
         Adjusts saturation level of the picture coming from the camera
-      </description>
+      </_description>
       <default>1</default>
     </key>
 
     <key name='hue' type='d'>
-      <summary>Picture hue</summary>
-      <description>
+      <_summary>Picture hue</_summary>
+      <_description>
         Adjusts hue level of the picture coming from the camera
-      </description>
+      </_description>
       <default>0</default>
     </key>
 
     <key name='video-path' type='s'>
-      <summary>Video Path</summary>
-      <description>
+      <_summary>Video Path</_summary>
+      <_description>
         Defines the path where the videos are stored. If empty,
         "XDG_VIDEO/Webcam" will be used.
-      </description>
+      </_description>
       <default>''</default>
     </key>
 
     <key name='photo-path' type='s'>
-      <summary>Photo Path</summary>
-      <description>
+      <_summary>Photo Path</_summary>
+      <_description>
         Defines the path where the photos are stored. If empty,
         "XDG_PHOTO/Webcam" will be used.
-      </description>
+      </_description>
       <default>''</default>
     </key>
 
     <key name='wide-mode' type='b'>
-      <summary>Whether to start in wide mode</summary>
-      <description>
+      <_summary>Whether to start in wide mode</_summary>
+      <_description>
         If set to true, Cheese will start up in a wide mode with the
         image collection placed on the right-hand side. Useful with
         small screens.
-      </description>
+      </_description>
       <default>false</default>
     </key>
 
     <key name='fullscreen' type='b'>
-      <summary>Whether to start in fullscreen</summary>
-      <description>
-        If set to true, Cheese will start up in a fullscreen mode. 
-      </description>
+      <_summary>Whether to start in fullscreen</_summary>
+      <_description>
+        If set to true, Cheese will start up in a fullscreen mode.
+      </_description>
       <default>false</default>
     </key>
 
     <key name='burst-delay' type='i'>
-      <summary>Time between photos in burst mode</summary>
-      <description>
+      <_summary>Time between photos in burst mode</_summary>
+      <_description>
         The length of time, in milliseconds, to delay between taking
         each photo in a burst sequence of photos.
-      </description>
+      </_description>
       <default>1000</default>
     </key>
 
      <key name='burst-repeat' type='i'>
-      <summary>Number of photos in burst mode</summary>
-      <description>
+      <_summary>Number of photos in burst mode</_summary>
+      <_description>
         The number of photos to take in a single burst.
-      </description>
+      </_description>
       <default>4</default>
     </key>
   </schema>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index b1f534d..b2a5804 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@
 [type: gettext/glade]data/cheese-prefs.ui
 [type: gettext/glade]data/cheese-prefs.ui
 data/cheese.desktop.in.in
+data/org.gnome.Cheese.gschema.xml.in
 libcheese/cheese-avatar-chooser.c
 libcheese/cheese-camera-device.c
 libcheese/cheese-camera.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]