diff options
| author | Keith Packard <keithp@keithp.com> | 2005-07-09 23:15:37 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2005-07-09 23:15:37 +0000 |
| commit | 99cde389c331616f22dd6aab395c488f3a798e2e (patch) | |
| tree | f14c0b106882065b69a55acf1c31d9bb922a8a24 /src | |
| parent | 3c4ac0b9f5b7aced60a763bcaca7b32cd53a7fec (diff) | |
Rearrange configuration options so that individual font file formats drive
combined options, and so that the default matches the monolithic
defaults
Extent fontconf.h to cover all formats
Typo in src/Makefile.am failed to link in Type1 library
Missing xttcap.c from FreeType shim library.
Diffstat (limited to 'src')
| -rw-r--r-- | src/FreeType/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/FreeType/Makefile.am b/src/FreeType/Makefile.am index e199c2f..9198c43 100644 --- a/src/FreeType/Makefile.am +++ b/src/FreeType/Makefile.am @@ -10,4 +10,5 @@ libft_la_SOURCES = \ ftfuncs.h \ ftenc.c \ ftfuncs.c \ - fttools.c + fttools.c \ + xttcap.c diff --git a/src/Makefile.am b/src/Makefile.am index e7762d6..2da2c3c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,14 +69,16 @@ UTIL_LIB = util/libutil.la STUBS_LIB = stubs/libstubs.la STUBS_DIR = stubs -SUBDIRS=$(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \ +SUBDIRS=\ + $(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \ $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) $(FONTCACHE_DIR) \ $(TYPE1_DIR) $(SPEEDO_DIR) -libXfont_la_LIBADD = $(FREETYPE_LIB) $(BITMAP_LIB) $(BUILTINS_LIB) \ - $(FC_LIB) $(FONTFILE_LIB) $(UTIL_LIB) $(STUBS_LIB) \ - $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(FONTCACHE_LIB) \ - $(TYPE_1_LIB) $(SPEEDO_LIB) +libXfont_la_LIBADD = \ + $(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \ + $(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) $(FONTCACHE_LIB) \ + $(TYPE1_LIB) $(SPEEDO_LIB) \ + $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) libXfont_la_SOURCES = |