diff options
author | marha <marha@users.sourceforge.net> | 2009-10-18 13:41:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-10-18 13:41:37 +0000 |
commit | 814b98c7e9cde9c8e97b476e6d409bc2607d846c (patch) | |
tree | 1a191c9f7bafa0d184aefca0a5b995ad4c4e1fd9 /libX11/src/Makefile.am | |
parent | 27bc6d5e30150409259aa9030e668e801eb0b5a6 (diff) | |
parent | b567a3027bceabc0f1f42dd162268f06f15e8149 (diff) | |
download | vcxsrv-814b98c7e9cde9c8e97b476e6d409bc2607d846c.tar.gz vcxsrv-814b98c7e9cde9c8e97b476e6d409bc2607d846c.tar.bz2 vcxsrv-814b98c7e9cde9c8e97b476e6d409bc2607d846c.zip |
svn merge ^/branches/released
Diffstat (limited to 'libX11/src/Makefile.am')
-rw-r--r-- | libX11/src/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am index 26d8e277f..51e1e0660 100644 --- a/libX11/src/Makefile.am +++ b/libX11/src/Makefile.am @@ -8,7 +8,7 @@ lib_LTLIBRARIES=libX11.la BUILT_SOURCES=ks_tables.h CLEANFILES=ks_tables.h ks_tables_h -AM_CFLAGS= \ +AM_CPPFLAGS= \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/X11 \ -I$(top_builddir)/include \ @@ -16,10 +16,12 @@ AM_CFLAGS= \ -I$(top_srcdir)/src/xcms \ -I$(top_srcdir)/src/xkb \ -I$(top_srcdir)/src/xlibi18n \ + -D_BSD_SOURCE -DX11_t -DTRANS_CLIENT + +AM_CFLAGS= \ $(X11_CFLAGS) \ $(BIGFONT_CFLAGS) \ $(XDMCP_CFLAGS) \ - -D_BSD_SOURCE -DX11_t -DTRANS_CLIENT \ $(XMALLOC_ZERO_CFLAGS) # |