X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=becfcd725e77a3c67f39e92510aa840916aa3eff;hb=407497fcfdec3b3112b17cbcb6a800326cb49431;hp=9c249c136a06efa8e58ac4d6ec576dc317907b2a;hpb=032661c3770e2df9b19495ceeff402c42e17738e;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 9c249c1..becfcd7 100644
--- a/Makefile
+++ b/Makefile
@@ -77,11 +77,11 @@ build/h/%.h: build/class/%.class .compile
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
 	ls `echo $< | sed s/.class\$$//`*.class |\
-		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/gcjh -d ../h --classpath .)
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/$(target)-gcjh -d ../h --classpath .)
 
 # a hack since we've disabled gcj's awt implementation
-build/$(platform)/org/xwt/plat/Java2.java.o: ; touch $@
-build/$(platform)/org/xwt/plat/AWT.java.o: ; touch $@
+build/$(platform)/org/xwt/plat/Java2.java.o: ; mkdir -p $(@D); touch $@
+build/$(platform)/org/xwt/plat/AWT.java.o: ; mkdir -p $(@D); touch $@
 
 build/$(platform)/%.java.o: build/java/%.java
 	@echo -e "\n\033[1mcompiling          .java -> .o:     $<\033[0m"
@@ -91,7 +91,7 @@ build/$(platform)/%.java.o: build/java/%.java
 build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc $(java_headers)
 	@echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
-	$(g++) -I/usr/X11R6/include/ -Iupstream/install/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
+	$(g++) -I/usr/X11R6/include/ -Iupstream/install/include -Ibuild/h -Iupstream/$(target)/include -Wno-multichar -c $< -o $@
 
 build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
 	@echo -e "\n\033[1mcompiling             .c -> .o:     $<\033[0m"