diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-01 08:10:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-01 08:10:02 +0200 |
| commit | 11b60c4ebaf348b01051bfff19f947b073028a99 (patch) | |
| tree | 4f4a25423fa7a6cf28e2575eeec77e5f8a4a34bb /libX11/src | |
| parent | 4366c8fe34719e14906c420d7596e818aadf6ce0 (diff) | |
| parent | a5391fdea94a7b827069c6f926f83a235076ccb4 (diff) | |
| download | vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.tar.gz vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.tar.bz2 vcxsrv-11b60c4ebaf348b01051bfff19f947b073028a99.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xkeyboard-config mesa git update 1 Oct 2013
Diffstat (limited to 'libX11/src')
| -rw-r--r-- | libX11/src/util/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libX11/src/util/Makefile.am b/libX11/src/util/Makefile.am index dfe91f1ae..79962d47e 100644 --- a/libX11/src/util/Makefile.am +++ b/libX11/src/util/Makefile.am @@ -1,11 +1,11 @@ noinst_PROGRAMS=makekeys -makekeys_CFLAGS = \ +AM_CFLAGS = \ $(X11_CFLAGS) \ $(CWARNFLAGS) -makekeys_CPPFLAGS = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include CC = @CC_FOR_BUILD@ |