2004-08-16 Michael Koch <konqueror@gmx.de>

	* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86080 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 9 deletions

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 \