diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 14:29:10 +0000 |
| commit | ddfb922180a6a847d52609592a2bdb37179ca439 (patch) | |
| tree | 7cc662bfb9ffb45c4c4452ea373e3c1a843b395a /libXfont/src/makefile | |
| parent | 02934f83dd4f5848083e2e5cdbc6ef7f60361f06 (diff) | |
| parent | 2fb179f86b0f9ecb7876759b87f9c64634a3f114 (diff) | |
| download | vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.gz vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.tar.bz2 vcxsrv-ddfb922180a6a847d52609592a2bdb37179ca439.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Gives currently link errors. xorg-server needs to be upgraded to.
Diffstat (limited to 'libXfont/src/makefile')
| -rw-r--r-- | libXfont/src/makefile | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libXfont/src/makefile b/libXfont/src/makefile index 3e0cbfae0..3bc7fb3e7 100644 --- a/libXfont/src/makefile +++ b/libXfont/src/makefile @@ -46,16 +46,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 +54,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 |