Bug #4 The last entry for the terminator should not be 0xfffa, but 0xfffb.

[fontconfig.git] / src / Imakefile

diff --git a/src/Imakefile b/src/Imakefile
index 1ba4cb562b7ca82b0128ff7cc5913cd1eb5aecb3..ba6663f913e7ee5821a6bab71ed4a942d5d06a84 100644 (file)
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -1,42 +1,13 @@
-#include "../../libxml2/config.h"
-#if HAVE_ZLIB_H
-ZLIB=-lz
-#endif
-
-#if 0
-#define SharedLibFontconfig YES
-#endif
-
-#ifndef SharedLibFontconfig
-#define SharedLibFontconfig NO
-#endif
-
-#ifndef NormalLibFontconfig
-#define NormalLibFontconfig (!SharedLibFontConfig | ForceNormalLib)
-#endif
-
-#ifndef DebugLibFontconfig
-#define DebugLibFontconfig             NO
-#endif
-
-#ifndef ProfileLibFontconfig
-#define ProfileLibFontconfig           NO
+#ifdef UseInstalled
+/* building outside the tree, use private defines */
+#include "../local.def"
 #endif
 
 #define LibHeaders NO
 
 FONTCONFIGSRC=.
 
-FALLBACK_FONTS=$(FONTDIR)/Type1
-
-#if SharedLibFontconfig
-#ifndef SharedFontconfigRev
-#define SharedFontconfigRev 1.0
-#endif
-SharedLibReferences(FONTCONFIG,Fontconfig,$(FONTCONFIGSRC),SOXLIBREV,SharedFontconfigRev)
-#else
-ProjectUnsharedLibReferences(FONTCONFIG,Fontconfig,$(FONTCONFIGSRC),BuildLibDir)
-#endif
+FC_DEFAULT_FONTS=$(FONTDIR)/Type1
 
 #define DoNormalLib NormalLibFontconfig
 #define DoSharedLib SharedLibFontconfig
@@ -50,33 +21,20 @@ SOFONTCONFIGREV=1.0
 
 #include <Threads.tmpl>
 
-#if SharedLibFontconfig
-INCLUDES=-I/usr/local/include/freetype2 -I/usr/include/libxml2 -I..
-FREETYPE2REQLIB = -L/usr/local/lib -lfreetype
-XML2REQLIB=-lxml2
-#else
-INCLUDES=-I../../freetype2 -I../../libxml2/include -I..
-FREETYPE2REQLIB = ../../freetype2/libfreetype.a
-XML2REQLIB=../../libxml2/.libs/libxml2.a $(ZLIB) -lm
-#endif
-DEFINES=-DFC_FALLBACK_FONTS='"$(FALLBACK_FONTS)"'
-
-REQUIREDLIBS=$(LDPRELIBS) $(FREETYPE2REQLIB) $(XML2REQLIB)
+INCLUDES=$(FREETYPE2INCLUDES) -I..
 
-SRCS=fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c fcdefault.c fcdir.c \
-     fcfreetype.c fcfs.c fcinit.c fclist.c fcmatch.c fcmatrix.c fcname.c \
-     fcpat.c fcstr.c fcxml.c
+DEFINES=-DFC_DEFAULT_FONTS='"$(FC_DEFAULT_FONTS)"' -DHAVE_EXPAT
 
-OBJS=fcblanks.o fccache.o fccfg.o fccharset.o fcdbg.o fcdefault.o fcdir.o \
-     fcfreetype.o fcfs.o fcinit.o fclist.o fcmatch.o fcmatrix.o fcname.o \
-     fcpat.o fcstr.o fcxml.o
+EXPATLIB=-lexpat
+REQUIREDLIBS=$(LDPRELIBS) $(FREETYPE2LIB) $(EXPATLIB)
 
-#define LibInstallBuild YES
-#undef LinkBuildLibrary
-#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR))                  @@\
-       RemoveFile($(BUILDLIBDIR)/lib)                                  @@\
-       cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib .
+SRCS=fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
+     fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c fclist.c \
+     fcmatch.c fcmatrix.c fcname.c fcpat.c fcstr.c fcxml.c
 
+OBJS=fcatomic.o fcblanks.o fccache.o fccfg.o fccharset.o fcdbg.o \
+     fcdefault.o fcdir.o fcfreetype.o fcfs.o fcinit.o fclang.o fclist.o \
+     fcmatch.o fcmatrix.o fcname.o fcpat.o fcstr.o fcxml.o
 
 #include <Library.tmpl>