X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=2c8b68aac816588afc7eaa0488ae8a95e1fd5a76;hp=88801025ed9d3ee4fe1d3612db0c79cdd48d6f7f;hb=c8598d51fe71ce77d466c02b6fa264617be9335b;hpb=926fe7b5464f609d0b6f26572488b756428e93ec

diff --git a/Makefile b/Makefile
index 8880102..2c8b68a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,12 +18,12 @@ target := $(target_$(platform))
 
 all:         Java2 Linux Win32 Darwin Solaris
 
-clean:      ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class
+clean:      ; rm -rf build
 dist-clean:
 	rm -rf .configure* .install* build .compile .build*
-	find upstream -name config.cache -exec rm {} \;
+	find upstream -name config.cache -exec rm -f {} \;
 	test -e upstream/org.ibex.nestedvm && make -C upstream/org.ibex.nestedvm clean
-	rm .install_org.ibex.nestedvm
+	rm -f .install_org.ibex.nestedvm
 
 libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
 libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
@@ -101,7 +101,7 @@ plat_classes_Solaris  := org.ibex.plat.Solaris $(plat_classes_X11)
 plat_classes_Darwin   := org.ibex.plat.Darwin org.ibex.plat.OpenGL $(plat_classes_POSIX)
 
 plat_java_src_sources     := $(patsubst %,build/java/%.java,$(subst .,/,$(plat_classes_$(platform))))
-java_src_sources          := $(shell find src -name '*.java' | grep -v Preprocessor | grep -v /plat/)
+java_src_sources          := $(shell find src -name '*.java' | grep -v NanoGoat | grep -v Preprocessor | grep -v /plat/)
 java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
 
@@ -159,15 +159,12 @@ java_classes              := $(java_sources:build/java/%.java=build/class/%.clas
 java_classes              += build/class/gnu/regexp/CharUnit.class build/class/gnu/regexp/IntPair.class
 java_classes              += build/class/org/ibex/util/MIPSApps.class
 
-.PRECIOUS: $(java_classes) $(java_sources) *.java upstream/org.ibex.crypto/src/org/ibex/crypto/DER.java
-
 ### Java Source Files ##############################################################################
 
-upstream/org.ibex.crypto/%.java:;   @make .download_org.ibex.crypto
-upstream/org.ibex.nestedvm/%.java:; @make .download_org.ibex.nestedvm
-link_upstream =  build/java/$(1): $(2)/$(1);
-link_upstream += @echo -e "\033[1mlinking            .java -> .java:  $$@\033[0m";
-link_upstream += mkdir -p $$(@D); ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
+$(java_sources):: .download_org.ibex.crypto .download_org.ibex.nestedvm .download_gnu.regexp-1.1.4
+link_upstream  = build/java/$(1):: $(2)/$(1) $(3); \
+                 @echo -e "\033[1mlinking            .java -> .java:  $$@\033[0m"; \
+                 mkdir -p $$(@D); ln -fs `echo $$(@D)/ | sed 's_[^/]*//*_../_g'`/$$< $$@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 $(call link_upstream,org/xwt/mips/%.java,upstream/org.ibex.nestedvm/src,.download_org.ibex.nestedvm)
@@ -175,7 +172,7 @@ $(call link_upstream,org/ibex/crypto/%.java,upstream/org.ibex.crypto/src,.downlo
 $(call link_upstream,org/ibex/net/ssl/%.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
 $(call link_upstream,org/ibex/net/SSL.java,upstream/org.ibex.crypto/src,.download_org.ibex.crypto)
 $(call link_upstream,gnu/regexp/%.java,upstream/gnu.regexp-1.1.4/src/src)
-build/java/org/ibex/%.java: src/org/ibex/%.java build/class/org/ibex/util/Preprocessor.class
+build/java/org/ibex/%.java: src/org/ibex/%.java .download_gnu.regexp-1.1.4 build/class/org/ibex/util/Preprocessor.class
 	@echo -e "\033[1mpreprocessing      .java -> .java:  $<\033[0m"
 	mkdir -p `dirname $@`; java -cp build/class:upstream/gnu.regexp-1.1.4/src/src org.ibex.util.Preprocessor < $< > $@
 $(call link_upstream,%.java,src)
@@ -189,10 +186,12 @@ build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.jav
 	$(javac) $< src/org/ibex/util/Vec.java upstream/gnu.regexp-1.1.4/src/src/gnu/regexp/*.java
 
 compile: .compile
-.compile: .download_org.ibex.nestedvm .download_bcel-5.1 .download_gnu.regexp-1.1.4 $(java_sources)
+.compile: $(java_sources)
 	@echo -e "\n\033[1mcompiling          .java -> .class\033[0m"
 	@echo $(java_sources) | tr ' ' '\n' | sed 's_build/java/_    _' | sed 's_/_._g' | sed 's_.java$$__g'
+	@make -s $(java_sources)
 	$(javac) $(java_sources)
+	touch $@
 
 build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm 
 	@mkdir -p build/java/org/ibex/util
@@ -429,8 +428,12 @@ propose-patch:
 commit: propose-patch
 	darcs push xwt@xwt.org:/var/www/org/ibex/core/
 
-doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.class doc/%.xml
-	cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex
-	cd $(@D); pdflatex `basename $*`.tex
-	open doc/$*.pdf
-
+upstream/org.ibex.doc/src/org/ibex/doc/Doc.java: .download_org.ibex.doc
+build/class/org/ibex/doc/Doc.class: upstream/org.ibex.doc/src/org/ibex/doc/Doc.java
+	$(javac) upstream/org.ibex.doc/src/org/ibex/doc/Doc.java
+doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/doc/Doc.class
+	cd doc/$*; java -cp ../../build/class org.ibex.doc.Doc < $*.xml > $*.tex
+	cd doc/$*; pdflatex $*.tex
+	mv doc/$*/$*.pdf doc/$*.pdf
+	test `uname` == Darwin && open doc/$*.pdf
+reference: ; rm -f doc/reference.pdf; make doc/reference.pdf
\ No newline at end of file