[maemo-commits] [maemo-commits] r8509 - in projects/haf/trunk/hildon-theme-default: . data template

[From: www-data at stage.maemo.org]

Author: mdk
Date: 2006-11-30 17:21:03 +0200 (Thu, 30 Nov 2006)
New Revision: 8509

Added:
   projects/haf/trunk/hildon-theme-default/data/
   projects/haf/trunk/hildon-theme-default/data/Makefile.am
Modified:
   projects/haf/trunk/hildon-theme-default/ChangeLog
   projects/haf/trunk/hildon-theme-default/Makefile.am
   projects/haf/trunk/hildon-theme-default/configure.ac
   projects/haf/trunk/hildon-theme-default/template/Makefile.am
Log:
Do substitutions locally.
Build images locally.


Modified: projects/haf/trunk/hildon-theme-default/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-default/ChangeLog	2006-11-30 15:18:36 UTC (rev 8508)
+++ projects/haf/trunk/hildon-theme-default/ChangeLog	2006-11-30 15:21:03 UTC (rev 8509)
@@ -1,3 +1,12 @@
+2006-11-30  Michael Dominic K.  <mdk at mdk.am> 
+
+	* Makefile.am:
+	* configure.ac:
+	* data: 
+	* data/Makefile.am: Do substitutions locally.
+
+	* template/Makefile.am: Build images locally.
+
 2006-11-27  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* template/template.png: Updating to the latest template image.

Modified: projects/haf/trunk/hildon-theme-default/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-theme-default/Makefile.am	2006-11-30 15:18:36 UTC (rev 8508)
+++ projects/haf/trunk/hildon-theme-default/Makefile.am	2006-11-30 15:21:03 UTC (rev 8509)
@@ -1,4 +1,4 @@
-SUBDIRS 		= template
+SUBDIRS 		= template data
 
 MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure 	\
 			  config.h.in compile 			\
@@ -10,12 +10,4 @@
 			  install-stamp configure-stamp		\
 			  config.status 
 
-install:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/$(THEME_DIR)/
-	hildon-theme-install-3					\
-            --name $(THEME_NAME)				\
-            --template $(srcdir)/template/template.png		\
-            --theme $(THEME_FULL_DIR)/				\
-            --destdir $(DESTDIR)
 
-

Modified: projects/haf/trunk/hildon-theme-default/configure.ac
===================================================================
--- projects/haf/trunk/hildon-theme-default/configure.ac	2006-11-30 15:18:36 UTC (rev 8508)
+++ projects/haf/trunk/hildon-theme-default/configure.ac	2006-11-30 15:21:03 UTC (rev 8509)
@@ -16,19 +16,23 @@
 dnl a layout this theme is based on
 LAYOUT_NAME="hildon-theme-layout-3"
 
+dnl check the layout installation
+PKG_CHECK_MODULES(HILDON_LAYOUT, "$LAYOUT_NAME")
+
 AC_SUBST(THEME_DIR)
 AC_SUBST(THEME_NAME)
-AS_AC_EXPAND(LAYOUT_DIR, "${datadir}/$LAYOUT_NAME")
+AS_AC_EXPAND(LAYOUT_DIR, `$PKG_CONFIG --variable=pkgdatadir $LAYOUT_NAME`)
 AS_AC_EXPAND(THEME_FULL_DIR, "${datadir}/themes/$THEME_DIR")
+AS_AC_EXPAND(MATCHBOX_FULL_DIR, "${datadir}/themes/$THEME_DIR/matchbox")
+AS_AC_EXPAND(IMAGES_FULL_DIR, "${datadir}/themes/$THEME_DIR/images")
+AS_AC_EXPAND(GTK_FULL_DIR, "${datadir}/themes/$THEME_DIR/gtk-2.0")
 
-dnl check the layout installation
-PKG_CHECK_MODULES(HILDON_LAYOUT, "$LAYOUT_NAME")
-
 dnl check the tools installation
 PKG_CHECK_MODULES(TOOLS, hildon-theme-tools >= 0.1.0)
 
-AC_OUTPUT([Makefile \
-           template/Makefile])
+AC_OUTPUT([Makefile             \
+           template/Makefile    \
+           data/Makefile])
 
 dnl some nicey output
 AC_MSG_RESULT([
@@ -37,7 +41,9 @@
         Theme name    : $THEME_NAME
         Theme dir     : $THEME_DIR 
         Theme full dir: $THEME_FULL_DIR
+        Matchbox dir  : $MATCHBOX_FULL_DIR
+        Gtk full dir  : $GTK_FULL_DIR
+
         Layout name   : $LAYOUT_NAME
         Layout dir    : $LAYOUT_DIR
-
 ])

Added: projects/haf/trunk/hildon-theme-default/data/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-theme-default/data/Makefile.am	2006-11-30 15:18:36 UTC (rev 8508)
+++ projects/haf/trunk/hildon-theme-default/data/Makefile.am	2006-11-30 15:21:03 UTC (rev 8509)
@@ -0,0 +1,36 @@
+themedir 				= @THEME_FULL_DIR@
+
+gtkthemedir				= @GTK_FULL_DIR@
+
+matchboxthemedir			= @MATCHBOX_FULL_DIR@
+
+gtktheme_DATA				= gtkrc				\
+					  gtkrc.maemo_af_desktop        
+
+matchboxtheme_DATA			= theme.xml
+
+theme_DATA 				= index.theme
+
+gtkrc: 
+	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/gtkrc gtkrc
+
+gtkrc.maemo_af_desktop: 
+	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/gtkrc.maemo_af_desktop gtkrc.maemo_af_desktop
+
+theme.xml: 
+	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/theme.xml theme.xml
+
+index.theme: 
+	hildon-theme-subst $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png $(LAYOUT_DIR)/index.theme index.theme
+	sed -i -e 's:_THEME_DIR_:@THEME_DIR@:' index.theme
+	sed -i -e 's:_THEME_FULL_DIR_:@THEME_FULL_DIR@:' index.theme
+	sed -i -e 's:_THEME_NAME_:@THEME_NAME@:' index.theme
+
+MAINTAINERCLEANFILES			= Makefile.in
+
+CLEANFILES				= gtkrc				\
+					  gtkrc.maemo_af_desktop	\
+					  theme.xml			\
+					  index.theme			
+
+

Modified: projects/haf/trunk/hildon-theme-default/template/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-theme-default/template/Makefile.am	2006-11-30 15:18:36 UTC (rev 8508)
+++ projects/haf/trunk/hildon-theme-default/template/Makefile.am	2006-11-30 15:21:03 UTC (rev 8509)
@@ -1,3 +1,23 @@
 MAINTAINERCLEANFILES 		= Makefile.in
 
-EXTRA_DIST 			= template.png
+CLEANFILES			= slice.stamp
+
+EXTRA_DIST 			= template.png slice.stamp
+
+all: slice.stamp
+
+clean-local:
+	find -iname '*.png' -a ! -iname template.png -exec rm -f '{}' \;
+	find -iname '*.jpg' -exec rm -f '{}' \;
+	find -iname '*.jpeg' -exec rm -f '{}' \;
+
+slice.stamp:
+	hildon-theme-slicer $(LAYOUT_DIR)/layout.txt $(srcdir)/../template/template.png
+	touch slice.stamp
+
+install: all
+	$(mkinstalldirs) $(DESTDIR)/$(IMAGES_FULL_DIR)
+	find -iname '*.png' -a ! -iname template.png -exec install -c -m 644 '{}' $(DESTDIR)/$(IMAGES_FULL_DIR)/ \;
+	find -iname '*.jpg' -a ! -iname template.png -exec install -c -m 644 '{}' $(DESTDIR)/$(IMAGES_FULL_DIR)/ \;
+	find -iname '*.jpeg' -a ! -iname template.png -exec install -c -m 644 '{}' $(DESTDIR)/$(IMAGES_FULL_DIR)/ \;
+