X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2FMakefile.am;h=d630bd623f08390acad076478ed1f75a3131bb7d;hb=refs%2Fchanges%2F79%2F2079%2F2;hp=48af21d4b3d51e89928d81d78eb2a6a2edbda075;hpb=23be4e435f8b61c4603bd7822b3fb3c2c46cb16a;p=openocd.git diff --git a/src/Makefile.am b/src/Makefile.am index 48af21d4b3..d630bd623f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,7 +52,7 @@ libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\" endif # add default CPPFLAGS -libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBFTDI_CFLAGS) +libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS) # the library search path. libopenocd_la_LDFLAGS = $(all_libraries) @@ -75,7 +75,7 @@ libopenocd_la_LIBADD = \ $(top_builddir)/src/rtos/librtos.la \ $(top_builddir)/src/helper/libhelper.la \ $(LIBFTDI_LIBS) $(MINGWLDADD) \ - $(LIBUSB1_LIBS) $(LIBUSB0_LIBS) + $(HIDAPI_LIBS) $(LIBUSB1_LIBS) $(LIBUSB0_LIBS) STARTUP_TCL_SRCS = \ $(srcdir)/helper/startup.tcl \ @@ -103,7 +103,7 @@ CLEANFILES = startup.tcl startup_tcl.c # we do not want generated file in the dist dist-hook: rm -f $(distdir)/startup_tcl.c - + MAINTAINERCLEANFILES = $(srcdir)/Makefile.in # The "quick" target builds executables & reinstalls the executables