diff options
| -rw-r--r-- | fc-cache/Imakefile | 12 | ||||
| -rw-r--r-- | fc-list/Imakefile | 13 | ||||
| -rw-r--r-- | src/Imakefile | 55 |
3 files changed, 12 insertions, 68 deletions
diff --git a/fc-cache/Imakefile b/fc-cache/Imakefile index 12216e7..1950b3c 100644 --- a/fc-cache/Imakefile +++ b/fc-cache/Imakefile @@ -1,13 +1,7 @@ -#include "../../libxml2/config.h" -#if HAVE_ZLIB_H -ZLIB=-lz -#endif +INCLUDES=$(FREETYPE2INCLUDES) $(LIBXML2INCLUDES) -I.. -INCLUDES=-I../../freetype2 -I/usr/include/libxml2 -I.. -FREETYPE2REQLIB = ../../freetype2/libfreetype.a -XML2REQLIB=../../libxml2/.libs/libxml2.a $(ZLIB) -lm - -LOCAL_LIBRARIES=-L../src -lfontconfig $(FREETYPE2REQLIB) $(XML2REQLIB) +LOCAL_LIBRARIES=FontconfigClientLibs + DEPLIBS=FontconfigDepLibs SRCS=fc-cache.c OBJS=fc-cache.o diff --git a/fc-list/Imakefile b/fc-list/Imakefile index a773b45..cff22bb 100644 --- a/fc-list/Imakefile +++ b/fc-list/Imakefile @@ -1,14 +1,7 @@ -#include "../../libxml2/config.h" -#if HAVE_ZLIB_H -ZLIB=-lz -#endif +INCLUDES=$(FREETYPE2INCLUDES) $(LIBXML2INCLUDES) -I.. -INCLUDES=-I../../freetype2 -I/usr/include/libxml2 -I.. -FREETYPE2REQLIB = ../../freetype2/libfreetype.a -XML2REQLIB=../../libxml2/.libs/libxml2.a $(ZLIB) -lm - -LOCAL_LIBRARIES=-L../src -lfontconfig $(FREETYPE2REQLIB) $(XML2REQLIB) -DEPLIBS=../src/libfontconfig.a +LOCAL_LIBRARIES=FontconfigClientLibs + DEPLIBS=FontconfigDepLibs SRCS=fc-list.c OBJS=fc-list.o diff --git a/src/Imakefile b/src/Imakefile index 1ba4cb5..baf27eb 100644 --- a/src/Imakefile +++ b/src/Imakefile @@ -1,26 +1,6 @@ -#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 @@ -29,15 +9,6 @@ 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 - #define DoNormalLib NormalLibFontconfig #define DoSharedLib SharedLibFontconfig #define DoExtraLib SharedLibFontconfig @@ -50,18 +21,11 @@ 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 +INCLUDES=$(FREETYPE2INCLUDES) $(LIBXML2INCLUDES) -I.. + DEFINES=-DFC_FALLBACK_FONTS='"$(FALLBACK_FONTS)"' -REQUIREDLIBS=$(LDPRELIBS) $(FREETYPE2REQLIB) $(XML2REQLIB) +REQUIREDLIBS=$(LDPRELIBS) $(FREETYPE2LIB) $(LIBXML2LIB) 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 \ @@ -71,13 +35,6 @@ 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 -#define LibInstallBuild YES -#undef LinkBuildLibrary -#define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR)) @@\ - RemoveFile($(BUILDLIBDIR)/lib) @@\ - cd $(BUILDLIBDIR) && $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/lib . - - #include <Library.tmpl> #if DoSharedLib && SharedDataSeparation |