projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2004/01/11 00:49:54
[org.ibex.core.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
cf6a357
..
07304a1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-50,7
+50,6
@@
include Makefile.upstream
# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
-java_sources += build/java/org/xwt/translators/MIPSApps.java
all_java_sources := $(java_sources)
nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
all_java_sources := $(java_sources)
nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
@@
-75,9
+74,9
@@
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'`/$< $@
@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/xwt/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
+build/class/org/xwt/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
- mkdir -p build/class/org/xwt/util/
+ mkdir -p build/class/org/xwt/translators
./.jikes -g:none $<
build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
./.jikes -g:none $<
build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
@@
-94,7
+93,7
@@
build/class/org/xwt/mips/Compiler.class: src/org/xwt/mips/*.java
# this forces a clean build every time because jikes is so damn buggy
preprocess: $(java_sources)
compile: .compile
# this forces a clean build every time because jikes is so damn buggy
preprocess: $(java_sources)
compile: .compile
-.compile: $(java_sources) .jikes
+.compile: build/class/org/xwt/translators/MIPSApps.class $(java_sources) .jikes
@echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
@rm -f $(java_sources:build/java/%.java=build/class/%.class)
mkdir -p build/class
@echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
@rm -f $(java_sources:build/java/%.java=build/class/%.class)
mkdir -p build/class
@@
-188,7
+187,9
@@
build/JVM/xwt.jar: .compile build/res/builtin.jar
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
- cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . \! -type d`;
+ cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+ `find . \! -type d \! -path './org/xwt/mips/*'` \
+ $(patsubst %,org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
@@
-196,8
+197,9
@@
build/JVM/xwt.jar: .compile build/res/builtin.jar
# Freetype
#
# Freetype
#
-build/mips/%.c.o: .download_libmspack-20030726 src/%.c
+build/mips/%.c.o: src/%.c .download_libmspack-20030726
make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+ make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
mkdir -p $(@D)
echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
mkdir -p $(@D)
echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
@@
-221,8
+223,8
@@
build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
-o $@ \
$^ \
-lfreetype \
-o $@ \
$^ \
-lfreetype \
- -lmspack
-
+ -lmspack \
+ -Wl,--gc-sections
##############################################################################
# Maintainer stuff: generating numbered builds, proposing patches
##############################################################################
# Maintainer stuff: generating numbered builds, proposing patches