From 462815dfe90ad0e1950c240aa11dc7b8b4167dbd Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:35:32 +0000 Subject: [PATCH] 2003/09/15 09:41:54 darcs-hash:20040130073532-2ba56-7f79d8a0abb442377cc33ca138f795538930ff93.gz --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 24e3edd..47ceb8c 100644 --- a/Makefile +++ b/Makefile @@ -39,13 +39,6 @@ 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 $* @@ -53,7 +46,14 @@ superclass_%: 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:; 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)) -- 1.7.10.4