diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-16 08:20:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-16 08:20:46 +0200 |
| commit | 35d058b84797ad0b71722195146a948a277dff25 (patch) | |
| tree | a40f2007e6928cc7375cb02010bc3c42ee5a3ec3 /xkbcomp | |
| parent | fa8048de701d8dfd0c66983733deb5fcb1a108c9 (diff) | |
| parent | 26686c98bac306ee4e6502850e2dc8afbe4a496a (diff) | |
| download | vcxsrv-35d058b84797ad0b71722195146a948a277dff25.tar.gz vcxsrv-35d058b84797ad0b71722195146a948a277dff25.tar.bz2 vcxsrv-35d058b84797ad0b71722195146a948a277dff25.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glapi.h
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xquartz/X11Application.m
xorg-server/xkeyboard-config/symbols/jp
Diffstat (limited to 'xkbcomp')
| -rw-r--r-- | xkbcomp/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xkbcomp/Makefile.am b/xkbcomp/Makefile.am index 9a41b8873..d0e991df3 100644 --- a/xkbcomp/Makefile.am +++ b/xkbcomp/Makefile.am @@ -22,7 +22,8 @@ SUBDIRS = man bin_PROGRAMS = xkbcomp -AM_CFLAGS = $(XKBCOMP_CFLAGS) -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' $(CWARNFLAGS) +AM_CPPFLAGS = -DDFLT_XKB_CONFIG_ROOT='"$(XKBCONFIGROOT)"' +AM_CFLAGS = $(XKBCOMP_CFLAGS) $(CWARNFLAGS) xkbcomp_LDADD = $(XKBCOMP_LIBS) xkbcomp_SOURCES = \ @@ -59,10 +60,7 @@ xkbcomp_SOURCES = \ xkbpath.h \ xkbscan.c - -BUILT_SOURCES = xkbparse.c MAINTAINERCLEANFILES = ChangeLog INSTALL -MAINTAINERCLEANFILES += $(BUILT_SOURCES) .PHONY: ChangeLog INSTALL |