From: Uwe Hermann <redacted>
Date: Fri, 21 Jan 2011 20:04:01 +0000 (+0100)
Subject: Remove duplicate FIRMWARE_DIR includes.
X-Git-Tag: libsigrok-0.1.0~388
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=5819184b229d5d33ccb8e5ed5f7d715f501fedb5;p=libsigrok.git

Remove duplicate FIRMWARE_DIR includes.

We use AC_DEFINE_UNQUOTED in configure.ac now to put the FIRMWARE_DIR #define
in the config.h file, which is included where we need the #define.
---

diff --git a/Makefile.am b/Makefile.am
index 94790203..1e259e97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,8 +17,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \
-	      -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
+AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
 
 SUBDIRS = hardware input output firmware
 
diff --git a/hardware/asix-sigma/Makefile.am b/hardware/asix-sigma/Makefile.am
index 6359e25f..a3cf54e3 100644
--- a/hardware/asix-sigma/Makefile.am
+++ b/hardware/asix-sigma/Makefile.am
@@ -19,8 +19,6 @@
 
 if LA_ASIX_SIGMA
 
-AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
-
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokhwasixsigma.la
 
diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 3828d55a..41df8e6a 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <sigrok.h>
+#include <config.h>
 #include "asix-sigma.h"
 
 #define USB_VENDOR			0xa600
diff --git a/hardware/saleae-logic/Makefile.am b/hardware/saleae-logic/Makefile.am
index 183e7ecb..120df191 100644
--- a/hardware/saleae-logic/Makefile.am
+++ b/hardware/saleae-logic/Makefile.am
@@ -19,8 +19,6 @@
 
 if LA_SALEAE_LOGIC
 
-AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
-
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokhwsaleaelogic.la
 
diff --git a/output/Makefile.am b/output/Makefile.am
index 98a21da6..05ec392a 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -17,8 +17,6 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
-
 # Local lib, this is NOT meant to be installed!
 noinst_LTLIBRARIES = libsigrokoutput.la