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 94790203c9e045c128277745c7232164cc40f60e..1e259e9743c1838c86d8b96b31852df6e694f08f 100644 (file)
--- 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 6359e25fbc11a605f69eb44d23c019f51a9c7017..a3cf54e3c71db9663cc512278733be601501c4bb 100644 (file)
--- 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 3828d55a3a72074a7dda95e95057e15bafc44302..41df8e6a171130341255edf5c02eaa2a3b5ec159 100644 (file)
--- 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 183e7ecb484dd3b10a0e0188c4d52dafc66d96a1..120df19159796bdc96899cb53a6399d9deae1ac0 100644 (file)
--- 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 98a21da633eccca3ae43139da9f9c87232c1b805..05ec392aee33286b143deb81f403cdffb6032e55 100644 (file)
--- 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