diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 13:45:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 13:45:56 +0000 |
| commit | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (patch) | |
| tree | 351df3c4d5648356980bc078544e25820e4d26fc /libXfont/src/Makefile.am | |
| parent | a7be905cf4423239285228d4e23caf2172adfa8b (diff) | |
| download | vcxsrv-2fb179f86b0f9ecb7876759b87f9c64634a3f114.tar.gz vcxsrv-2fb179f86b0f9ecb7876759b87f9c64634a3f114.tar.bz2 vcxsrv-2fb179f86b0f9ecb7876759b87f9c64634a3f114.zip | |
Added libXfont-1.4.0.tar.gz.
Diffstat (limited to 'libXfont/src/Makefile.am')
| -rw-r--r-- | libXfont/src/Makefile.am | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libXfont/src/Makefile.am b/libXfont/src/Makefile.am index 3e0cbfae0..094275d11 100644 --- a/libXfont/src/Makefile.am +++ b/libXfont/src/Makefile.am @@ -21,6 +21,8 @@ lib_LTLIBRARIES = libXfont.la +AM_CFLAGS = $(OS_CFLAGS) + if XFONT_FONTFILE FONTFILE_DIR = fontfile FONTFILE_LIB = fontfile/libfontfile.la @@ -46,16 +48,6 @@ FC_DIR = fc FC_LIB = fc/libfc.la endif -if XFONT_TYPE1 -TYPE1_DIR = Type1 -TYPE1_LIB = Type1/libtype1.la -endif - -if XFONT_SPEEDO -SPEEDO_DIR = Speedo -SPEEDO_LIB = Speedo/libspeedo.la -endif - UTIL_DIR = util UTIL_LIB = util/libutil.la @@ -64,13 +56,11 @@ STUBS_DIR = stubs SUBDIRS=\ $(FONTFILE_DIR) $(FREETYPE_DIR) $(BITMAP_DIR) \ - $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) \ - $(TYPE1_DIR) $(SPEEDO_DIR) + $(BUILTINS_DIR) $(FC_DIR) $(UTIL_DIR) $(STUBS_DIR) libXfont_la_LIBADD = \ $(FONTFILE_LIB) $(FREETYPE_LIB) $(BITMAP_LIB) \ $(BUILTINS_LIB) $(FC_LIB) $(UTIL_LIB) $(STUBS_LIB) \ - $(TYPE1_LIB) $(SPEEDO_LIB) \ $(FREETYPE_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) libXfont_la_SOURCES = dummy.c |