X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=2c8b68aac816588afc7eaa0488ae8a95e1fd5a76;hp=b6760b706ec9a1f625a25bd1ddbfb7ae9e017b8a;hb=72330a2e158829db60c433778f52be2c8d646eb2;hpb=538f919137a5241bfe8564eeac6a030f84383e06

diff --git a/Makefile b/Makefile
index b6760b7..2c8b68a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ 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 -f {} \;
@@ -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))
 
@@ -172,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)
@@ -428,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