From c5bc3df6db8b8b829899eac59223491d80ced9e5 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 24 Aug 2011 11:47:06 +0100 Subject: * Makefile.in (CFLAGS-collect2.o, CFLAGS-c-family/c-opts.o) (CFLAGS-c-family/c-pch.o, CFLAGS-prefix.o, CFLAGS-version.o) (CFLAGS-lto-compress.o, CFLAGS-toplev.o, CFLAGS-intl.o) (CFLAGS-cppbuiltin.o, CFLAGS-cppdefault.o): New. (collect2.o, c-family/c-cppbuiltin.o, c-family/c-opts.o) (c-family/c-pch.o, prefix.o, version.o, lto-compress.o, toplev.o) (intl.o, cppbuiltin.o, cppdefault.o): Remove explicit compilation rules. (lto-wrapper$(exeext)): Use $(LINKER) not $(COMPILER). ada: * gcc-interface/Make-lang.in (CFLAGS-ada/tracebak.o) (CFLAGS-ada/targext.o, CFLAGS-ada/cio.o, CFLAGS-ada/init.o) (CFLAGS-ada/initialize.o, CFLAGS-ada/raise.o): New. (ada/tracebak.o, ada/targext.o, ada/cio.o, ada/init.o) (ada/initialize.o, ada/raise.o): Remove explicit compilation rules. fortran: * Make-lang.in (fortran/cpp.o): Remove explicit compilation rule. go: * Make-lang.in (CFLAGS-go/go-lang.o): New. (go/go-lang.o): Remove explicit compilation rule. java: * Make-lang.in (CFLAGS-java/jcf-io.o, CFLAGS-java/jcf-path.o): New. (java/jcf-io.o, java/jcf-path.o): Remove explicit compilation rules. From-SVN: r178030 --- gcc/java/Make-lang.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gcc/java/Make-lang.in') diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 6dd2f09..1d9fd2b 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -324,18 +324,16 @@ java/java-gimplify.o: java/java-gimplify.c $(CONFIG_H) $(SYSTEM_H) \ coretypes.h $(JAVA_TREE_H) $(GIMPLE_H) # jcf-io.o needs $(ZLIBINC) added to cflags. +CFLAGS-java/jcf-io.o += $(ZLIBINC) java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ $(JAVA_TREE_H) java/zipfile.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(ZLIBINC) $(srcdir)/java/jcf-io.c $(OUTPUT_OPTION) # jcf-path.o needs a -D. +CFLAGS-java/jcf-path.o += \ + -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \ + -DDEFAULT_TARGET_VERSION=\"$(version)\" java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \ java/jcf.h - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \ - -DDEFAULT_TARGET_VERSION=\"$(version)\" \ - $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION) TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi \ $(gcc_docdir)/include/gpl_v3.texi $(gcc_docdir)/include/gcc-common.texi \ -- cgit v1.1