[kaffe] CVS kaffe (hkraemer): fix for non-gnu makes

Kaffe CVS cvs-commits at kaffe.org
Sat Jul 10 02:35:16 PDT 2004


PatchSet 4925 
Date: 2004/07/10 09:30:07
Author: hkraemer
Branch: HEAD
Tag: (none) 
Log:
fix for non-gnu makes

Members: 
	ChangeLog:1.2490->1.2491 
	Makefile.am:1.70->1.71 
	Makefile.in:1.164->1.165 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2490 kaffe/ChangeLog:1.2491
--- kaffe/ChangeLog:1.2490	Sat Jul 10 07:45:20 2004
+++ kaffe/ChangeLog	Sat Jul 10 09:30:07 2004
@@ -1,3 +1,12 @@
+2004-07-10  Helmer Kraemer  <hkraemer at freenet.de>
+
+	* Makefile.am (kaffe-build-order): don't use -C option since it's
+	not available on all makes
+
+	* Makefile.in: regenerated
+	
+	Reported by: Riccardo Mottola  <zuse at libero.it>
+	
 2004-07-10  Guilhem Lavaux <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/ksem.c: Removed a commented assertion.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.70 kaffe/Makefile.am:1.71
--- kaffe/Makefile.am:1.70	Thu Jul  8 14:10:49 2004
+++ kaffe/Makefile.am	Sat Jul 10 09:30:12 2004
@@ -209,16 +209,16 @@
 
 kaffe-build-order:
 	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
+		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
 	done; \
-	$(MAKE) -C libraries/javalib $(KAFFE_BUILD_TARGET) || exit $$? ; \
+	(cd libraries/javalib && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
 	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
+		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
 	done ;
 
 all-local: KAFFE_BUILD_TARGET = all
 all-local: kaffe-build-order
-	$(MAKE) -C kaffe/kaffe final-executable
+	cd kaffe/kaffe && $(MAKE) final-executable
 
 install-exec-hook: KAFFE_BUILD_TARGET = install-exec
 install-exec-hook: kaffe-build-order
@@ -233,4 +233,4 @@
 clean-local: kaffe-build-order
 
 check-local:
-	$(MAKE) -C test check
+	cd test && $(MAKE) check
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.164 kaffe/Makefile.in:1.165
--- kaffe/Makefile.in:1.164	Thu Jul  8 14:10:49 2004
+++ kaffe/Makefile.in	Sat Jul 10 09:30:12 2004
@@ -968,16 +968,16 @@
 
 kaffe-build-order:
 	@list="$(DIRECTORIES_BEFORE_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
+		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
 	done; \
-	$(MAKE) -C libraries/javalib $(KAFFE_BUILD_TARGET) || exit $$? ; \
+	(cd libraries/javalib && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
 	list="$(DIRECTORIES_AFTER_RTJAR)"; for subdir in $$list; do \
-		$(MAKE) -C $$subdir $(KAFFE_BUILD_TARGET) || exit $$? ; \
+		(cd $$subdir && $(MAKE) $(KAFFE_BUILD_TARGET)) || exit $$? ; \
 	done ;
 
 all-local: KAFFE_BUILD_TARGET = all
 all-local: kaffe-build-order
-	$(MAKE) -C kaffe/kaffe final-executable
+	cd kaffe/kaffe && $(MAKE) final-executable
 
 install-exec-hook: KAFFE_BUILD_TARGET = install-exec
 install-exec-hook: kaffe-build-order
@@ -992,7 +992,7 @@
 clean-local: kaffe-build-order
 
 check-local:
-	$(MAKE) -C test check
+	cd test && $(MAKE) check
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:




More information about the kaffe mailing list