diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-18 13:33:38 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-04-18 13:33:38 +0000 |
commit | 0a7b5c041c8c25e4b16a5ce212b5125002e520d3 (patch) | |
tree | 3ea7113265c9ad5dcba23d43b09c8f82b3b579db /oox/source | |
parent | 2d2f36aa8e5c7e46da2a9902ed1fb82733dfe810 (diff) |
INTEGRATION: CWS xmlfilter04 (1.3.4); FILE MERGED
2008/03/19 16:26:27 hbrinkm 1.3.4.2: RESYNC: (1.3-1.5); FILE MERGED
2008/02/21 12:42:06 hbrinkm 1.3.4.1: joined changes from xmlfilter03
Diffstat (limited to 'oox/source')
-rw-r--r-- | oox/source/token/makefile.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/oox/source/token/makefile.mk b/oox/source/token/makefile.mk index 244fb261f893..b1f63f0abc60 100644 --- a/oox/source/token/makefile.mk +++ b/oox/source/token/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # This file is part of OpenOffice.org. # @@ -50,14 +50,11 @@ SLOFILES = \ .INCLUDE : target.mk -$(MISC)$/tokens.gperf $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx : - @@noop $(assign do_phony:=.PHONY) +$(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf : tokens.txt gentoken.pl + $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf -$(MISC)$/do_tokens $(do_phony) : tokens.txt gentoken.pl $(MISC)$/tokens.gperf $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx - $(PERL) gentoken.pl tokens.txt $(INCCOM)$/tokens.hxx $(INCCOM)$/tokenwords.inc $(MISC)$/tokens.gperf && $(TOUCH) $@ - -$(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf $(MISC)$/do_tokens +$(INCCOM)$/tokens.inc : $(MISC)$/tokens.gperf 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 $(MISC)$/do_tokens +$(SLO)$/tokenmap.obj : $(INCCOM)$/tokens.inc $(INCCOM)$/tokenwords.inc $(INCCOM)$/tokens.hxx |