ooo-build r11927 - in trunk: . patches/ooxml patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Mon Mar 17 17:19:35 2008
New Revision: 11927
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11927&view=rev

Log:
2008-03-17  Petr Mladek  <pmladek suse cz>

	* patches/ooxml/oox-token-deps.diff, patches/src680/apply: fix
	  dependencies; call gperf when tokens.gperf is ready



Added:
   trunk/patches/ooxml/oox-token-deps.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Added: trunk/patches/ooxml/oox-token-deps.diff
==============================================================================
--- (empty file)
+++ trunk/patches/ooxml/oox-token-deps.diff	Mon Mar 17 17:19:35 2008
@@ -0,0 +1,16 @@
+--- oox/source/token/makefile.mk.old	2008-02-29 09:16:57.000000000 +0100
++++ oox/source/token/makefile.mk	2008-03-17 18:05:51.000000000 +0100
+@@ -54,10 +54,11 @@ SLOFILES =	\
+ 
+ .INCLUDE :  target.mk
+ 
+-$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl
++$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf $(MISC)$/tokens.gperf.stamp : tokens.txt gentoken.pl
+ 		$(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf
++		touch $(MISC)$/tokens.gperf.stamp
+ 
+-$(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf
++$(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf.stamp
+ 		gperf --compare-strncmp $(MISC)$/tokens.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" >$(INCCOM)$/tokens.inc
+ 
+ $(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Mar 17 17:19:35 2008
@@ -1535,6 +1535,7 @@
 
 gperf-3-is-needed.diff
 
+oox-token-deps.diff
 
 [ CalcFixes ]