BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Uwe Hermann 2011-01-21 21:04:01 +01:00
parent 62eeeb171b
commit 5819184b22
5 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -17,8 +17,7 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## along with this program. If not, see <http://www.gnu.org/licenses/>.
## ##
AM_CPPFLAGS = -I $(top_srcdir)/libsigrok \ AM_CPPFLAGS = -I $(top_srcdir)/libsigrok
-DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
SUBDIRS = hardware input output firmware SUBDIRS = hardware input output firmware

2
hardware/asix-sigma/Makefile.am
View File

@ -19,8 +19,6 @@
if LA_ASIX_SIGMA if LA_ASIX_SIGMA
AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwasixsigma.la noinst_LTLIBRARIES = libsigrokhwasixsigma.la

1
hardware/asix-sigma/asix-sigma.c
View File

@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include <zlib.h> #include <zlib.h>
#include <sigrok.h> #include <sigrok.h>
#include <config.h>
#include "asix-sigma.h" #include "asix-sigma.h"
#define USB_VENDOR 0xa600 #define USB_VENDOR 0xa600

2
hardware/saleae-logic/Makefile.am
View File

@ -19,8 +19,6 @@
if LA_SALEAE_LOGIC if LA_SALEAE_LOGIC
AM_CPPFLAGS = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"'
# Local lib, this is NOT meant to be installed! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokhwsaleaelogic.la noinst_LTLIBRARIES = libsigrokhwsaleaelogic.la

2
output/Makefile.am
View File

@ -17,8 +17,6 @@
## along with this program. If not, see <http://www.gnu.org/licenses/>. ## 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! # Local lib, this is NOT meant to be installed!
noinst_LTLIBRARIES = libsigrokoutput.la noinst_LTLIBRARIES = libsigrokoutput.la