From 4005df66072ceac175ea71427deb16176262f197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sat, 14 May 2011 03:00:02 +0200 Subject: build: sort building of tools, ensure that cross-pkg-config works. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ò Signed-off-by: Christoph Brill --- tools/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') 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) -- cgit v1.2.3