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 (parent:
4b35fea
)
2003/11/05 06:22:09
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:40:59 +0000
(07:40 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:40:59 +0000
(07:40 +0000)
darcs-hash:
20040130074059
-2ba56-
4b090d581cb8fa277d956ae1a488eeb20fd843d5
.gz
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
12dcc02
..
9620e92
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-47,28
+47,25
@@
include Makefile.upstream
# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
all_java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java'))
# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
all_java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java'))
-all_java_sources += $(patsubst src/%.java.pp, build/java/%.java, $(shell find src -name '*.java.pp'))
java_sources := $(all_java_sources)
nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
plat_java_sources := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
java_sources := $(all_java_sources)
nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
plat_java_sources := $(filter build/java/org/xwt/plat/%, $(all_java_sources))
+build/java/org/xwt/%.java: src/org/xwt/%.java
+ make build/class/org/xwt/util/Preprocessor.class
+ @echo -e "\n\033[1mpreprocessing .java -> .java: $<\033[0m"
+ mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
build/java/%.java: src/%.java ; @echo linking $@; 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/c/jpeg/%.c: upstream/jpeg-6b/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/cc/%.cc: src/%.c ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
build/c/jpeg/%.c: upstream/jpeg-6b/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/%.java: src/%.java.pp
- make build/class/org/xwt/util/Preprocessor.class
- @echo -e "\n\033[1mpreprocessing .java.pp -> .java: $<\033[0m"
- mkdir -p `dirname $@`
- rm -f $@
- java -cp build/class org.xwt.util.Preprocessor < $< > $@
-
-build/class/%.class: build/java/%.java .jikes
+build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
- mkdir -p build/class
+ mkdir -p build/class/org/xwt/util/
./.jikes $<
# this forces a clean build every time because jikes is so damn buggy
./.jikes $<
# this forces a clean build every time because jikes is so damn buggy