[Libreoffice-commits] .: vcl/unx

René Engelhard rene at kemper.freedesktop.org
Tue Dec 14 14:00:55 PST 2010


 vcl/unx/source/fontmanager/makefile.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 40d6fee02e8e176a3bd9b3c0e91e2c6af5c5bef8
Author: Rene Engelhard <rene at debian.org>
Date:   Tue Dec 14 22:48:34 2010 +0100

    generate afm_hash.cpp in $(INCCOM)

diff --git a/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk
index ff3a8dc..df24546 100644
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ b/vcl/unx/source/fontmanager/makefile.mk
@@ -44,7 +44,7 @@ CDEFS += -DENABLE_FONTCONFIG
 
 CFLAGS+= $(FREETYPE_CFLAGS)
 CFLAGS+= $(FONTCONFIG_CFLAGS)
-CFLAGS+=-I$(SOLARVER)$/$(INPATH)$/inc
+CFLAGS+=-I$(INCCOM)
 
 # --- Files --------------------------------------------------------
 
@@ -72,7 +72,7 @@ NOOPTFILES=$(SLO)$/fontmanager.obj
 
 .INCLUDE :  target.mk
 
-$(SLO)$/parseAFM.obj: $(SOLARVER)$/$(INPATH)$/inc$/afm_hash.cpp
+$(SLO)$/parseAFM.obj: $(INCCOM)$/afm_hash.cpp
 
-$(SOLARVER)$/$(INPATH)$/inc$/afm_hash.cpp: afm_keyword_list
+$(INCCOM)$/afm_hash.cpp: afm_keyword_list
     $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' afm_keyword_list | $(SED) -e "s/(char\*)0/(char\*)0, NOPE/g" | $(GREP) -v "^#line" > $@


More information about the Libreoffice-commits mailing list