reduce whineage originating from tupshin

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 7f1d74a..2c873c6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,10 @@ gcc_flags          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6
 gcc_flags          += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
 gcc_flags          += -ffunction-sections -fdata-sections -fno-omit-frame-pointer
 gcj                := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
-gcj                += -fassume-compiled -fmerge-all-constants -finhibit-reflection
+ifneq ($(platform),Darwin)
+gcj                += -finhibit-reflection
+endif
+gcj                += -fassume-compiled -fmerge-all-constants
 gcj                += -foptimize-static-class-initialization -feliminate-dwarf2-dups -w
 gcjh               := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
 g++                := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
@@ -406,7 +409,7 @@ dist: compile
        echo -e "\n\n\n*** DONE ******************************************"
 
 propose-patch:
-       @darcs push --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
+       @darcs send --edit-description -o .darcspatch -T patches@xwt.org http://core.ibex.org/
        @(echo "To: patches@xwt.org";\
         SUB=`grep -A10000 New.patches .darcspatch | grep '^\\[' | cut -b 2- | tr \\\n , | sed s_,_,\ _g | sed "s_, *\\$$__"`;\
         echo "Subject: $$SUB";\
@@ -415,7 +418,7 @@ propose-patch:
        @rm .darcspatch 
 
 commit: propose-patch
-       darcs push --and-apply xwt@xwt.org:/var/www/org/ibex/core/
+       darcs push xwt@xwt.org:/var/www/org/ibex/core/
 
 doc/%.pdf: build/class/org/ibex/util/XML.class build/class/org/ibex/util/Doc.class doc/%.xml
        cd $(@D); java -cp ../../build/class org.ibex.util.Doc slides < `basename $*`.xml > `basename $*`.tex