From: adam <adam@megacz.com>
Date: Wed, 14 Apr 2004 20:53:56 +0000 (+0000)
Subject: fix link order
X-Git-Tag: 01-July-2005~154
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=3327346e1a6b76cd6252db8b33eb0b8310596599

fix link order

darcs-hash:20040414205356-5007d-dffeacfb7a94adbf5a6e136c0005a5df881dcf6a.gz
---

diff --git a/Makefile b/Makefile
index b821aeb..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)