ooo-build r12385 - in branches/ooo-build-2-4: . patches/ooxml

[pmladek svn gnome org]

Author: pmladek
Date: Tue Apr 29 17:06:09 2008
New Revision: 12385
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12385&view=rev

Log:
2008-04-29  Petr Mladek  <pmlade suse cz>

	* patches/ooxml/oox-token-deps.diff: another dependecy fix in
	  oox/source/token/makefile.mk; heh, gentoken.pl was started
	  three times because it provided all three files needed
	  for $(SLO)$/tokenmap.obj



Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/patches/ooxml/oox-token-deps.diff

Modified: branches/ooo-build-2-4/patches/ooxml/oox-token-deps.diff
==============================================================================
--- branches/ooo-build-2-4/patches/ooxml/oox-token-deps.diff	(original)
+++ branches/ooo-build-2-4/patches/ooxml/oox-token-deps.diff	Tue Apr 29 17:06:09 2008
@@ -1,16 +1,18 @@
---- 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 =	\
+--- oox/source/token/makefile.mk.old	2008-04-25 11:36:15.000000000 +0200
++++ oox/source/token/makefile.mk	2008-04-25 11:30:33.000000000 +0200
+@@ -54,12 +54,9 @@ 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
++$(MISC)$/gentoken.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
++		touch $(MISC)$/gentoken.stamp
  
- $(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
+-$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx
+-
+-$(INCCOM)$/tokens.gperf : $(INCCOM)$/tokens.hxx
++$(SLO)$/tokenmap.obj : $(MISC)$/gentoken.stamp