Replaced gpif-capture with gpif-acquisition saleae-logic/Makefile

[sigrok-firmware-fx2lafw.git] / Makefile.include

diff --git a/Makefile.include b/Makefile.include
index c4af71dffe1251a4abe835423634ec70c60e0f47..5c01a958019fb4b8b2a2c20332b2c4e0a6458764 100644 (file)
--- a/Makefile.include
+++ b/Makefile.include
@@ -19,7 +19,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-FX2LIBDIR ?= ../fx2lib
+OBJCOPY ?= objcopy
+
+FX2LIBDIR ?= ../../fx2lib
+BUILDDIR ?= build
 
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
@@ -28,7 +31,9 @@ else
        SDCCFLAGS += -DNDEBUG
 endif
 
-SDCCFLAGS += -I../include/
+SDCCFLAGS += -I../../include/
 
-include $(FX2LIBDIR)/lib/fx2.mk
+$(BUILDDIR)/$(BASENAME).fw: $(BUILDDIR)/$(BASENAME).ihx
+       $(OBJCOPY) -Iihex $< -Obinary $@
 
+include $(FX2LIBDIR)/lib/fx2.mk