This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Patch: Makefile.am cleanup

From: Michael Koch <konqueror at gmx dot de>
To: java-patches at gcc dot gnu dot org
Cc: tromey at redhat dot com
Date: Mon, 16 Aug 2004 23:06:37 +0200
Subject: Patch: Makefile.am cleanup

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I wrote the attached patch while working on the automake 1.9 
transition. libjava bootstrapped successfully on i686-pc-linux-gnu 
with this patch applied.

Ok for commit to trunk ?


Michael


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.
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFBISHgWSOgCCdjSDsRAnlaAJ4gt37U8hvqbHyAsPfIFIg2fJRQawCgn3nC
X8ssPnZol44Xs2kX3AdqSOo=
=W9Nw
-----END PGP SIGNATURE-----

Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.399
diff -u -r1.399 Makefile.am
--- Makefile.am	12 Aug 2004 16:19:59 -0000	1.399
+++ Makefile.am	16 Aug 2004 20:58:58 -0000
@@ -134,7 +134,7 @@
 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 @@
 	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 @@
 	@-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 @@
 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 @@
 
 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 \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.425
diff -u -r1.425 Makefile.in
--- Makefile.in	12 Aug 2004 16:20:00 -0000	1.425
+++ Makefile.in	16 Aug 2004 20:59:00 -0000
@@ -144,10 +144,12 @@
 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 @@
 
 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 @@
 	$(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 @@
 
 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 @@
 
 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 @@
 
 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 @@
 	$(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 \
Index: gcj/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gcj/Makefile.in,v
retrieving revision 1.51
diff -u -r1.51 Makefile.in
--- gcj/Makefile.in	12 Aug 2004 16:20:08 -0000	1.51
+++ gcj/Makefile.in	16 Aug 2004 20:59:00 -0000
@@ -148,10 +148,12 @@
 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 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
Index: include/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/include/Makefile.in,v
retrieving revision 1.52
diff -u -r1.52 Makefile.in
--- include/Makefile.in	12 Aug 2004 16:20:09 -0000	1.52
+++ include/Makefile.in	16 Aug 2004 20:59:00 -0000
@@ -148,10 +148,12 @@
 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 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
Index: testsuite/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/Makefile.in,v
retrieving revision 1.62
diff -u -r1.62 Makefile.in
--- testsuite/Makefile.in	12 Aug 2004 16:20:11 -0000	1.62
+++ testsuite/Makefile.in	16 Aug 2004 20:59:00 -0000
@@ -148,10 +148,12 @@
 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 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:

Follow-Ups:
- Re: Patch: Makefile.am cleanup
  - From: Bryce McKinlay

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]