[kaffe] CVS kaffe (robilad): native/jni/midi-alsa/Makefile.am (AM_CFLAGS):

[Kaffe CVS]

PatchSet 7546 
Date: 2007/09/12 20:03:35
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-09-08  Michael Koch  <konqueror at gmx.de>

        * native/jni/midi-alsa/Makefile.am (AM_CFLAGS):
        Removed @ERROR_CFLAGS@ to not fail build with GCC 4.2.

Members: 
	ChangeLog:1.5044->1.5045 
	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am:1.4->1.5 
	libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.31->1.32 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5044 kaffe/ChangeLog:1.5045
--- kaffe/ChangeLog:1.5044	Wed Sep 12 16:08:52 2007
+++ kaffe/ChangeLog	Wed Sep 12 20:03:35 2007
@@ -1,5 +1,14 @@
 2007-09-12  Dalibor Topic  <robilad at kaffe.org>
 
+	Fix for build with gcc-4.2, merged in from GNU Classpath.
+
+	2007-09-08  Michael Koch  <konqueror at gmx.de>
+
+        * native/jni/midi-alsa/Makefile.am (AM_CFLAGS):
+        Removed @ERROR_CFLAGS@ to not fail build with GCC 4.2.
+
+2007-09-12  Dalibor Topic  <robilad at kaffe.org>
+
 	Fix for #72.
 	* config/alpha/callKaffeException.h (callKaffeException):
 	Don't clobber frame pointer ($15). That fixes the build with gcc 4.1.
Index: kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am
diff -u kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am:1.4 kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am:1.5
--- kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am:1.4	Mon Aug  6 11:51:51 2007
+++ kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.am	Wed Sep 12 20:03:35 2007
@@ -8,5 +8,5 @@
 libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
-AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa`
+AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa`
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ `pkg-config --cflags-only-other alsa`
Index: kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in
diff -u kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.31 kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.32
--- kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in:1.31	Tue Aug  7 10:55:01 2007
+++ kaffe/libraries/javalib/external/classpath/native/jni/midi-alsa/Makefile.in	Wed Sep 12 20:03:35 2007
@@ -274,8 +274,8 @@
 libgjsmalsa_la_LIBADD = -lasound
 libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 AM_LDFLAGS = @CLASSPATH_MODULE@
-AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa`
+AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa`
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ `pkg-config --cflags-only-other alsa`
 all: all-am
 
 .SUFFIXES: