diff options
author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /libXfont/Makefile.in | |
parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libXfont/Makefile.in')
-rw-r--r-- | libXfont/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libXfont/Makefile.in b/libXfont/Makefile.in index 60cdba3bd..806da6184 100644 --- a/libXfont/Makefile.in +++ b/libXfont/Makefile.in @@ -15,9 +15,9 @@ @SET_MAKE@ -# +# # Copyright © 2003 Keith Packard, Noah Levitt -# +# # Permission to use, copy, modify, distribute, and sell this software and its # documentation for any purpose is hereby granted without fee, provided that # the above copyright notice appear in all copies and that both that @@ -27,7 +27,7 @@ # specific, written prior permission. Keith Packard makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -171,6 +171,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BASE_CFLAGS = @BASE_CFLAGS@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ |