[fbt-commit] SF.net SVN: fbt:[84] trunk/bin/Makefile.inc

[<dav...@us...>]

Revision: 84
          http://fbt.svn.sourceforge.net/fbt/?rev=84&view=rev
Author:   dave_infj
Date:     2010-03-01 17:29:53 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
MAP now seems to require a -w flag (ISE 11)

Separate out cores from make clean.  Now include make mproper to clean cores 
as well.

Fix placement of -r in SIMP_OPTS

Modified Paths:
--------------
    trunk/bin/Makefile.inc

Modified: trunk/bin/Makefile.inc
===================================================================
--- trunk/bin/Makefile.inc	2010-03-01 16:58:05 UTC (rev 83)
+++ trunk/bin/Makefile.inc	2010-03-01 17:29:53 UTC (rev 84)
@@ -99,13 +99,13 @@
 #
 
 # Add mandatory arguments
-SIMP_OPTS	+=			 $(foreach F,$(SIMLIBPATH)  ,-l $(F)) \
+SIMP_OPTS	+= -r $(SIMTOP) -p $(PART) $(foreach F,$(SIMLIBPATH)  ,-l $(F)) \
 					 $(foreach F,$(SIM_DAR)	    ,-D $(F)) 
 SYNTH_OPTS	+= -r $(TOP) -p $(PART)  $(foreach F,$(SYNTHLIBPATH),-l $(F)) \
 		      	     		 $(foreach F,$(SYN_CONSTR)  ,-k $(F)) \
 					 $(foreach F,$(SYN_DAR)     ,-D $(F)) 
 NGDBUILD_OPTS	+= -p $(PART) -a 	 $(foreach F,$(NGOLIBPATH)  ,-sd $(F))
-MAP_OPTS	+= -p $(PART) -pr b
+MAP_OPTS	+= -w -p $(PART) -pr b
 PAR_OPTS	+= -w
 BITGEN_OPTS	+= -w 
 
@@ -144,7 +144,7 @@
 			make -sf $(lastword $(MAKEFILE_LIST)) -C '{}' deps \;  
 
 sim:
-	$(MKVPROJ) sim -r $(SIMTOP) $(SIMP_OPTS)
+	$(MKVPROJ) sim $(SIMP_OPTS)
 	make -f modelsim.mk all
 
 irun:
@@ -157,12 +157,16 @@
 
 # Remove build intermediates
 clean:
-	rm -rf *~ work/ cores/ transcript vsim.wlf modelsim.mk coregen.mk \
+	rm -rf *~ work/ transcript vsim.wlf modelsim.mk \
 		*.{prj,prd,edf,ncf,log,synlog} build/ \
 		*_{fpga_editor.out,pad.txt} xlnx_auto_0* \
 		*.{lst,bgn,bld,drc,map,mrp,ncd,ng[dmo],pcf} \
 		*.{xml,pad,par,unroutes,xpi,csv,bit,xrpt,ptwx}
 
+mrproper: clean
+	[ -f coregen.mk ] && make -f coregen.mk clean || true
+	rm -rf cores/ coregen.mk
+
 ################################################################################
 #
 # Implicit rules


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.