2008-06-23 Andrew Haley <aph@redhat.com>

	* native/jawt/Makefile.am,
	native/fdlibm/Makefile.am,
	native/jni/java-util/Makefile.am,
	native/jni/gstreamer-peer/Makefile.am,
	native/jni/native-lib/Makefile.am,
	native/jni/gconf-peer/Makefile.am,
	native/jni/gtk-peer/Makefile.am,
	native/jni/xmlj/Makefile.am,
	native/jni/midi-alsa/Makefile.am,
	native/jni/java-nio/Makefile.am,
	native/jni/midi-dssi/Makefile.am,
	native/jni/classpath/Makefile.am,
	native/jni/java-io/Makefile.am,
	native/jni/java-lang/Makefile.am,
	native/jni/java-net/Makefile.am (AM_CFLAGS): Add @EXTRA_CFLAGS@.
	* configure.ac (EXTRA_CFLAGS): New macro.

	* lib/Makefile.am (resources): Add .svn.

15 files changed, 29 insertions, 17 deletions

diff --git a/native/fdlibm/Makefile.am b/native/fdlibm/Makefile.am
index 09d868106..29bf83746 100644
--- a/native/fdlibm/Makefile.am
+++ b/native/fdlibm/Makefile.am
@@ -60,6 +60,6 @@ libfdlibm_la_SOURCES =  \
 
 AM_LDFLAGS = @CLASSPATH_CONVENIENCE@ 
 
-# We just want the standard flags for fdlibm since it is an upstream lib
-# and our normal -pedantic -Wall -Werror breaks this lib. So no AM_CFLAGS.
-# We also don't need extra includes, so no AM_CPPFLAGS either.
+AM_CFLAGS = @EXTRA_CFLAGS@
+
+# We don't need extra includes, so no AM_CPPFLAGS.
diff --git a/native/jawt/Makefile.am b/native/jawt/Makefile.am
index 87dcc9b0b..5d7ae796c 100644
--- a/native/jawt/Makefile.am
+++ b/native/jawt/Makefile.am
@@ -10,4 +10,4 @@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk
 # headers contain broken prototypes (by design, see gtkitemfactory.h).
 AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \
-            @GTK_CFLAGS@ @PANGOFT2_CFLAGS@
+            @GTK_CFLAGS@ @PANGOFT2_CFLAGS@ @EXTRA_CFLAGS@
diff --git a/native/jni/classpath/Makefile.am b/native/jni/classpath/Makefile.am
index 5436c42be..985475527 100644
--- a/native/jni/classpath/Makefile.am
+++ b/native/jni/classpath/Makefile.am
@@ -8,4 +8,5 @@ libclasspath_la_SOURCES = jcl.c jcl.h \
 
 AM_LDFLAGS = @CLASSPATH_CONVENIENCE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/gconf-peer/Makefile.am b/native/jni/gconf-peer/Makefile.am
index 56789462d..b07076379 100644
--- a/native/jni/gconf-peer/Makefile.am
+++ b/native/jni/gconf-peer/Makefile.am
@@ -10,4 +10,5 @@ AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@
 
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/gstreamer-peer/Makefile.am b/native/jni/gstreamer-peer/Makefile.am
index 17277a698..0eca83fe5 100644
--- a/native/jni/gstreamer-peer/Makefile.am
+++ b/native/jni/gstreamer-peer/Makefile.am
@@ -26,4 +26,5 @@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 AM_CFLAGS = @WARNING_CFLAGS@ -Wno-write-strings \
             -Wno-missing-field-initializers \
             @ERROR_CFLAGS@ -Wno-unused-parameter @GSTREAMER_BASE_CFLAGS@ \
-            @GDK_CFLAGS@ @GSTREAMER_CFLAGS@ @GSTREAMER_PLUGINS_BASE_CFLAGS@ 
+            @GDK_CFLAGS@ @GSTREAMER_CFLAGS@ @GSTREAMER_PLUGINS_BASE_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am
index b6438ff6f..6ab32636b 100644
--- a/native/jni/gtk-peer/Makefile.am
+++ b/native/jni/gtk-peer/Makefile.am
@@ -58,4 +58,4 @@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 # headers contain broken prototypes (by design, see gtkitemfactory.h).
 AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \
             @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \
-            @X_CFLAGS@
+            @X_CFLAGS@ @EXTRA_CFLAGS@
diff --git a/native/jni/java-io/Makefile.am b/native/jni/java-io/Makefile.am
index 637c74c61..58bd973e2 100644
--- a/native/jni/java-io/Makefile.am
+++ b/native/jni/java-io/Makefile.am
@@ -9,4 +9,5 @@ libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/java-lang/Makefile.am b/native/jni/java-lang/Makefile.am
index aea9ded57..e1bc7ce71 100644
--- a/native/jni/java-lang/Makefile.am
+++ b/native/jni/java-lang/Makefile.am
@@ -16,4 +16,5 @@ libjavalangmanagement_la_SOURCES = gnu_java_lang_management_VMOperatingSystemMXB
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@ -I$(top_srcdir)/native/fdlibm
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/java-net/Makefile.am b/native/jni/java-net/Makefile.am
index 1278b946c..f70086d93 100644
--- a/native/jni/java-net/Makefile.am
+++ b/native/jni/java-net/Makefile.am
@@ -22,4 +22,5 @@ libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo \
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/java-nio/Makefile.am b/native/jni/java-nio/Makefile.am
index 9f2db83f2..398e6a6e7 100644
--- a/native/jni/java-nio/Makefile.am
+++ b/native/jni/java-nio/Makefile.am
@@ -20,4 +20,5 @@ EXTRA_DIST = javanio.c
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/java-util/Makefile.am b/native/jni/java-util/Makefile.am
index f06213f71..59ddc74e2 100644
--- a/native/jni/java-util/Makefile.am
+++ b/native/jni/java-util/Makefile.am
@@ -4,4 +4,6 @@ libjavautil_la_SOURCES = java_util_VMTimeZone.c
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
+
diff --git a/native/jni/midi-alsa/Makefile.am b/native/jni/midi-alsa/Makefile.am
index c0abce953..5ea89f306 100644
--- a/native/jni/midi-alsa/Makefile.am
+++ b/native/jni/midi-alsa/Makefile.am
@@ -9,4 +9,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@ `pkg-config --cflags-only-other alsa`
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa` \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/midi-dssi/Makefile.am b/native/jni/midi-dssi/Makefile.am
index 200649431..ee12bf2e9 100644
--- a/native/jni/midi-dssi/Makefile.am
+++ b/native/jni/midi-dssi/Makefile.am
@@ -12,4 +12,4 @@ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 # No STRICT_WARNING_CFLAGS here as we use dlsym to load the address of 
 # a function,and ISO C prohibits casting void pointers, like those returned
 # by dlsym, to function pointers.
-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @EXTRA_CFLAGS@
diff --git a/native/jni/native-lib/Makefile.am b/native/jni/native-lib/Makefile.am
index 754de71b2..0de723eb1 100644
--- a/native/jni/native-lib/Makefile.am
+++ b/native/jni/native-lib/Makefile.am
@@ -9,4 +9,5 @@ libclasspathnative_la_SOURCES = cpnet.c \
 
 AM_LDFLAGS = @CLASSPATH_CONVENIENCE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \
+            @EXTRA_CFLAGS@
diff --git a/native/jni/xmlj/Makefile.am b/native/jni/xmlj/Makefile.am
index 3904dd58c..4f66ac827 100644
--- a/native/jni/xmlj/Makefile.am
+++ b/native/jni/xmlj/Makefile.am
@@ -22,6 +22,7 @@ AM_LDFLAGS = @CLASSPATH_MODULE@ @XML_LIBS@ @XSLT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
 # Don't enable ERROR flags. Code isn't warning free yet.
-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @XML_CFLAGS@ @XSLT_CFLAGS@
+AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @XML_CFLAGS@ \
+            @XSLT_CFLAGS@ @EXTRA_CFLAGS@
 
 EXTRA_DIST = BUGS