X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c0ed5ac879d3528373e2ce61b9ba29c3fb4a6018;hb=3327346e1a6b76cd6252db8b33eb0b8310596599;hp=7690ad661eb809e2a1bcd3dd8e064b4822fb484f;hpb=23aea54b4e270294024080696610c61ef0267de5;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 7690ad6..c0ed5ac 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,6 @@ java_src_sources          := $(shell find src -name '*.java' | grep -v Preproces
 java_src_sources          += $(plat_java_src_sources)
 java_sources              := $(patsubst src/%.java,     build/java/%.java, $(java_src_sources))
 
-# FIXME ugly
 java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
 java_sources              += build/java/org/xwt/mips/util/SeekableData.java
 java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
@@ -163,24 +162,22 @@ java_classes              += build/class/gnu/regexp/CharUnit.class build/class/g
 
 ### Java Source Files ##############################################################################
 
-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'`/$< $@
-
-build/java/org/ibex/%.java: src/org/ibex/%.java 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 < $< > $@
-
 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);
 link_upstream += 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)
 $(call link_upstream,org/ibex/crypto/%.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,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
+	@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)
 $(call link_upstream,%.cc,src)
 
@@ -379,8 +376,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/o
 	upstream/install/bin/mips-unknown-elf-gcc \
 		--static \
 		-march=mips1 \
-		-T upstream/nestedvm/src/org/xwt/mips/linker.ld \
-		-L upstream/nestedvm/build/org/xwt/mips/ \
+		-T upstream/org.ibex.nestedvm/src/org/xwt/mips/linker.ld \
+		-L upstream/org.ibex.nestedvm/build/org/xwt/mips/ \
 		-L upstream/freetype-2.1.4/src/objs \
 		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
@@ -409,7 +406,7 @@ dist: compile
 	echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-	@darcs push --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+	@darcs send --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";\
@@ -418,7 +415,7 @@ propose-patch:
 	@rm .darcspatch 
 
 commit: propose-patch
-	darcs push --and-apply xwt@xwt.org:/var/www/org/ibex/core/
+	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