From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 1 Jun 2005 16:10:51 +0000 (+0000)
Subject: Build qlo10k1 with local ld10k1
X-Git-Tag: v1.0.10rc1~16
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=ca7cb411ffe5377f444323fe6a90744914487978;p=alsa-tools.git

Build qlo10k1 with local ld10k1

Build qlo10k1 with local ld10k1.
---

diff --git a/qlo10k1/Makefile.am b/qlo10k1/Makefile.am
index 9e35092..79b89c3 100644
--- a/qlo10k1/Makefile.am
+++ b/qlo10k1/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src
+SUBDIRS = src include
 
 EXTRA_DIST = COPYING configure.in README NEWS AUTHORS TODO INSTALL ChangeLog
 
diff --git a/qlo10k1/config.h.in b/qlo10k1/config.h.in
index 215c9bd..9c8fbb1 100644
--- a/qlo10k1/config.h.in
+++ b/qlo10k1/config.h.in
@@ -6,9 +6,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `lo10k1' library (-llo10k1). */
-#undef HAVE_LIBLO10K1
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
diff --git a/qlo10k1/configure.in b/qlo10k1/configure.in
index 36261fd..579a94f 100644
--- a/qlo10k1/configure.in
+++ b/qlo10k1/configure.in
@@ -8,7 +8,16 @@ AC_PROG_LIBTOOL
 
 AC_C_BIGENDIAN
 gw_CHECK_QT
-AM_PATH_LD10K1(0.1.8)
+
+dnl AM_PATH_LD10K1(0.1.8)
+
+dnl Build with the local ld10k1
+rm -f include/lo10k1
+ln -s ../../ld10k1/include include/lo10k1
+LD10K1_CFLAGS="-I../include"
+LD10K1_LIBS="-L../../ld10k1/src -llo10k1"
+AC_SUBST(LD10K1_CFLAGS)
+AC_SUBST(LD10K1_LIBS)
 
 AC_OUTPUT(Makefile
-	src/Makefile)
\ No newline at end of file
+	src/Makefile include/Makefile)
\ No newline at end of file
diff --git a/qlo10k1/include/Makefile.am b/qlo10k1/include/Makefile.am
new file mode 100644
index 0000000..e69de29
diff --git a/qlo10k1/src/Makefile.am b/qlo10k1/src/Makefile.am
index 9f83f2f..1ba2f5e 100644
--- a/qlo10k1/src/Makefile.am
+++ b/qlo10k1/src/Makefile.am
@@ -4,12 +4,10 @@
 # of the other Makefile.am variables
 bin_PROGRAMS = qlo10k1
 
-AM_CPPFLAGS = $(LD10K1_CFLAGS)
-AM_CXXFLAGS= $(QT_CXXFLAGS)
-AM_LDFLAGS = $(LD10K1_LDFLAGS)
+AM_CXXFLAGS= @QT_CXXFLAGS@ @LD10K1_CFLAGS@
 
 # the libraries to link against.
-qlo10k1_LDADD = $(LDADD) $(QT_LDADD)
+qlo10k1_LDADD = $(LDADD) @QT_LDADD@ @LD10K1_LIBS@
 
 EXTRA_DIST = dlgs/connectionwizardbase.ui dlgs/filecontroldialogbase.ui dlgs/filecontrolsdialogbase.ui \
 	dlgs/loadpatchdialogbase.ui dlgs/mainwndbase.ui dlgs/patchdialogbase.ui dlgs/preferencesbase.ui \