X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=cd73b3eecc2526fd50ea4f3e8b9840634a7faa59;hb=580248abbbcfcbf7a7c28cc2a00a97c305ef99ad;hp=99c3a5d8918e1bf1c4d2c7a8944c48fb56c88b9e;hpb=a387411b33712c81b643aee2c07e37c7e2ec21f5;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 99c3a5d..cd73b3e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,10 @@
 
 all:      JVM Linux Win32 Darwin Solaris
 
+clean:
+	rm -rf .jikes .configure* .install* build .compile
+	find upstream -name config.cache -exec rm {}\;
+
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
@@ -79,7 +83,7 @@ compile: .compile
 
 # PHASE 4: gcj-generated headers
 java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
-build/h/edu/stanford/ejalbert/BrowserLauncher.h:; touch $@
+build/h/edu/stanford/ejalbert/BrowserLauncher.h:; mkdir -p $(@D); touch $@
 build/h/%.h: build/class/%.class
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
@@ -119,16 +123,16 @@ jpeg_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
 
-build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
 	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
 	mkdir -p build/$(platform)
 	upstream/install/$(target)/bin/ar rc $@ $?
 	upstream/install/$(target)/bin/ranlib $@
 
-$(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a 
+$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar 
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib $^ build/$(platform)/org/xwt/plat/$(platform).java.o $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
 
 
 ##############################################################################
@@ -238,10 +242,6 @@ this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $
 
 # pre-depend on compile as a sanity check
 dist: compile
-	# this will fail if we haven't checked-in since the comment is null; we want this.
-	cvs commit -m '' > /dev/null
-	cvs tag -F xwt-$(current_build)
-
 	echo "***********************************************************"
 	echo "*  This build is $(current_build)"
 	echo "***********************************************************"
@@ -252,7 +252,12 @@ dist: compile
 		tail -n 200 .make-dist.out | \
 			mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
         else
-		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+		# this will fail if we haven't checked-in since the comment is null; we want this.
+		cvs commit -m '' > /dev/null
+		cvs tag -F xwt-$(current_build)
+
+#		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt\n date=`date +%d-%b-%H%M`\n mkdir xwt-$$date\n cd xwt-$$date\n /usr/bin/cvs -d /cvs co $(this_branch_flag) xwt\n mv xwt/* .\n mv xwt/.* .\n rmdir xwt\n touch .make-dist.out\n nohup make dist &\n echo\n cat .make-dist.out' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+		echo -e 'export JAVA_HOME=/usr/lib/j2sdk1.4\n cd /home/xwt/dist\n/usr/bin/cvs update $(this_branch_flag)\ntouch .make-dist.out\n make clean\n nohup make dist &\n' | ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
         endif
 
 dist-private:
@@ -275,9 +280,9 @@ dist-private:
 	upstream/install/i686-pc-linux-gnu/bin/strip build/Linux/xwt.linux \
 		-o /var/www/master.dist.xwt.org/xwt-$(current_build).linux.unsigned
 
-	echo "copying xwt.solaris to distribution area..."
-	upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
-		-o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
+#	echo "copying xwt.solaris to distribution area..."
+#	upstream/install/sparc-sun-solaris2.7/bin/strip build/Solaris/xwt.solaris \
+#		-o /var/www/master.dist.xwt.org/xwt-$(current_build).solaris.unsigned
 
 	echo "copying xwt.darwin to distribution area..."
 	upstream/install/powerpc-apple-darwin/bin/strip build/Darwin/xwt.darwin \