[kaffe] CVS kaffe (dalibor): Removed GNU make extensions to fix build on platforms without GNU make

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Sun Sep 14 13:12:01 2003 

PatchSet 4034 
Date: 2003/09/14 20:09:34
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Removed GNU make extensions to fix build on platforms without GNU make

Members: 
	ChangeLog:1.1630->1.1631 
	config/Makefile.in:1.87->1.88 
	include/Makefile.in:1.121->1.122 
	kaffe/Makefile.in:1.79->1.80 
	kaffe/kaffe/Makefile.in:1.93->1.94 
	kaffe/scripts/Makefile.in:1.102->1.103 
	kaffe/scripts/compat/Makefile.in:1.85->1.86 
	libraries/javalib/Makefile.in:1.182->1.183 
	test/internal/Makefile.in:1.26->1.27 
	test/regression/compile_time/Makefile.am:1.1->1.2 
	test/regression/compile_time/Makefile.in:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1630 kaffe/ChangeLog:1.1631
--- kaffe/ChangeLog:1.1630	Sun Sep 14 20:01:45 2003
+++ kaffe/ChangeLog	Sun Sep 14 20:09:34 2003
@@ -1,3 +1,20 @@
+2003-09-14  Dalibor Topic <robilad@kaffe.org>
+
+	* test/regression/compile_time/Makefile.am:
+	Don't use GNU make extensions to avoid build problems on platforms
+	using a BSD make.
+
+	* config/Makefile.in,
+	include/Makefile.in,
+	kaffe/Makefile.in,
+	kaffe/kaffe/Makefile.in,
+	kaffe/scripts/Makefile.in,
+	kaffe/scripts/compat/Makefile.in,
+	libraries/javalib/Makefile.in,
+	test/internal/Makefile.in,
+	test/regression/compile_time/Makefile.in:
+	Regenerated.
+
 2003-09-14  Dalibor Topic <robilad@kaffe.org>,
             Helmer Kraemer  <hkraemer@freenet.de>
 
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.87 kaffe/config/Makefile.in:1.88
--- kaffe/config/Makefile.in:1.87	Sun Aug 31 22:08:56 2003
+++ kaffe/config/Makefile.in	Sun Sep 14 20:09:35 2003
@@ -246,9 +246,9 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+@USE_JIT_FALSE@ENGINE_GEN_HDRS = 
 
 @USE_JIT_TRUE@ENGINE_GEN_HDRS = jit-md.h
-@USE_JIT_FALSE@ENGINE_GEN_HDRS = 
 
 @ENABLE_XPROF_TRUE@XPROF_HDRS = xprofile-md.h
 @ENABLE_XPROF_FALSE@XPROF_HDRS = 
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.121 kaffe/include/Makefile.in:1.122
--- kaffe/include/Makefile.in:1.121	Sun Aug 31 22:08:58 2003
+++ kaffe/include/Makefile.in	Sun Sep 14 20:09:36 2003
@@ -384,9 +384,9 @@
 
 
 JNI_DERIVED_HDRS = $(INSTALL_JNI_DERIVED_HDRS) $(NOINSTALL_JNI_DERIVED_HDRS)
+@USE_COMPAT_IFADDRS_FALSE@ifaddrs_compat = #
 
 @USE_COMPAT_IFADDRS_TRUE@ifaddrs_compat = ifaddrs.h
-@USE_COMPAT_IFADDRS_FALSE@ifaddrs_compat = #
 
 nodist_noinst_HEADERS = \
 	$(NOINSTALL_DERIVED_HDRS) \
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.79 kaffe/kaffe/Makefile.in:1.80
--- kaffe/kaffe/Makefile.in:1.79	Sun Aug 31 22:08:59 2003
+++ kaffe/kaffe/Makefile.in	Sun Sep 14 20:09:37 2003
@@ -246,12 +246,12 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+@NEED_LIBXPROF_FALSE@XPROF_SUBDIRS = #
 
 @NEED_LIBXPROF_TRUE@XPROF_SUBDIRS = xprof
-@NEED_LIBXPROF_FALSE@XPROF_SUBDIRS = #
+@ENABLE_JVMPI_FALSE@JVMPI_SUBDIRS = #
 
 @ENABLE_JVMPI_TRUE@JVMPI_SUBDIRS = jvmpi
-@ENABLE_JVMPI_FALSE@JVMPI_SUBDIRS = #
 
 SUBDIRS = kaffeh kaffevm $(XPROF_SUBDIRS) $(JVMPI_SUBDIRS) kaffe scripts man
 subdir = kaffe
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.93 kaffe/kaffe/kaffe/Makefile.in:1.94
--- kaffe/kaffe/kaffe/Makefile.in:1.93	Sun Aug 31 22:09:00 2003
+++ kaffe/kaffe/kaffe/Makefile.in	Sun Sep 14 20:09:37 2003
@@ -248,12 +248,12 @@
 with_engine = @with_engine@
 
 jrebin_PROGRAMS = kaffe-bin
+@NEED_LIBXPROF_FALSE@libxprof = #
 
 @NEED_LIBXPROF_TRUE@libxprof = ../xprof/libkaffexprof.la
-@NEED_LIBXPROF_FALSE@libxprof = #
+@ENABLE_JVMPI_FALSE@libjvmpi = #
 
 @ENABLE_JVMPI_TRUE@libjvmpi = ../jvmpi/libkaffejvmpi.la
-@ENABLE_JVMPI_FALSE@libjvmpi = #
 
 AM_CPPFLAGS = \
 	-I../kaffevm \
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.102 kaffe/kaffe/scripts/Makefile.in:1.103
--- kaffe/kaffe/scripts/Makefile.in:1.102	Sun Aug 31 22:09:08 2003
+++ kaffe/kaffe/scripts/Makefile.in	Sun Sep 14 20:09:38 2003
@@ -261,8 +261,8 @@
 
 
 @SUN_COMPAT_TRUE@SUBDIRS = compat
-@SUN_COMPAT_TRUE@SCRIPTFILES_COMPAT = 
 @SUN_COMPAT_FALSE@SCRIPTFILES_COMPAT = appletviewer javac javadoc
+@SUN_COMPAT_TRUE@SCRIPTFILES_COMPAT = 
 
 @ENABLE_XPROF_TRUE@SCRIPTFILES_XPROF = kaffexprof nm2as.awk
 @ENABLE_XPROF_FALSE@SCRIPTFILES_XPROF = 
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.85 kaffe/kaffe/scripts/compat/Makefile.in:1.86
--- kaffe/kaffe/scripts/compat/Makefile.in:1.85	Sun Aug 31 22:09:10 2003
+++ kaffe/kaffe/scripts/compat/Makefile.in	Sun Sep 14 20:09:38 2003
@@ -246,11 +246,11 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+@SUN_COMPAT_FALSE@jrebin_SCRIPTS = 
 
 @SUN_COMPAT_TRUE@jrebin_SCRIPTS = java
-@SUN_COMPAT_FALSE@jrebin_SCRIPTS = 
-@SUN_COMPAT_TRUE@bin_SCRIPTS = appletviewer javac javadoc
 @SUN_COMPAT_FALSE@bin_SCRIPTS = 
+@SUN_COMPAT_TRUE@bin_SCRIPTS = appletviewer javac javadoc
 subdir = kaffe/scripts/compat
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.182 kaffe/libraries/javalib/Makefile.in:1.183
--- kaffe/libraries/javalib/Makefile.in:1.182	Sat Aug 30 14:18:28 2003
+++ kaffe/libraries/javalib/Makefile.in	Sun Sep 14 20:09:39 2003
@@ -70,6 +70,7 @@
 AWK = @AWK@
 AWT_DIR = @AWT_DIR@
 AWT_LIBS = @AWT_LIBS@
+BCEL_JAR = @BCEL_JAR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CCLD = @CCLD@
@@ -109,11 +110,15 @@
 EXEEXT = @EXEEXT@
 F77 = @F77@
 FFLAGS = @FFLAGS@
+HAVE_BCEL_FALSE = @HAVE_BCEL_FALSE@
+HAVE_BCEL_TRUE = @HAVE_BCEL_TRUE@
 HAVE_CONFIG_JIT_MD_H = @HAVE_CONFIG_JIT_MD_H@
 HAVE_DNSJAVA_FALSE = @HAVE_DNSJAVA_FALSE@
 HAVE_DNSJAVA_TRUE = @HAVE_DNSJAVA_TRUE@
 HAVE_GCJ_SUPPORT_FALSE = @HAVE_GCJ_SUPPORT_FALSE@
 HAVE_GCJ_SUPPORT_TRUE = @HAVE_GCJ_SUPPORT_TRUE@
+HAVE_JASMIN_FALSE = @HAVE_JASMIN_FALSE@
+HAVE_JASMIN_TRUE = @HAVE_JASMIN_TRUE@
 HAVE_JIKES_FALSE = @HAVE_JIKES_FALSE@
 HAVE_JIKES_TRUE = @HAVE_JIKES_TRUE@
 HAVE_MKTEMP_FALSE = @HAVE_MKTEMP_FALSE@
@@ -125,6 +130,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+JASMIN = @JASMIN@
 JAVA_LIBS = @JAVA_LIBS@
 JIKES = @JIKES@
 JIKESPROG = @JIKESPROG@
Index: kaffe/test/internal/Makefile.in
diff -u kaffe/test/internal/Makefile.in:1.26 kaffe/test/internal/Makefile.in:1.27
--- kaffe/test/internal/Makefile.in:1.26	Sun Aug 31 22:09:24 2003
+++ kaffe/test/internal/Makefile.in	Sun Sep 14 20:09:40 2003
@@ -250,12 +250,12 @@
 target_alias = @target_alias@
 toolslibdir = @toolslibdir@
 with_engine = @with_engine@
+@NEED_LIBXPROF_FALSE@libxprof = #
 
 @NEED_LIBXPROF_TRUE@libxprof = ../../kaffe/xprof/libkaffexprof.la
-@NEED_LIBXPROF_FALSE@libxprof = #
+@ENABLE_JVMPI_FALSE@libjvmpi = #
 
 @ENABLE_JVMPI_TRUE@libjvmpi = ../../kaffe/jvmpi/libkaffejvmpi.la
-@ENABLE_JVMPI_FALSE@libjvmpi = #
 
 check_PROGRAMS = jitBasic
 
Index: kaffe/test/regression/compile_time/Makefile.am
diff -u kaffe/test/regression/compile_time/Makefile.am:1.1 kaffe/test/regression/compile_time/Makefile.am:1.2
--- kaffe/test/regression/compile_time/Makefile.am:1.1	Sun Aug 31 22:09:27 2003
+++ kaffe/test/regression/compile_time/Makefile.am	Sun Sep 14 20:09:40 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/compile_time/Makefile.in
diff -u kaffe/test/regression/compile_time/Makefile.in:1.1 kaffe/test/regression/compile_time/Makefile.in:1.2
--- kaffe/test/regression/compile_time/Makefile.in:1.1	Sun Aug 31 22:09:27 2003
+++ kaffe/test/regression/compile_time/Makefile.in	Sun Sep 14 20:09:40 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)