From: Uwe Hermann <redacted>
Date: Wed, 22 Feb 2012 22:54:30 +0000 (+0100)
Subject: Add top-level Makefile.
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~64
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=1b6280b73ded6e078ef9e39fbd3717dc9cfbb546;p=sigrok-firmware-fx2lafw.git

Add top-level Makefile.

Also, rename fx2lafw.mk to Makefile.include.
---

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..0fa948f4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+##
+## This file is part of the fx2lafw project.
+##
+## Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+all: cwav-usbeeax
+
+cwav-usbeeax:
+	$(MAKE) -C cwav-usbeeax
+
+clean:
+	rm -rf cwav-usbeeax/build
+
+.PHONY: cwav-usbeeax
+
diff --git a/Makefile.include b/Makefile.include
new file mode 100644
index 00000000..c4af71df
--- /dev/null
+++ b/Makefile.include
@@ -0,0 +1,34 @@
+##
+## This file is part of the fx2lafw project.
+##
+## Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+##
+
+FX2LIBDIR ?= ../fx2lib
+
+DEBUG ?= 0
+ifeq ($(DEBUG), 1)
+	SDCCFLAGS += -DDEBUG
+else
+	SDCCFLAGS += -DNDEBUG
+endif
+
+SDCCFLAGS += -I../include/
+
+include $(FX2LIBDIR)/lib/fx2.mk
+
diff --git a/cwav-usbeeax/Makefile b/cwav-usbeeax/Makefile
index a60f2af7..ad3c801e 100644
--- a/cwav-usbeeax/Makefile
+++ b/cwav-usbeeax/Makefile
@@ -22,4 +22,4 @@ SOURCES = main.c ../fx2lafw.c ../debug.c
 A51_SOURCES = ../dscr.a51
 BASENAME = fx2lafw-cwav-usbeeax
 
-include ../fx2lafw.mk
+include ../Makefile.include
diff --git a/fx2lafw.mk b/fx2lafw.mk
deleted file mode 100644
index c4af71df..00000000
--- a/fx2lafw.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-##
-## This file is part of the fx2lafw project.
-##
-## Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
-## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-##
-
-FX2LIBDIR ?= ../fx2lib
-
-DEBUG ?= 0
-ifeq ($(DEBUG), 1)
-	SDCCFLAGS += -DDEBUG
-else
-	SDCCFLAGS += -DNDEBUG
-endif
-
-SDCCFLAGS += -I../include/
-
-include $(FX2LIBDIR)/lib/fx2.mk
-