2003/09/15 10:32:33

darcs-hash:20040130073534-2ba56-bf18716d34f857ba5f3b9df8aa75976e895ecf72.gz

diff --git a/Makefile b/Makefile
index 47ceb8c..e68926d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,21 +41,23 @@ include Makefile.upstream
 
 # figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
 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_\ .\*__)
 
 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))
+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= )
+ifeq ($(platform),)
+plat_deps         := $(shell make -s superclass_org.xwt.plat.$(platform) platform= )
+endif
+
 # HACK: FIXME
 ifeq ($(platform),Darwin)
-plat_deps         += org.xwt.plat.OpenGL
+plat_deps         += build/java/org/xwt/plat/OpenGL.java
 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))
+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'`/$< $@
@@ -63,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 $@
@@ -75,7 +77,7 @@ 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 $^