Created attachment 30408 [details] [review]
Fixes Makefile.am

Hi,

compiling xtrap fails with


make[1]: Entering directory `/root/xorg/app/xtrap'
  CC     chparse.o
  CC     xtrapchar.o
  CC     XEKeybCtrl.o
  CC     xtrapproto.o
xtrapproto.c: In function 'main':
xtrapproto.c:75: warning: cast from pointer to integer of different size
  CC     xtrapin-xtrapin.o
xtrapin.c:93:37: error: X11/extensions/xtraplib.h: No such file or directory
xtrapin.c:94:38: error: X11/extensions/xtraplibp.h: No such file or directory
xtrapin.c:105: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'grabFlag'
xtrapin.c:108: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'optionTable'
xtrapin.c:116: error: expected specifier-qualifier-list before 'Time'

[... Tons of follow-up errors ...]

xtrapin.c: At top level:
xtrapin.c:234: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'found_input_rec'
  CC     xtrapin-XEKeybCtrl.o
make[1]: *** [xtrapin-xtrapin.o] Error 1
make[1]: *** Waiting for unfinished jobs....
XEKeybCtrl.c:107:37: error: X11/extensions/xtraplib.h: No such file or directory
XEKeybCtrl.c:108:38: error: X11/extensions/xtraplibp.h: No such file or directory
make[1]: *** [xtrapin-XEKeybCtrl.o] Error 1
make[1]: Leaving directory `/root/xorg/app/xtrap'
make: *** [all] Error 2


This is caused by the way that Makefile.am uses the variables AM_CFLAGS and trapin_CFLAGS: Those variables are mutual exclusive, which Makefile.am doesn't respect. See [1] for details.

Best regards, Thomas

[1] http://www.gnu.org/software/automake/manual/html_node/Flag-Variables-Ordering.html