diff --git a/qlo10k1/configure.in b/qlo10k1/configure.in
index 1e91a56..36261fd 100644
--- 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 64e3500..9f83f2f 100644
--- 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)