projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
926fe7b
)
fixed bug 548
author
adam
<adam@megacz.com>
Fri, 16 Apr 2004 00:52:25 +0000
(
00:52
+0000)
committer
adam
<adam@megacz.com>
Fri, 16 Apr 2004 00:52:25 +0000
(
00:52
+0000)
darcs-hash:
20040416005225
-5007d-
2faa075b4ff8666ff92ffac2e23bd2fbc1f94953
.gz
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
8880102
..
b6760b7
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,9
+21,9
@@
all: Java2 Linux Win32 Darwin Solaris
clean: ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class
dist-clean:
rm -rf .configure* .install* build .compile .build*
clean: ; rm -rf build; rm build/class/org/ibex/util/Preprocessor.class
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
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
libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
@@
-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
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 ##############################################################################
### 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)
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)
@@
-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
$(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'
@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)
$(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
build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_org.ibex.nestedvm
@mkdir -p build/java/org/ibex/util