From be170ef2ae825bf9a705336f50ed8193377ddfab Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Mon, 16 Aug 2004 21:19:04 +0000 Subject: [PATCH] 2004-08-16 Michael Koch * Makefile.am (math_c_files): Renamed from c_files. (math_c_source_files): Renamed from c_source_files. * Makefile.in, gcj/Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerated. From-SVN: r86080 --- libjava/ChangeLog | 10 ++++++++++ libjava/Makefile.am | 16 +++++++--------- libjava/Makefile.in | 20 ++++++++++---------- libjava/gcj/Makefile.in | 4 +++- libjava/include/Makefile.in | 4 +++- libjava/testsuite/Makefile.in | 4 +++- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4e93146c72c..559bce123b4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2004-08-16 Michael Koch + + * Makefile.am + (math_c_files): Renamed from c_files. + (math_c_source_files): Renamed from c_source_files. + * Makefile.in, + gcj/Makefile.in, + include/Makefile.in, + testsuite/Makefile.in: Regenerated. + 2004-08-16 Bryce McKinlay * configure.in (AC_CONF_SUBDIRS): Use literal for ltdl directory diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 83124461472..c4522759e49 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -134,7 +134,7 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) ## Objects from C sources in subdirs. -c_files = $(c_source_files:.c=.lo) +math_c_files = $(math_c_source_files:.c=.lo) extra_cc_files = $(extra_cc_source_files:.cc=.lo) ## Objects from gtk-related C sources in subdirs. gtk_c_files = $(gtk_c_source_files:.c=.lo) @@ -149,14 +149,14 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ resolve.cc defineclass.cc interpret.cc verify.cc \ $(nat_source_files) EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ - win32-threads.cc posix.cc win32.cc $(c_source_files) \ + win32-threads.cc posix.cc win32.cc $(math_c_source_files) \ $(extra_cc_source_files) $(java_source_files) $(built_java_source_files) libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \ - $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ + $(math_c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) \ $(propertyo_files) -libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \ +libgcj_la_LIBADD = $(javao_files) $(math_c_files) $(extra_cc_files) $(GCOBJS) \ $(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files) # Include THREADLIBS here to ensure that the correct version of # certain linuxthread functions get linked: @@ -462,13 +462,13 @@ $(nat_files) $(xlib_nat_files): %.lo: %.cc @-mv $(@:.lo=.pp) $(@:.lo=.d) ## FIXME: see above -$(c_files): %.lo: %.c +$(math_c_files): %.lo: %.c $(LTCOMPILE) -c -o $@ $< $(extra_cc_files): %.lo: %.cc $(LTCXXCOMPILE) -c -o $@ $< -$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h +$(math_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. @@ -2928,7 +2928,7 @@ $(javax_source_files) java_source_files = $(special_java_source_files) $(ordinary_java_source_files) ## Math library: C, not C++ -c_source_files = \ +math_c_source_files = \ java/lang/dtoa.c java/lang/k_rem_pio2.c java/lang/s_tan.c \ java/lang/e_acos.c java/lang/k_sin.c java/lang/strtod.c \ java/lang/e_asin.c java/lang/k_tan.c java/lang/w_acos.c \ @@ -2945,8 +2945,6 @@ c_source_files = \ extra_cc_source_files = $(EXTRA_CC_FILES) -#java/awt/natToolkit.cc - ## This lists all the C++ source files in subdirectories. nat_source_files = \ gnu/gcj/natCore.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 6dcc6d74289..bb0c3c341cc 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -144,10 +144,12 @@ ZINCS = @ZINCS@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ +build_noncanonical = @build_noncanonical@ build_subdir = @build_subdir@ do_compare = @do_compare@ gcc_version = @gcc_version@ here = @here@ +host_noncanonical = @host_noncanonical@ host_subdir = @host_subdir@ libgcj_basedir = @libgcj_basedir@ mkinstalldirs = @mkinstalldirs@ @@ -242,7 +244,7 @@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ nat_files = $(nat_source_files:.cc=.lo) xlib_nat_files = $(xlib_nat_source_files:.cc=.lo) -c_files = $(c_source_files:.c=.lo) +math_c_files = $(math_c_source_files:.c=.lo) extra_cc_files = $(extra_cc_source_files:.cc=.lo) gtk_c_files = $(gtk_c_source_files:.c=.lo) javao_files = $(java_source_files:.java=.lo) \ @@ -257,16 +259,16 @@ libgcj_la_SOURCES = prims.cc jni.cc exception.cc \ $(nat_source_files) EXTRA_libgcj_la_SOURCES = boehm.cc nogc.cc posix-threads.cc no-threads.cc \ - win32-threads.cc posix.cc win32.cc $(c_source_files) \ + win32-threads.cc posix.cc win32.cc $(math_c_source_files) \ $(extra_cc_source_files) $(java_source_files) $(built_java_source_files) libgcj_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(javao_files) \ - $(c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ + $(math_c_files) $(extra_cc_files) $(GCOBJS) $(THREADOBJS) \ $(PLATFORMOBJS) $(LIBLTDL) $(LIBFFI) $(ZLIBS) $(GCLIBS) \ $(propertyo_files) -libgcj_la_LIBADD = $(javao_files) $(c_files) $(extra_cc_files) $(GCOBJS) \ +libgcj_la_LIBADD = $(javao_files) $(math_c_files) $(extra_cc_files) $(GCOBJS) \ $(THREADOBJS) $(PLATFORMOBJS) $(propertyo_files) # Include THREADLIBS here to ensure that the correct version of @@ -2608,7 +2610,7 @@ $(javax_source_files) java_source_files = $(special_java_source_files) $(ordinary_java_source_files) -c_source_files = \ +math_c_source_files = \ java/lang/dtoa.c java/lang/k_rem_pio2.c java/lang/s_tan.c \ java/lang/e_acos.c java/lang/k_sin.c java/lang/strtod.c \ java/lang/e_asin.c java/lang/k_tan.c java/lang/w_acos.c \ @@ -2626,8 +2628,6 @@ c_source_files = \ extra_cc_source_files = $(EXTRA_CC_FILES) -#java/awt/natToolkit.cc - nat_source_files = \ gnu/gcj/natCore.cc \ gnu/gcj/convert/JIS0208_to_Unicode.cc \ @@ -3093,7 +3093,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 \ @@ -5521,13 +5521,13 @@ $(nat_files) $(xlib_nat_files): %.lo: %.cc $(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $< @-mv $(@:.lo=.pp) $(@:.lo=.d) -$(c_files): %.lo: %.c +$(math_c_files): %.lo: %.c $(LTCOMPILE) -c -o $@ $< $(extra_cc_files): %.lo: %.cc $(LTCXXCOMPILE) -c -o $@ $< -$(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h +$(math_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 \ diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index ffabae091a6..2967f2487e2 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -148,10 +148,12 @@ ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ +build_noncanonical = @build_noncanonical@ build_subdir = @build_subdir@ do_compare = @do_compare@ gcc_version = @gcc_version@ here = @here@ +host_noncanonical = @host_noncanonical@ host_subdir = @host_subdir@ libgcj_basedir = @libgcj_basedir@ mkinstalldirs = @mkinstalldirs@ @@ -181,7 +183,7 @@ DIST_COMMON = ./stamp-h2.in Makefile.am Makefile.in libgcj-config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index b20d6d8b40e..2a8484b2205 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -148,10 +148,12 @@ ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ +build_noncanonical = @build_noncanonical@ build_subdir = @build_subdir@ do_compare = @do_compare@ gcc_version = @gcc_version@ here = @here@ +host_noncanonical = @host_noncanonical@ host_subdir = @host_subdir@ libgcj_basedir = @libgcj_basedir@ mkinstalldirs = @mkinstalldirs@ @@ -177,7 +179,7 @@ DIST_COMMON = ./stamp-h1.in Makefile.am Makefile.in config.h.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: diff --git a/libjava/testsuite/Makefile.in b/libjava/testsuite/Makefile.in index c7f88f2ba16..def9e9c808f 100644 --- a/libjava/testsuite/Makefile.in +++ b/libjava/testsuite/Makefile.in @@ -148,10 +148,12 @@ ZIP = @ZIP@ ZLIBS = @ZLIBS@ ZLIBSPEC = @ZLIBSPEC@ ZLIBTESTSPEC = @ZLIBTESTSPEC@ +build_noncanonical = @build_noncanonical@ build_subdir = @build_subdir@ do_compare = @do_compare@ gcc_version = @gcc_version@ here = @here@ +host_noncanonical = @host_noncanonical@ host_subdir = @host_subdir@ libgcj_basedir = @libgcj_basedir@ mkinstalldirs = @mkinstalldirs@ @@ -186,7 +188,7 @@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: -- 2.30.2