Fix autoconf warning, INCLUDES is deprecated.
Signed-off-by: Gaetan Nadon <[email protected]>
---
src/Makefile.am | 3 +--
tools/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index e332ca8..e068228 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,14 +25,13 @@
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS)
@driver_n...@_drv_la_ltlibraries = @driver_n...@_drv.la
@driver_n...@_drv_la_ldflags = -module -avoid-version
@driver_n...@_drv_ladir = @inputdir@
-INCLUDES=-I$(top_srcdir)/include/
-
@driver_n...@_drv_la_sources = xf86Wacom.c xf86Wacom.h \
wcmCommon.c wcmConfig.c wcmISDV4.c wcmISDV4.h \
wcmFilter.c wcmFilter.h xf86WacomDefs.h \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5bce44b..e27128e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -22,7 +22,7 @@ AM_CFLAGS = $(XORG_CFLAGS) $(X11_CFLAGS)
bin_PROGRAMS = \
xsetwacom
-INCLUDES=-I$(top_srcdir)/include/
+AM_CPPFLAGS = -I$(top_srcdir)/include
xsetwacom_LDFLAGS = $(X11_LIBS) -lm
--
1.6.0.4
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
