bugs 520 and 524

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 5e390cf..3369b98 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#############################################################################
+############################################################################# 
 #
 # The Ibex Makefile
 #
@@ -18,7 +18,7 @@ target := $(target_$(platform))
 
 all:         Java2 Linux Win32 Darwin Solaris
 
-clean:      ; rm -rf build
+clean:      ; rm -rf build; rm .preprocessor
 dist-clean:
        rm -rf .jikes .configure* .install* build .compile .build*
        find upstream -name config.cache -exec rm {} \;
@@ -84,7 +84,7 @@ include Makefile.upstream
 #              xargs --replace make -s superclass_org.ibex.plat.{}
 
 plat_classes_AWT     := org.ibex.plat.AWT
-plat_classes_Java2   := org.ibex.plat.Java2 $(plat_classes_AWT)
+plat_classes_Java2   := org.ibex.plat.Java2 org.ibex.plat.JVM $(plat_classes_AWT)
 plat_classes_GCJ     := org.ibex.plat.GCJ
 plat_classes_Win32   := org.ibex.plat.Win32 $(plat_classes_GCJ)
 plat_classes_POSIX   := org.ibex.plat.POSIX $(plat_classes_GCJ)
@@ -368,7 +368,7 @@ dist: compile
        echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-       @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://darcs.ibex.org/ibex/
+       @darcs push --and-apply --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
        @(echo "To: patches@xwt.org";\
         SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
         echo "Subject: $$SUB";\
@@ -376,3 +376,12 @@ propose-patch:
         cat .darcspatch) | /usr/sbin/sendmail -bm -f $(USER)@xwt.org patches@xwt.org;
        @rm .darcspatch 
 
+commit: propose-patch
+       darcs push --and-apply 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 < `basename $*`.xml > `basename $*`.tex
+       cd $(@D); pdflatex `basename $*`.tex
+       open doc/$*.pdf
+
+