diff options
author | marha <marha@users.sourceforge.net> | 2009-10-11 19:27:48 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-11 19:27:48 +0000 |
commit | d36223b06a859c5979253d0176adfaeadc10cb32 (patch) | |
tree | de85a6072aae048506ebab0dba2e7c4588132412 /libXfont/src/fontfile/Makefile.am | |
parent | 6b4cfac5a67f87884a525ce2c99f30e0060b3ca7 (diff) | |
parent | e4bc1b2bff00254f5782928d5b7b15b4db2e774c (diff) | |
download | vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.gz vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.tar.bz2 vcxsrv-d36223b06a859c5979253d0176adfaeadc10cb32.zip |
svn merge ^/branches/released .
Diffstat (limited to 'libXfont/src/fontfile/Makefile.am')
-rw-r--r-- | libXfont/src/fontfile/Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libXfont/src/fontfile/Makefile.am b/libXfont/src/fontfile/Makefile.am index 05aded262..aa64ca51a 100644 --- a/libXfont/src/fontfile/Makefile.am +++ b/libXfont/src/fontfile/Makefile.am @@ -1,9 +1,4 @@ -FONTENCDIR=@ENCODINGSDIR@ -FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\" - -INCLUDES = \ - -I${top_srcdir}/include \ - $(FONTENCDEFS) +INCLUDES = -I${top_srcdir}/include AM_CFLAGS = $(XFONT_CFLAGS) $(OS_CFLAGS) $(CWARNFLAGS) |