2003/09/15 10:32:33

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index e89bfd9..e68926d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,15 +40,24 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-superclass_org.xwt.plat.Platform:; echo org.xwt.plat.OpenGL
 superclass_%: 
-       @echo $*
+       @echo $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $*)
        @make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__)
 
-plat_deps         := $(make -s superclass_org.xwt.plat.$(platform) platform= )
-java_sources      := $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps))
-java_sources      += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name \*.java.pp))
-java_sources      += $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/plat/*'))
+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'))
+
+superclass_org.xwt.plat.Platform:;
+ifeq ($(platform),)
+plat_deps         := $(shell make -s superclass_org.xwt.plat.$(platform) platform= )
+endif
+
+# HACK: FIXME
+ifeq ($(platform),Darwin)
+plat_deps         += build/java/org/xwt/plat/OpenGL.java
+endif
+
+java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) $(plat_deps)
 
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
@@ -56,7 +65,7 @@ build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
        @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
 
 build/java/%.java: src/%.java.pp
-       @make -s build/class/org/xwt/util/Preprocessor.class
+       make build/class/org/xwt/util/Preprocessor.class
        @echo -e "\n\033[1mpreprocessing   .java.pp -> .java:  $<\033[0m"
        mkdir -p `dirname $@`
        rm -f $@
@@ -68,14 +77,14 @@ build/class/%.class: build/java/%.java .jikes
        @./.jikes $<
 
 compile: .compile
-.compile: $(java_sources) $(patsubst src/%, build/java/%, $(shell ls src/org/xwt/plat/*.java))
+.compile: $(all_java_sources)
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
        mkdir -p build/class
        @./.jikes $^
        touch .compile
 
 # PHASE 4: gcj-generated headers
-java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
+java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h) 
 build/h/%.h: build/class/%.class .compile
        @echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
        mkdir -p `dirname $@`
@@ -112,8 +121,7 @@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 $(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)
-       echo "link flags are $(link_flags)"
-       MACOSX_DEPLOYMENT_TARGET=10.2 PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags)
+       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags)
 
 
 ##############################################################################