summaryrefslogtreecommitdiff
path: root/native/jni/gtk-peer/Makefile.am
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2004-10-26 20:26:03 +0000
committerMark Wielaard <mark@klomp.org>2004-10-26 20:26:03 +0000
commit75c2a99d73ec6542aa3eceb7e3bbcb20b680aa81 (patch)
treeefa97a2786a29b56508530fd215b336e055a8c59 /native/jni/gtk-peer/Makefile.am
parent680f2e95a4e3755985b93f318541c91842f5a9b8 (diff)
downloadclasspath-75c2a99d73ec6542aa3eceb7e3bbcb20b680aa81.tar.gz
* configure.ac (CLASSPATH_MODULE): Add -no-undefined.
(Werror): New configure flag. (gtk-peer): Remove comma from help string. (AM_CFLAGS): Replace by... (WARNING_CFLAGS, STRICT_WARNING_CFLAGS, ERROR_CFLAGS): New gcc flags. (AM_CPPFLAGS): Replace by... (CLASSPATH_INCLUDES): New -I gcc flags. * native/fdlibm/Makefile.am: Use new AM_LDFLAGS, AM_CPPFLAGS and AM_CFLAGS when not library specific flags are used. * native/jni/gtk-peer/Makefile.am: Likewise. * native/jni/java-io/Makefile.am: Likewise. * native/jni/java-lang/Makefile.am: Likewise. * native/jni/java-net/Makefile.am: Likewise. * native/jni/java-nio/Makefile.am: Likewise. * native/jni/java-util/Makefile.am: Likewise. * native/jni/java-io/java_io_ObjectInputStream.c: Mark function arguments unused where necessary. * native/jni/java-io/java_io_VMFile.c: Likewise. * native/jni/java-io/java_io_VMObjectStreamClass.c: Likewise. (getFieldReference): Make sure we allocate the_type ourselves if we free it later. Removed unused argument object. * native/jni/java-io/javaio.c (javaio_read): Removed unused argument obj. (javaio_write): Likewise. * native/jni/java-io/javaio.h: Mark function arguments unused where necessary. * native/jni/java-lang/java_lang_Double.c: Likewise. (Java_java_lang_Double_parseDouble): Declare buf as const char*. * native/jni/java-lang/java_lang_Math.c: Mark function arguments unused where necessary. * native/jni/java-lang/java_lang_VMDouble.c: Likewise. * native/jni/java-lang/java_lang_VMFloat.c: Likewise. * native/jni/java-lang/java_lang_VMSystem.c: Likewise. * native/jni/java-lang/java_lang_reflect_Array.c: Likewise. * native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c (Java_gnu_java_net_PlainDatagramSocketImpl_receive0): Mark only maxlen and offset as unsigned. * native/jni/java-net/java_net_InetAddress.c: Mark function arguments unused where necessary. (Java_java_net_InetAddress_getHostByName): New local int variable max_addresses. * native/jni/java-net/java_net_NetworkInterface.c: Mark function arguments unused where necessary. * native/jni/java-net/javanet.c (_javanet_set_int_field): Removed unused argument class. (_javanet_accept): Check result variable after it has been assigned. * native/jni/java-nio/gnu_java_nio_NIOServerSocket.c: Mark function arguments unused where necessary. * native/jni/java-nio/gnu_java_nio_VMPipe.c: Likewise. * native/jni/java-nio/gnu_java_nio_VMSelector.c: Likewise. * native/jni/java-nio/gnu_java_nio_VMSelector.c: Likewise. * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c: Likewise. * native/jni/java-nio/java_nio_DirectByteBufferImpl.c: Likewise. * native/jni/java-nio/java_nio_MappedByteBufferImpl.c: Likewise. * native/jni/java-nio/java_nio_channels_Channels.c: Likewise. * native/jni/java-util/java_util_VMTimeZone.c (jint_to_charbuf): Mark as static function. (Java_java_util_VMTimeZone_getSystemTimeZoneId): Mark clazz argument as unused. Cast _timezone to long before use. * native/target/generic/target_generic_network.h: Remove asserts.
Diffstat (limited to 'native/jni/gtk-peer/Makefile.am')
-rw-r--r--native/jni/gtk-peer/Makefile.am13
1 files changed, 9 insertions, 4 deletions
diff --git a/native/jni/gtk-peer/Makefile.am b/native/jni/gtk-peer/Makefile.am
index f5fef81fe..8d23fad38 100644
--- a/native/jni/gtk-peer/Makefile.am
+++ b/native/jni/gtk-peer/Makefile.am
@@ -53,8 +53,13 @@ libgtkpeer_la_SOURCES = $(gtk_cairo_c_source_files) \
gtkcairopeer.h \
gtkpeer.h
-libgtkpeer_la_CPPFLAGS = $(AM_CPPFLAGS) @GTK_CFLAGS@ \
- @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@
libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ \
- @CAIRO_LIBS@ @PANGOFT2_LIBS@
+
+AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@
+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).
+# Also no -Werror for now since not all warnings have been solved yet. FIXME.
+AM_CFLAGS = @WARNING_CFLAGS@ \
+ @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@