Makefile.am: fix build for libftdi1, pass CFLAGS where appropriate
Change-Id: I9d8afa6ae32fc01e69ec434b5bc9d71524d386a2 Signed-off-by: Paul Fertser <fercerpav@gmail.com> Reviewed-on: http://openocd.zylin.com/2079 Tested-by: jenkins Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com> Reviewed-by: Xiaofan <xiaofanc@gmail.com>
This commit is contained in:
parent
9f2bc3b830
commit
45f71f1082
|
@ -52,7 +52,7 @@ libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# add default CPPFLAGS
|
# add default CPPFLAGS
|
||||||
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBFTDI_CFLAGS)
|
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
|
||||||
|
|
||||||
# the library search path.
|
# the library search path.
|
||||||
libopenocd_la_LDFLAGS = $(all_libraries)
|
libopenocd_la_LDFLAGS = $(all_libraries)
|
||||||
|
|
|
@ -7,7 +7,7 @@ libocdjtagdrivers_la_SOURCES = \
|
||||||
$(DRIVERFILES)
|
$(DRIVERFILES)
|
||||||
|
|
||||||
libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \
|
libocdjtagdrivers_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) \
|
||||||
$(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS)
|
$(LIBUSB0_CFLAGS) $(HIDAPI_CFLAGS) $(LIBFTDI_CFLAGS)
|
||||||
|
|
||||||
ULINK_FIRMWARE = $(srcdir)/OpenULINK
|
ULINK_FIRMWARE = $(srcdir)/OpenULINK
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
include $(top_srcdir)/common.mk
|
include $(top_srcdir)/common.mk
|
||||||
|
|
||||||
AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers $(LIBUSB1_CFLAGS)
|
AM_CPPFLAGS += -I$(top_srcdir)/src/jtag/drivers $(LIBUSB1_CFLAGS) $(LIBFTDI_CFLAGS)
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libocdusbblaster.la
|
noinst_LTLIBRARIES = libocdusbblaster.la
|
||||||
libocdusbblaster_la_SOURCES = $(USB_BLASTER_SRC)
|
libocdusbblaster_la_SOURCES = $(USB_BLASTER_SRC)
|
||||||
|
|
Loading…
Reference in New Issue