* [PATCH] alsa-tools
@ 2005-05-16 14:41 Mikael Magnusson
2005-05-17 8:56 ` Takashi Iwai
0 siblings, 1 reply; 7+ messages in thread
From: Mikael Magnusson @ 2005-05-16 14:41 UTC (permalink / raw)
To: alsa-devel
[-- Attachment #1: Type: text/plain, Size: 654 bytes --]
ld10k1_configure.patch
ld10k1_makefile.patch
Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
if CFLAGS is undefined.
qlo10k1_configure.patch
qlo10k1_makefile.patch
Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
QT_CXXFLAGS to the makefile.
qlo10k1_acinclude.patch
Fixes pattern in gw_CHECK_QT not to match files that the linker won't
use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
libraries are installed, but only the libqt-mt development library.
Signed-Off-By: Mikael Magnusson <mikma@users.sourceforge.net>
[-- Attachment #2: ld10k1_configure.patch --]
[-- Type: text/x-patch, Size: 499 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/ld10k1/configure.in alsa-tools-1.0.9rc3/ld10k1/configure.in
--- orig/alsa-tools-1.0.9rc3/ld10k1/configure.in 2005-04-11 15:15:52.000000000 +0200
+++ alsa-tools-1.0.9rc3/ld10k1/configure.in 2005-05-14 23:18:10.000000000 +0200
@@ -9,8 +9,7 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AM_PATH_ALSA(1.0.8, [], [])
-CFLAGS="$CFLAGS $ALSA_CFLAGS -Wall"
-LIBS="$LIBS $ALSA_LIBS"
+CFLAGS="${CFLAGS--Wall}"
effectsdir='$(pkgdatadir)/effects'
AC_SUBST(effectsdir)
[-- Attachment #3: ld10k1_makefile.patch --]
[-- Type: text/x-patch, Size: 663 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am
--- orig/alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am 2005-03-18 14:41:02.000000000 +0100
+++ alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am 2005-05-15 00:37:00.000000000 +0200
@@ -13,6 +13,8 @@
lib_LTLIBRARIES = liblo10k1.la
liblo10k1_la_SOURCES = comm.c liblo10k1.c liblo10k1ef.c liblo10k1lf.c
#liblo10k1_la_HEADERS = comm.h liblo10k1.h liblo10k1ef.h ld10k1_error.h ld10k1_fnc.h liblo10k1lf.h
+liblo10k1_la_CFLAGS = $(ALSA_CFLAGS)
+liblo10k1_la_LIBADD = $(ALSA_LIBS)
lo10k1_SOURCES = lo10k1.c
lo10k1_CFLAGS = $(ALSA_CFLAGS) -DEFFECTSDIR='"$(effectsdir)"'
[-- Attachment #4: qlo10k1_acinclude.patch --]
[-- Type: text/x-patch, Size: 1207 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4
--- orig/alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 2005-05-14 17:12:04.000000000 +0200
@@ -99,17 +99,17 @@
fi
fi
- if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+ if test "x`ls $QTDIR/lib/libqt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqt"
QT_IS_MT="no"
- elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqt-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqt-mt"
QT_IS_MT="yes"
- elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqte.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte"
QT_IS_MT="no"
QT_IS_EMBEDDED="yes"
- elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqte-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
[-- Attachment #5: qlo10k1_configure.patch --]
[-- Type: text/x-patch, Size: 435 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/configure.in alsa-tools-1.0.9rc3/qlo10k1/configure.in
--- orig/alsa-tools-1.0.9rc3/qlo10k1/configure.in 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/configure.in 2005-05-14 17:13:38.000000000 +0200
@@ -8,7 +8,7 @@
AC_C_BIGENDIAN
gw_CHECK_QT
-CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS -Wall"
+CXXFLAGS="${CXXFLAGS--Wall}"
AM_PATH_LD10K1(0.1.8)
AC_OUTPUT(Makefile
[-- Attachment #6: qlo10k1_makefile.patch --]
[-- Type: text/x-patch, Size: 528 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am
--- orig/alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am 2005-05-14 22:04:16.000000000 +0200
@@ -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)
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] alsa-tools
2005-05-16 14:41 [PATCH] alsa-tools Mikael Magnusson
@ 2005-05-17 8:56 ` Takashi Iwai
2005-05-17 15:50 ` Mikael Magnusson
0 siblings, 1 reply; 7+ messages in thread
From: Takashi Iwai @ 2005-05-17 8:56 UTC (permalink / raw)
To: Mikael Magnusson; +Cc: alsa-devel
At Mon, 16 May 2005 16:41:24 +0200,
Mikael Magnusson wrote:
>
> ld10k1_configure.patch
> ld10k1_makefile.patch
> Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
> CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
> if CFLAGS is undefined.
>
> qlo10k1_configure.patch
> qlo10k1_makefile.patch
> Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
> QT_CXXFLAGS to the makefile.
>
> qlo10k1_acinclude.patch
> Fixes pattern in gw_CHECK_QT not to match files that the linker won't
> use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
> libraries are installed, but only the libqt-mt development library.
Thanks. I think we can get rid of -Wall.
It's not mandatory at all. Let's simply remove CFLAGS=XXX lines.
Could you regenerate patches with that change?
Takashi
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] alsa-tools
2005-05-17 8:56 ` Takashi Iwai
@ 2005-05-17 15:50 ` Mikael Magnusson
2005-05-17 16:13 ` Takashi Iwai
0 siblings, 1 reply; 7+ messages in thread
From: Mikael Magnusson @ 2005-05-17 15:50 UTC (permalink / raw)
To: alsa-devel
[-- Attachment #1: Type: text/plain, Size: 1213 bytes --]
On Tue, May 17, 2005 at 10:56:43AM +0200, Takashi Iwai wrote:
> At Mon, 16 May 2005 16:41:24 +0200,
> Mikael Magnusson wrote:
> >
> > ld10k1_configure.patch
> > ld10k1_makefile.patch
> > Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
> > CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
> > if CFLAGS is undefined.
> >
> > qlo10k1_configure.patch
> > qlo10k1_makefile.patch
> > Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
> > QT_CXXFLAGS to the makefile.
> >
> > qlo10k1_acinclude.patch
> > Fixes pattern in gw_CHECK_QT not to match files that the linker won't
> > use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
> > libraries are installed, but only the libqt-mt development library.
>
> Thanks. I think we can get rid of -Wall.
> It's not mandatory at all. Let's simply remove CFLAGS=XXX lines.
>
> Could you regenerate patches with that change?
>
>
> Takashi
>
Ok, I have removed -Wall from CFLAGS (and CXXFLAGS) in
ld10k1_configure2.patch and qlo10k1_configure2.patch.
I don't resend ld10k1_makefile.patch, qlo10k1_makefile.patch and
qlo10k1_acinclude.patch, since they are unchanged.
/Mikael Magnusson
[-- Attachment #2: ld10k1_configure2.patch --]
[-- Type: text/plain, Size: 513 bytes --]
diff -urNad alsa-tools-1.0.8+1.0.9rc3/ld10k1/configure.in /tmp/dpep.byc0VN/alsa-tools-1.0.8+1.0.9rc3/ld10k1/configure.in
--- alsa-tools-1.0.8+1.0.9rc3/ld10k1/configure.in 2005-05-17 17:31:23.534229607 +0200
+++ /tmp/dpep.byc0VN/alsa-tools-1.0.8+1.0.9rc3/ld10k1/configure.in 2005-05-17 17:31:39.847422177 +0200
@@ -9,8 +9,6 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AM_PATH_ALSA(1.0.8, [], [])
-CFLAGS="$CFLAGS $ALSA_CFLAGS -Wall"
-LIBS="$LIBS $ALSA_LIBS"
effectsdir='$(pkgdatadir)/effects'
AC_SUBST(effectsdir)
[-- Attachment #3: qlo10k1_configure2.patch --]
[-- Type: text/plain, Size: 447 bytes --]
diff -urNad alsa-tools-1.0.8+1.0.9rc3/qlo10k1/configure.in /tmp/dpep.6IrRDe/alsa-tools-1.0.8+1.0.9rc3/qlo10k1/configure.in
--- alsa-tools-1.0.8+1.0.9rc3/qlo10k1/configure.in 2005-05-17 17:31:23.116327144 +0200
+++ /tmp/dpep.6IrRDe/alsa-tools-1.0.8+1.0.9rc3/qlo10k1/configure.in 2005-05-17 17:32:13.039675246 +0200
@@ -8,7 +8,6 @@
AC_C_BIGENDIAN
gw_CHECK_QT
-CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS -Wall"
AM_PATH_LD10K1(0.1.8)
AC_OUTPUT(Makefile
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] alsa-tools
2005-05-17 15:50 ` Mikael Magnusson
@ 2005-05-17 16:13 ` Takashi Iwai
0 siblings, 0 replies; 7+ messages in thread
From: Takashi Iwai @ 2005-05-17 16:13 UTC (permalink / raw)
To: Mikael Magnusson; +Cc: alsa-devel
At Tue, 17 May 2005 17:50:05 +0200,
Mikael Magnusson wrote:
>
> On Tue, May 17, 2005 at 10:56:43AM +0200, Takashi Iwai wrote:
> > At Mon, 16 May 2005 16:41:24 +0200,
> > Mikael Magnusson wrote:
> > >
> > > ld10k1_configure.patch
> > > ld10k1_makefile.patch
> > > Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
> > > CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
> > > if CFLAGS is undefined.
> > >
> > > qlo10k1_configure.patch
> > > qlo10k1_makefile.patch
> > > Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
> > > QT_CXXFLAGS to the makefile.
> > >
> > > qlo10k1_acinclude.patch
> > > Fixes pattern in gw_CHECK_QT not to match files that the linker won't
> > > use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
> > > libraries are installed, but only the libqt-mt development library.
> >
> > Thanks. I think we can get rid of -Wall.
> > It's not mandatory at all. Let's simply remove CFLAGS=XXX lines.
> >
> > Could you regenerate patches with that change?
> >
> >
> > Takashi
> >
>
> Ok, I have removed -Wall from CFLAGS (and CXXFLAGS) in
> ld10k1_configure2.patch and qlo10k1_configure2.patch.
> I don't resend ld10k1_makefile.patch, qlo10k1_makefile.patch and
> qlo10k1_acinclude.patch, since they are unchanged.
Thanks. Now they are applied to CVS.
Takashi
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] alsa-tools
@ 2005-05-16 14:39 Mikael Magnusson
2005-05-16 17:02 ` Mikael Magnusson
2005-05-16 19:03 ` Mikael Magnusson
0 siblings, 2 replies; 7+ messages in thread
From: Mikael Magnusson @ 2005-05-16 14:39 UTC (permalink / raw)
To: alsa-devel
ld10k1_configure.patch
ld10k1_makefile.patch
Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
if CFLAGS is undefined.
qlo10k1_configure.patch
qlo10k1_makefile.patch
Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
QT_CXXFLAGS to the makefile.
qlo10k1_acinclude.patch
Fixes pattern in gw_CHECK_QT not to match files that the linker won't
use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
libraries are installed, but only the libqt-mt development library.
Signed-Off-By: Mikael Magnusson <mikma@users.sourceforge.net>
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] alsa-tools
2005-05-16 14:39 Mikael Magnusson
@ 2005-05-16 17:02 ` Mikael Magnusson
2005-05-16 19:03 ` Mikael Magnusson
1 sibling, 0 replies; 7+ messages in thread
From: Mikael Magnusson @ 2005-05-16 17:02 UTC (permalink / raw)
To: alsa-devel
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
On Mon, May 16, 2005 at 04:39:36PM +0200, Mikael Magnusson wrote:
> ld10k1_configure.patch
> ld10k1_makefile.patch
> Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
> CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
> if CFLAGS is undefined.
>
> qlo10k1_configure.patch
> qlo10k1_makefile.patch
> Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
> QT_CXXFLAGS to the makefile.
>
> qlo10k1_acinclude.patch
> Fixes pattern in gw_CHECK_QT not to match files that the linker won't
> use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
> libraries are installed, but only the libqt-mt development library.
>
> Signed-Off-By: Mikael Magnusson <mikma@users.sourceforge.net>
>
With the patches this time.
/Mikael Magnusson
[-- Attachment #2: ld10k1_configure.patch --]
[-- Type: text/plain, Size: 499 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/ld10k1/configure.in alsa-tools-1.0.9rc3/ld10k1/configure.in
--- orig/alsa-tools-1.0.9rc3/ld10k1/configure.in 2005-04-11 15:15:52.000000000 +0200
+++ alsa-tools-1.0.9rc3/ld10k1/configure.in 2005-05-14 23:18:10.000000000 +0200
@@ -9,8 +9,7 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AM_PATH_ALSA(1.0.8, [], [])
-CFLAGS="$CFLAGS $ALSA_CFLAGS -Wall"
-LIBS="$LIBS $ALSA_LIBS"
+CFLAGS="${CFLAGS--Wall}"
effectsdir='$(pkgdatadir)/effects'
AC_SUBST(effectsdir)
[-- Attachment #3: ld10k1_makefile.patch --]
[-- Type: text/plain, Size: 663 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am
--- orig/alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am 2005-03-18 14:41:02.000000000 +0100
+++ alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am 2005-05-15 00:37:00.000000000 +0200
@@ -13,6 +13,8 @@
lib_LTLIBRARIES = liblo10k1.la
liblo10k1_la_SOURCES = comm.c liblo10k1.c liblo10k1ef.c liblo10k1lf.c
#liblo10k1_la_HEADERS = comm.h liblo10k1.h liblo10k1ef.h ld10k1_error.h ld10k1_fnc.h liblo10k1lf.h
+liblo10k1_la_CFLAGS = $(ALSA_CFLAGS)
+liblo10k1_la_LIBADD = $(ALSA_LIBS)
lo10k1_SOURCES = lo10k1.c
lo10k1_CFLAGS = $(ALSA_CFLAGS) -DEFFECTSDIR='"$(effectsdir)"'
[-- Attachment #4: qlo10k1_acinclude.patch --]
[-- Type: text/plain, Size: 1207 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4
--- orig/alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 2005-05-14 17:12:04.000000000 +0200
@@ -99,17 +99,17 @@
fi
fi
- if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+ if test "x`ls $QTDIR/lib/libqt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqt"
QT_IS_MT="no"
- elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqt-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqt-mt"
QT_IS_MT="yes"
- elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqte.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte"
QT_IS_MT="no"
QT_IS_EMBEDDED="yes"
- elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqte-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
[-- Attachment #5: qlo10k1_configure.patch --]
[-- Type: text/plain, Size: 435 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/configure.in alsa-tools-1.0.9rc3/qlo10k1/configure.in
--- orig/alsa-tools-1.0.9rc3/qlo10k1/configure.in 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/configure.in 2005-05-14 17:13:38.000000000 +0200
@@ -8,7 +8,7 @@
AC_C_BIGENDIAN
gw_CHECK_QT
-CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS -Wall"
+CXXFLAGS="${CXXFLAGS--Wall}"
AM_PATH_LD10K1(0.1.8)
AC_OUTPUT(Makefile
[-- Attachment #6: qlo10k1_makefile.patch --]
[-- Type: text/plain, Size: 528 bytes --]
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am
--- orig/alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am 2005-05-14 22:04:16.000000000 +0200
@@ -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)
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] alsa-tools
2005-05-16 14:39 Mikael Magnusson
2005-05-16 17:02 ` Mikael Magnusson
@ 2005-05-16 19:03 ` Mikael Magnusson
1 sibling, 0 replies; 7+ messages in thread
From: Mikael Magnusson @ 2005-05-16 19:03 UTC (permalink / raw)
To: alsa-devel
On Mon, May 16, 2005 at 04:39:36PM +0200, Mikael Magnusson wrote:
> ld10k1_configure.patch
> ld10k1_makefile.patch
> Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to
> CFLAGS and LDADD in src/Makefile.am already. Adds "-Wall" to CFLAGS only
> if CFLAGS is undefined.
>
> qlo10k1_configure.patch
> qlo10k1_makefile.patch
> Adds LD10K1_CFLAGS and LD10K1_LDFLAGS in src/Makefile.am, and moves
> QT_CXXFLAGS to the makefile.
>
> qlo10k1_acinclude.patch
> Fixes pattern in gw_CHECK_QT not to match files that the linker won't
> use, for example libqt.so.3 . Needed if both libqt and libqt-mt shared
> libraries are installed, but only the libqt-mt development library.
>
> Signed-Off-By: Mikael Magnusson <mikma@users.sourceforge.net>
>
With the patches this time.
/Mikael Magnusson
ld10k1_configure.patch:
diff -ur orig/alsa-tools-1.0.9rc3/ld10k1/configure.in alsa-tools-1.0.9rc3/ld10k1/configure.in
--- orig/alsa-tools-1.0.9rc3/ld10k1/configure.in 2005-04-11 15:15:52.000000000 +0200
+++ alsa-tools-1.0.9rc3/ld10k1/configure.in 2005-05-14 23:18:10.000000000 +0200
@@ -9,8 +9,7 @@
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AM_PATH_ALSA(1.0.8, [], [])
-CFLAGS="$CFLAGS $ALSA_CFLAGS -Wall"
-LIBS="$LIBS $ALSA_LIBS"
+CFLAGS="${CFLAGS--Wall}"
effectsdir='$(pkgdatadir)/effects'
AC_SUBST(effectsdir)
ld10k1_makefile.patch:
diff -ur orig/alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am
--- orig/alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am 2005-03-18 14:41:02.000000000 +0100
+++ alsa-tools-1.0.9rc3/ld10k1/src/Makefile.am 2005-05-15 00:37:00.000000000 +0200
@@ -13,6 +13,8 @@
lib_LTLIBRARIES = liblo10k1.la
liblo10k1_la_SOURCES = comm.c liblo10k1.c liblo10k1ef.c liblo10k1lf.c
#liblo10k1_la_HEADERS = comm.h liblo10k1.h liblo10k1ef.h ld10k1_error.h ld10k1_fnc.h liblo10k1lf.h
+liblo10k1_la_CFLAGS = $(ALSA_CFLAGS)
+liblo10k1_la_LIBADD = $(ALSA_LIBS)
lo10k1_SOURCES = lo10k1.c
lo10k1_CFLAGS = $(ALSA_CFLAGS) -DEFFECTSDIR='"$(effectsdir)"'
qlo10k1_acinclude.patch:
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4
--- orig/alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/acinclude.m4 2005-05-14 17:12:04.000000000 +0200
@@ -99,17 +99,17 @@
fi
fi
- if test "x`ls $QTDIR/lib/libqt.* 2> /dev/null`" != x ; then
+ if test "x`ls $QTDIR/lib/libqt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqt"
QT_IS_MT="no"
- elif test "x`ls $QTDIR/lib/libqt-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqt-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqt-mt"
QT_IS_MT="yes"
- elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqte.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte"
QT_IS_MT="no"
QT_IS_EMBEDDED="yes"
- elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then
+ elif test "x`ls $QTDIR/lib/libqte-mt.{a,so} 2> /dev/null`" != x ; then
QT_LIB="-lqte-mt"
QT_IS_MT="yes"
QT_IS_EMBEDDED="yes"
qlo10k1_configure.patch:
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/configure.in alsa-tools-1.0.9rc3/qlo10k1/configure.in
--- orig/alsa-tools-1.0.9rc3/qlo10k1/configure.in 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/configure.in 2005-05-14 17:13:38.000000000 +0200
@@ -8,7 +8,7 @@
AC_C_BIGENDIAN
gw_CHECK_QT
-CXXFLAGS="$CXXFLAGS $QT_CXXFLAGS -Wall"
+CXXFLAGS="${CXXFLAGS--Wall}"
AM_PATH_LD10K1(0.1.8)
AC_OUTPUT(Makefile
qlo10k1_makefile.patch:
diff -ur orig/alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am
--- orig/alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am 2005-03-18 17:42:49.000000000 +0100
+++ alsa-tools-1.0.9rc3/qlo10k1/src/Makefile.am 2005-05-14 22:04:16.000000000 +0200
@@ -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)
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2005-05-17 16:13 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-05-16 14:41 [PATCH] alsa-tools Mikael Magnusson
2005-05-17 8:56 ` Takashi Iwai
2005-05-17 15:50 ` Mikael Magnusson
2005-05-17 16:13 ` Takashi Iwai
-- strict thread matches above, loose matches on Subject: below --
2005-05-16 14:39 Mikael Magnusson
2005-05-16 17:02 ` Mikael Magnusson
2005-05-16 19:03 ` Mikael Magnusson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.