X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=c91c7bbeea241187efa48c3320a111c50bfe4fc8;hb=058add49387efda3b680ea32bd6b519d7bc066f3;hp=de4127166368ab7c1e86f1d6bbdc7796e732295b;hpb=9f040d44d071afbbf19e7d5e494b2e22ce605dbf;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index de41271..c91c7bb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@
 ## Configurables ###########################################################################
 
 # inputs
-javac_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+javac_java_sources     := $(shell find src -name \*.java)
+gcj_java_sources       := $(shell find src -name \*.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
 xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
 cc_sources             := src/org/xwt/plat/$(platform).cc
 
@@ -142,12 +142,12 @@ link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
 bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
 
 $(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
-	echo -ne "compiling  .java -> .o:     $<"
+	echo "compiling  .java -> .o:     $<"
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
 $(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
-	echo -ne "compiling  .cc -> .o:     $$A"
+	echo "compiling  .cc -> .o:     $$A"
 	$(gcc) -Ibin -c $< -o $@
 
 bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
@@ -181,7 +181,7 @@ Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
 	echo "archiving .class -> .jar"
 	mkdir -p bin-Java2
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
-	cd bin; $(jar) cvf ../bin-Java2/xwt.jar -m .manifest \
+	cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
                 org/xwt/builtin.xwar \
 		`find . -name \*.class | grep -v org/xwt/plat/` \
 		org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015