diff options
| author | Diego Elio Pettenò <flameeyes@gmail.com> | 2011-05-14 03:00:02 +0200 |
|---|---|---|
| committer | Christoph Brill <egore911@egore911.de> | 2011-05-15 21:44:12 +0200 |
| commit | 4005df66072ceac175ea71427deb16176262f197 (patch) | |
| tree | 41f5058988c6dc87b7f8870d2d49b7f11deb9c61 | |
| parent | 4d4c4d0ff5a381a5d574845cf72673f9fee43734 (diff) | |
build: sort building of tools, ensure that cross-pkg-config works.
Without this change, cross-pkg-config could bring up the wrong paths to
$includedir/xorg, but also fixes linkage to not use LDFLAGS where LDADD
should have been used.
Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
Signed-off-by: Christoph Brill <egore911@egore911.de>
| -rw-r--r-- | tools/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 2ad48f6..389ceb7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,13 +20,13 @@ bin_PROGRAMS = synclient syndaemon -AM_CPPFLAGS = -I$(top_srcdir)/include -I$(sdkdir) -AM_CFLAGS = $(XI_CFLAGS) -AM_LDFLAGS = $(XI_LIBS) +AM_CPPFLAGS = -I$(top_srcdir)/include $(XORG_CFLAGS) synclient_SOURCES = synclient.c +synclient_CFLAGS = $(XI_CFLAGS) +synclient_LDADD = $(XI_LIBS) syndaemon_SOURCES = syndaemon.c -syndaemon_CFLAGS = $(AM_CFLAGS) $(XTST_CFLAGS) -syndaemon_LDFLAGS = $(AM_LDFLAGS) $(XTST_LIBS) +syndaemon_CFLAGS = $(XI_CFLAGS) $(XTST_CFLAGS) +syndaemon_LDADD = $(XI_LIBS) $(XTST_LIBS) |