Fix handling of $CFLAGS and $LIBS

Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
QT_CXXFLAGS to the makefile.

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>

diff --git a/qlo10k1/configure.in b/qlo10k1/configure.in
index 1e91a562e4fdfafeaf3de770031135714c091e87..36261fd4f40a5c6c07ee444a8ad1200b06aefa77 100644 (file)
--- a/qlo10k1/configure.in
+++ b/qlo10k1/configure.in
@@ -8,7 +8,6 @@ AC_PROG_LIBTOOL
 
 AC_C_BIGENDIAN
 gw_CHECK_QT
-CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS -Wall"
 AM_PATH_LD10K1(0.1.8)
 
 AC_OUTPUT(Makefile

diff --git a/qlo10k1/src/Makefile.am b/qlo10k1/src/Makefile.am
index 64e35000f6196cd5e5310c01cb1ec8a74b64fb8b..9f83f2fd43da4d91e4de24c0082617492b52bdcd 100644 (file)
--- a/qlo10k1/src/Makefile.am
+++ b/qlo10k1/src/Makefile.am
@@ -4,6 +4,10 @@
 # of the other Makefile.am variables
 bin_PROGRAMS = qlo10k1
 
+AM_CPPFLAGS = $(LD10K1_CFLAGS)
+AM_CXXFLAGS= $(QT_CXXFLAGS)
+AM_LDFLAGS = $(LD10K1_LDFLAGS)
+
 # the libraries to link against.
 qlo10k1_LDADD = $(LDADD) $(QT_LDADD)