ROM files in Z180 dir

diff --git a/Z180/Makefile b/Z180/Makefile
index 63483a07187e0d566d5956085910373f63fe4e6b..f676826451554e79175127a0fb0dd7107f3d7eed 100644 (file)
--- a/Z180/Makefile
+++ b/Z180/Makefile
@@ -34,11 +34,11 @@ LN_DATA = C000
 #.suffixes: .180 .rel
 
 .phony: all
-all: ../stm32/hdrom.c ../stm32/hdrom.h
+all: hdrom.c hdrom.h
 
 $(OBJ):  $(INC)
 
-../stm32/hdrom.h: ../stm32/hdrom.c
+hdrom.h: hdrom.c
 
 comma:= ,
 empty:=
@@ -80,7 +80,7 @@ if [ "$${ERROR}" != "0" ]; then cat $${OUTPUT}; rm -f $@; fi ; \
 exit $${ERROR}
 endef
 
-../stm32/hdrom.c: hdrom.hex    
+hdrom.c: hdrom.hex     
        srec_cat -o $@ -c_array $(basename $<) -C_COMpressed -include $< -Intel
 
 hdrom.hex : $(OBJ)

diff --git a/stm32/Rules.mk b/stm32/Rules.mk
index 7811f8bc7ca42d147b7080da1760103d60ed32d9..ddc8db34c4824eb6ab23f9a08d162c5309d3fabd 100644 (file)
--- a/stm32/Rules.mk
+++ b/stm32/Rules.mk
@@ -2,10 +2,14 @@
 BINARY         := z180-stamp-stm32
 P_BINARY       := $(OBJPATH)/$(BINARY)
 
-TARGETS                := $(BINARY).elf #$(BINARY).bin
+TARGETS                := $(BINARY).elf
 
-SRCS := z180-stamp-stm32.c serial.c z80-if.c hdrom.c
+###############################################################################
+# Source files
 
+SRCS := z180-stamp-stm32.c serial.c z80-if.c hdrom.c 
+
+SRCS_VPATH := ../Z180
 
 LIBNAME                = opencm3_stm32f1
 DEFS           = -DSTM32F1 -DDEBUG=2
@@ -32,8 +36,6 @@ OBJDUMP       := $(TOOLCHAIN)-objdump
 GDB            := $(TOOLCHAIN)-gdb
 
 ###############################################################################
-# Source files
-
 
 
 ifeq ($(VERBOSE),true)
@@ -78,8 +80,6 @@ LDFLAGS               += -Wl,--gc-sections
 LDLIBS         += -l$(LIBNAME)
 LDLIBS         += -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group
 
-
-###############################################################################
 ###############################################################################
 
 
@@ -98,7 +98,7 @@ list: $(P_BINARY).list
 images: $(P_BINARY).images
 flash: $(P_BINARY).flash
 
-%.images: %.bin %.hex %.srec %.list
+%.images: %.bin %.hex %.list
        $(call echo_cmd,Images generated: $*)
 
 %.bin: %.elf