projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2003/09/25 12:05:00
[org.ibex.core.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
7d0cb52
..
70ef00d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-68,11
+68,13
@@
build/class/%.class: build/java/%.java .jikes
mkdir -p build/class
./.jikes $<
mkdir -p build/class
./.jikes $<
+# this forces a clean build every time because jikes is so damn buggy
compile: .compile
compile: .compile
-.compile: $(all_java_sources)
+.compile: $(all_java_sources) .jikes
@echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
@echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
+ rm -rf build/class
mkdir -p build/class
mkdir -p build/class
- @./.jikes $^
+ @./.jikes $(all_java_sources)
touch .compile
# PHASE 4: gcj-generated headers
touch .compile
# PHASE 4: gcj-generated headers
@@
-116,7
+118,7
@@
jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
-build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
+build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
@echo -e "\n\033[1marchiving .o -> .a\033[0m"
mkdir -p build/$(platform)
upstream/install/bin/$(target)-ar rc $@ $?
@echo -e "\n\033[1marchiving .o -> .a\033[0m"
mkdir -p build/$(platform)
upstream/install/bin/$(target)-ar rc $@ $?
@@
-151,7
+153,7
@@
build/$(platform)/builtin.o: build/res/builtin.jar
# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
gcj: .vendor .install_gcc-3.3_$(target) $(target_bin)
# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
gcj: .vendor .install_gcc-3.3_$(target) $(target_bin)
-build/JVM/xwt.jar: $(java_sources:build/java/%.java=build/class/%.class) build/res/builtin.jar
+build/JVM/xwt.jar: .compile build/res/builtin.jar
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest