[kaffe] CVS kaffe (dalibor): Fixed build problems with BSD make

[Kaffe CVS]

PatchSet 4040 
Date: 2003/09/16 14:34:04
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed build problems with BSD make

Members: 
	ChangeLog:1.1636->1.1637 
	test/regression/run_time/Makefile.am:1.1->1.2 
	test/regression/run_time/Makefile.in:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1636 kaffe/ChangeLog:1.1637
--- kaffe/ChangeLog:1.1636	Tue Sep 16 12:35:52 2003
+++ kaffe/ChangeLog	Tue Sep 16 14:34:04 2003
@@ -1,4 +1,13 @@
 2003-09-16  Dalibor Topic <robilad@kaffe.org>
+	
+	* test/regression/run_time/Makefile.am:
+	Don't use GNU make extensions to avoid build problems on platforms
+	using a BSD make.
+	
+	* test/regression/run_time/Makefile.in:
+	Regenerated.
+	
+2003-09-16  Dalibor Topic <robilad@kaffe.org>
 
 	* libraries/javalib/gnu/java/rmi/rmic/Compile_gcj.java,
 	libraries/javalib/gnu/java/rmi/rmic/Compile_jikes.java,
Index: kaffe/test/regression/run_time/Makefile.am
diff -u kaffe/test/regression/run_time/Makefile.am:1.1 kaffe/test/regression/run_time/Makefile.am:1.2
--- kaffe/test/regression/run_time/Makefile.am:1.1	Sun Aug 31 22:09:28 2003
+++ kaffe/test/regression/run_time/Makefile.am	Tue Sep 16 14:34:05 2003
@@ -25,8 +25,41 @@
 
 SETUP_ENVIRONMENT = env `. $(top_builddir)/BUILD_ENVIRONMENT; sed 's/.*export \(.*\)/echo \1=$$\1/' < $(top_builddir)/BUILD_ENVIRONMENT | sh`
 
-%.class: %.java
-	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $<
+## We have to list the dependencies explicitely for those make programs
+## that don't support GNU make's %.suffix target extension.
+
+ClassToInterface.class: ClassToInterface.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/ClassToInterface.java
+
+DefinedToAbstract.class: DefinedToAbstract.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/DefinedToAbstract.java
+
+DefinedToUndefined.class: DefinedToUndefined.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/DefinedToUndefined.java
+
+InterfaceToClass.class: InterfaceToClass.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/InterfaceToClass.java
+
+IntToFloat.class: IntToFloat.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/IntToFloat.java
+
+InstToStatic.class: InstToStatic.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/InstToStatic.java
+
+a/ProtectedToPrivate.class: a/ProtectedToPrivate.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/a/ProtectedToPrivate.java
+
+a/PublicToPackage.class: a/PublicToPackage.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/a/PublicToPackage.java
+
+a/PublicToProtected.class: a/PublicToProtected.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/a/PublicToProtected.java
+
+PublicToPrivate.class: PublicToPrivate.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/PublicToPrivate.java
+
+StaticToInst.class: StaticToInst.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/StaticToInst.java
 
 all-am: CompileScript $(CLASS_FILES)
 
Index: kaffe/test/regression/run_time/Makefile.in
diff -u kaffe/test/regression/run_time/Makefile.in:1.1 kaffe/test/regression/run_time/Makefile.in:1.2
--- kaffe/test/regression/run_time/Makefile.in:1.1	Sun Aug 31 22:09:28 2003
+++ kaffe/test/regression/run_time/Makefile.in	Tue Sep 16 14:34:05 2003
@@ -434,8 +434,38 @@
 	uninstall-info-am
 
 
-%.class: %.java
-	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $<
+ClassToInterface.class: ClassToInterface.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/ClassToInterface.java
+
+DefinedToAbstract.class: DefinedToAbstract.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/DefinedToAbstract.java
+
+DefinedToUndefined.class: DefinedToUndefined.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/DefinedToUndefined.java
+
+InterfaceToClass.class: InterfaceToClass.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/InterfaceToClass.java
+
+IntToFloat.class: IntToFloat.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/IntToFloat.java
+
+InstToStatic.class: InstToStatic.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/InstToStatic.java
+
+a/ProtectedToPrivate.class: a/ProtectedToPrivate.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/a/ProtectedToPrivate.java
+
+a/PublicToPackage.class: a/PublicToPackage.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/a/PublicToPackage.java
+
+a/PublicToProtected.class: a/PublicToProtected.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/a/PublicToProtected.java
+
+PublicToPrivate.class: PublicToPrivate.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/PublicToPrivate.java
+
+StaticToInst.class: StaticToInst.java
+	@$(SETUP_ENVIRONMENT) $(SHELL) CompileScript $(srcdir)/StaticToInst.java
 
 all-am: CompileScript $(CLASS_FILES)