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/06/18 06:02:39
[org.ibex.core.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
8967d34
..
e0a2a23
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-27,7
+27,7
@@
c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
gcc_path := $(shell pwd)/gcc/install
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
#gcc_optimzations += -funroll-loops -ffunction-sections -fdata-sections
gcc_path := $(shell pwd)/gcc/install
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
#gcc_optimzations += -funroll-loops -ffunction-sections -fdata-sections
-gcc_optimizations := -O0
+gcc_optimizations := -O2
debug :=
gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg
gcj_flags := -fCLASSPATH=bin
debug :=
gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg
gcj_flags := -fCLASSPATH=bin
@@
-52,11
+52,11
@@
PATH := jikes-1.18/bin:$(PATH)
## Platform-Neutral ###########################################################################
ifneq ($(verbose),true)
## Platform-Neutral ###########################################################################
ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) compile
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
silent := --silent
endif
silent := --silent
endif
-compile: bin/org/xwt/builtin.xwar
+compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
echo "compiling .java -> .class:"
mkdir -p bin
$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
echo "compiling .java -> .class:"
mkdir -p bin
$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
@@
-161,6
+161,10
@@
$(java_headers): bin/%.h: bin/%.class
sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
xargs $(gcjh) --classpath .
sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
xargs $(gcjh) --classpath .
+# special rule to stop GCJ from choking
+bin-$(platform)/org/xwt/SpecialBoxProperty.java.o: src/org/xwt/SpecialBoxProperty
+ $(gcj) -c bin/org/xwt/SpecialBoxProperty*.class -o bin-$(platform)/org/xwt/SpecialBoxProperty.java.o
+
$(java_objects): bin-$(platform)/%.java.o: src/%.java
@echo "compiling .java -> .o: $<"
mkdir -p `dirname $@`
$(java_objects): bin-$(platform)/%.java.o: src/%.java
@echo "compiling .java -> .o: $<"
mkdir -p `dirname $@`
@@
-269,7
+273,8
@@
current_build := $(shell cat next.build)
this_branch := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
this_branch_flag := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
this_branch := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
this_branch_flag := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
-dist:
+# pre-depend on compile as a sanity check
+dist: compile
# this will fail if we haven't checked-in since the comment is null; we want this.
cvs commit -m '' > /dev/null
cvs tag -F xwt-$(current_build)
# this will fail if we haven't checked-in since the comment is null; we want this.
cvs commit -m '' > /dev/null
cvs tag -F xwt-$(current_build)