X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=19a0ba96c3d8cb78d27481ceb4729dcb651a0d5e;hb=fdae51287cf55a039f3401ed92151dbf518e4e7f;hp=913118f25cfa67c561d23b4a7a2dd967559442a0;hpb=d1fbcc35899f6071d097b8dfb76ab3125c3c4fac;p=openocd.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 913118f25c..19a0ba96c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,12 @@
-SUBDIRS = helper jtag xsvf svf target server flash pld
+SUBDIRS = \
+	jtag \
+	helper \
+	target \
+	flash \
+	svf \
+	xsvf \
+	pld \
+	server
 
 lib_LTLIBRARIES = libopenocd.la
 bin_PROGRAMS = openocd
@@ -10,7 +18,7 @@ MAINFILE = main.c
 endif
 
 openocd_SOURCES = $(MAINFILE)
-openocd_LDADD = libopenocd.la
+openocd_LDADD = libopenocd.la -ljim
 
 libopenocd_la_SOURCES = \
 	hello.c \
@@ -18,20 +26,14 @@ libopenocd_la_SOURCES = \
 	startup_tcl.c
 
 noinst_HEADERS = \
+	hello.h \
 	openocd.h
 
 
 # set the include path found by configure
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/helper \
-	-I$(top_srcdir)/src/jtag \
-	-I$(top_srcdir)/src/target \
-	-I$(top_srcdir)/src/xsvf \
-	-I$(top_srcdir)/src/svf \
-	-I$(top_srcdir)/src/server \
-	-I$(top_srcdir)/src/flash \
-	-I$(top_srcdir)/src/pld
+	-I$(top_builddir)/src
 
 libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
 
@@ -42,6 +44,7 @@ libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
 else
 libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
 endif
+libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
 
 # add default CPPFLAGS
 libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
@@ -58,12 +61,16 @@ endif
 if FT2232_LIBFTDI
 FTDI2232LIB = -lftdi -lusb
 else
+if USB_BLASTER_LIBFTDI
+FTDI2232LIB = -lftdi -lusb
+else
 if PRESTO_LIBFTDI
 FTDI2232LIB = -lftdi -lusb
 else
 FTDI2232LIB =
 endif
 endif
+endif
 
 if USBPROG
 LIBUSB = -lusb
@@ -94,10 +101,6 @@ libopenocd_la_LIBADD = \
 	$(top_builddir)/src/helper/libhelper.la \
 	$(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
-if HTTPD
-libopenocd_la_LIBADD += -lmicrohttpd
-endif
-
 STARTUP_TCL_SRCS = \
 	$(srcdir)/helper/startup.tcl \
 	$(srcdir)/jtag/startup.tcl \