Main Makefile - bug fixed.

*.bmm now needs not be in the ${SRC} directory.

diff --git a/build/Makefile b/build/Makefile
index 401fe882a2cdaa08b93f6b6a62598dcc669e42c9..7e321f020a989cf8491c4896d48be4e475880587 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -63,7 +63,8 @@ else
   BITFILE = ${TOP}.bit
 endif
 
-BMM_BD          = ${basename ${BMM}}_bd.bmm
+BMM_LOCAL       = ${notdir ${BMM}}
+BMM_LOCAL_BD    = ${basename ${BMM_LOCAL}}_bd${suffix ${BMM}}
 
 NGC             = ${TOP}.ngc
 NGD             = ${TOP}.ngd
@@ -100,10 +101,10 @@ re-synthesize ${NGC}: ${SRC}/${PRJ}
 translate: ${NGD}
 re-translate ${NGD}: ${NGC} ${SRC}/${BMM} ${SRC}/${UCF}
 ifneq (${strip ${BMM}},)
-       ln -s -f ${SRC}/${BMM} ${BMM}
+       ln -s -f ${SRC}/${BMM} ${BMM_LOCAL}
 endif
        ngdbuild -intstyle ${INTSTYLE} -p ${DEVICE} -uc ${SRC}/${UCF} \
-         ${addprefix -bm ,${BMM}} \
+         ${addprefix -bm ,${BMM_LOCAL}} \
          ${addprefix -sd ${SRC}/,${SEARCH_DIRS}} \
          ${NGC} \
          ${NGD}
@@ -116,15 +117,15 @@ par: ${NCD}
 re-par ${NCD}: ${NCD_MAP} ${PCF}
        par -intstyle ${INTSTYLE} ${NCD_MAP} ${NCD} ${PCF}
 
-${TOP}.bit ${BMM_BD}: ${NCD}
+${TOP}.bit ${BMM_LOCAL_BD}: ${NCD}
        bitgen -w ${NCD} ${TOP}.bit ${PCF}
 
-${TOP}_elf.bit: ${TOP}.bit ${BMM_BD} ${SRC}/${ELF}
-       data2mem -bm ${BMM_BD} -bd ${SRC}/${ELF} -bt ${TOP}.bit -o b ${TOP}_elf.bit
+${TOP}_elf.bit: ${TOP}.bit ${BMM_LOCAL_BD} ${SRC}/${ELF}
+       data2mem -bm ${BMM_LOCAL_BD} -bd ${SRC}/${ELF} -bt ${TOP}.bit -o b ${TOP}_elf.bit
 
 .PHONY: ${SRC}/${ELF}
 ${SRC}/${ELF}:
-       make -C ${dir $@} ${nodir $@}
+       make -C ${@D} ${@F}
 
 download: ${BITFILE} download-only
 download-only: