ooo-build r12388 - in trunk: . patches patches/ooxml patches/unittesting

[pmladek svn gnome org]

Author: pmladek
Date: Tue Apr 29 18:27:39 2008
New Revision: 12388
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12388&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



Added:
   trunk/patches/unittesting/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/patches/Makefile.am
   trunk/patches/ooxml/oox-token-deps.diff
   trunk/patches/unittesting/   (props changed)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr 29 18:27:39 2008
@@ -1250,6 +1250,7 @@
 patches/mono/Makefile
 patches/ooxml/Makefile
 patches/postgresql/Makefile
+patches/unittesting/Makefile
 patches/64bit/Makefile
 po/Makefile
 doc/Makefile

Modified: trunk/patches/Makefile.am
==============================================================================
--- trunk/patches/Makefile.am	(original)
+++ trunk/patches/Makefile.am	Tue Apr 29 18:27:39 2008
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo dev300 emf+ evo2 gstreamer hotfixes mono ooxml vba postgresql
+SUBDIRS=64bit cairo dev300 emf+ evo2 gstreamer hotfixes mono ooxml vba postgresql unittesting
 
 EXTRA_DIST=README apply.pl.in $(wildcard *.diff)

Modified: trunk/patches/ooxml/oox-token-deps.diff
==============================================================================
--- trunk/patches/ooxml/oox-token-deps.diff	(original)
+++ trunk/patches/ooxml/oox-token-deps.diff	Tue Apr 29 18:27:39 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

Added: trunk/patches/unittesting/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/patches/unittesting/Makefile.am	Tue Apr 29 18:27:39 2008
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.diff)