|
Message
From: cvs at opencores.org<cvs@o...>
Date: Fri Apr 13 15:35:01 CEST 2007
Subject: [cvs-checkins] MODIFIED: jop ...
Date: 00/07/04 13:15:35 Modified: jop Makefile
Log:
use -f on rm
Revision Changes Path
1.64 jop/Makefile
http://www.opencores.org/cvsweb.shtml/jop/Makefile.diff?r1=1.63&r2=1.64
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Makefile
===================================================================
RCS file: /cvsroot/martin/jop/Makefile,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- Makefile 4 Nov 2006 23:51:50 -0000 1.63
+++ Makefile 13 Apr 2007 13:35:01 -0000 1.64
@@ -175,7 +175,7 @@
# build all the (Java) tools
#
tools:
- -rm -r $(TOOLS)/dist
+ -rm -rf $(TOOLS)/dist
mkdir $(TOOLS)/dist
mkdir $(TOOLS)/dist/lib
mkdir $(TOOLS)/dist/classes
@@ -193,7 +193,7 @@
# compile and JOPize the application
#
java_app:
- -rm -r $(TARGET)/dist
+ -rm -rf $(TARGET)/dist
mkdir $(TARGET)/dist
mkdir $(TARGET)/dist/classes
mkdir $(TARGET)/dist/lib
@@ -206,7 +206,7 @@
-cp $(TARGET)/dist/lib/classes.zip -o $(TARGET)/dist/bin/$(JOPBIN) $(MAIN_CLASS)
java $(TOOLS_CP) com.jopdesign.tools.jop2dat $(TARGET)/dist/bin/$(JOPBIN)
cp *.dat modelsim
- rm *.dat
+ rm -f *.dat
# we moved the pc stuff to it's own target to be
# NOT built on make all.
@@ -266,10 +266,10 @@
qsyn:
echo $(QBT)
echo "building $(QBT)"
- -rm -r quartus/$(QBT)/db
- -rm quartus/$(QBT)/jop.sof
- -rm jbc/$(QBT).jbc
- -rm rbf/$(QBT).rbf
+ -rm -rf quartus/$(QBT)/db
+ -rm -f quartus/$(QBT)/jop.sof
+ -rm -f jbc/$(QBT).jbc
+ -rm -f rbf/$(QBT).rbf
quartus_map quartus/$(QBT)/jop
quartus_fit quartus/$(QBT)/jop
quartus_asm quartus/$(QBT)/jop
@@ -376,7 +376,7 @@
@echo $(QPROJ)
for target in $(QPROJ); do \
echo "building $$target"; \
- rm -r quartus/$$target/db; \
+ rm -rf quartus/$$target/db; \
qp="quartus/$$target/jop"; \
echo $$qp; \
quartus_map $$qp; \
@@ -394,7 +394,7 @@
@echo $(QPROJ)
for target in $(QPROJ); do \
echo "building $$target"; \
- rm -r quartus/$$target/db; \
+ rm -rf quartus/$$target/db; \
qp="quartus/$$target/jop"; \
echo $$qp; \
quartus_map $$qp; \
@@ -425,7 +425,7 @@
# (see: http://www.graphviz.org/)
# jline: it will insert Java source code into the bytecode tables
wcet:
- -rm -r $(TARGET)/wcet
+ -rm -rf $(TARGET)/wcet
-mkdir $(TARGET)/wcet
java $(TOOLS_CP) -Dlatex=false -Ddot=true -Djline=true -Dls=true com.jopdesign.wcet.WCETAnalyser \
-mm $(WCET_METHOD) \
|
 |
Browse
