From ae52213905ab33f8981b79095b1e036202fad208 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 22 Apr 2004 23:22:23 +0000 Subject: [PATCH] Makefile.am (PEDANTIC_CFLAGS): New -ansi -pedantic -Wall -Wno-long-long flags variable. * Makefile.am (PEDANTIC_CFLAGS): New -ansi -pedantic -Wall -Wno-long-long flags variable. (gtk_c_files): Use PEDANTIC_CFLAGS. * Makefile.in: Regenerated. From-SVN: r81060 --- libjava/ChangeLog | 7 +++++++ libjava/Makefile.am | 7 ++++++- libjava/Makefile.in | 7 +++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1359677dd64..53c81ea8256 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2004-04-22 Mark Wielaard + + * Makefile.am (PEDANTIC_CFLAGS): New -ansi -pedantic -Wall + -Wno-long-long flags variable. + (gtk_c_files): Use PEDANTIC_CFLAGS. + * Makefile.in: Regenerated. + 2004-04-22 Mark Wielaard * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: diff --git a/libjava/Makefile.am b/libjava/Makefile.am index ff8f36d4a97..d1733adc071 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -120,6 +120,9 @@ else AM_CFLAGS = @LIBGCJ_CFLAGS@ endif +## Extra CFLAGS used for JNI C sources shared with GNU Classpath. +PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long + JCFLAGS = -g JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) @@ -471,9 +474,11 @@ $(extra_cc_files): %.lo: %.cc $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h ## FIXME: see above +## These JNI C files are shared with GNU Classpath which needs PEDANTIC_CFLAGS. $(gtk_c_files): %.lo: %.c $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer \ - $(GTK_CFLAGS) $(LIBART_CFLAGS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< + $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ + $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< $(gtk_c_files): $(gtk_c_headers) diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 12dd8283870..66125bdda6c 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -222,6 +222,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \ @USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS) @USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@ +PEDANTIC_CFLAGS = -ansi -pedantic -Wall -Wno-long-long + JCFLAGS = -g JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) @@ -3007,7 +3009,7 @@ libgcj-test.spec.in libgcj.pc.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -5376,7 +5378,8 @@ $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h $(gtk_c_files): %.lo: %.c $(LTCOMPILE) -c -Ijniinclude -I$(srcdir)/jni/classpath -I$(srcdir)/jni/gtk-peer \ - $(GTK_CFLAGS) $(LIBART_CFLAGS) $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< + $(PEDANTIC_CFLAGS) $(GTK_CFLAGS) $(LIBART_CFLAGS) \ + $(CAIRO_LIBS) $(PANGOFT2_LIBS) -o $@ $< $(gtk_c_files): $(gtk_c_headers)