2003/09/15 09:41:54

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 14f3505..47ceb8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,22 +39,22 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 
 include Makefile.upstream
 
-# HACK: FIXME
-ifeq ($(platform),Darwin)
-superclass_org.xwt.plat.Platform:; echo org.xwt.plat.OpenGL
-else
-superclass_org.xwt.plat.Platform:;
-endif
-
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
 superclass_%: 
        @echo $*
        @make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__)
 
 all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
-java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
-java_sources      += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name \*.java.pp))
+all_java_sources  += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name \*.java.pp))
+
+superclass_org.xwt.plat.Platform:;
 plat_deps         := $(shell test x$(platform) == x"" || make -s superclass_org.xwt.plat.$(platform) platform= )
+# HACK: FIXME
+ifeq ($(platform),Darwin)
+plat_deps         += org.xwt.plat.OpenGL
+endif
+
+java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
 java_sources      += $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps))
 
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
@@ -82,7 +82,7 @@ compile: .compile
        touch .compile
 
 # PHASE 4: gcj-generated headers
-java_headers          := $(all_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 $@`