X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=07981aa67ec2faea9f58fdd19d3081d9396b14c1;hp=c7c9e5ed2c3527910ff94d79f15bcdc1d0a734fa;hb=5be455a710c57bbbbd49c2d671b42098db7be5dc;hpb=dd86b54e6e03a0682eb8ed41006ffdfd837ffae0

diff --git a/src/Makefile.am b/src/Makefile.am
index c7c9e5ed2c..07981aa67e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,92 +1,85 @@
-SUBDIRS = helper jtag xsvf svf target server flash pld
+noinst_LTLIBRARIES += %D%/libopenocd.la
+bin_PROGRAMS += %D%/openocd
 
-lib_LTLIBRARIES = libopenocd.la
-bin_PROGRAMS = openocd
+%C%_openocd_SOURCES = \
+	%D%/main.c
 
-if ECOSBOARD
-MAINFILE = ecosboard.c
-else
-MAINFILE = main.c
-endif
+%C%_libopenocd_la_SOURCES = \
+	%D%/hello.c %D%/hello.h \
+	%D%/openocd.c %D%/openocd.h
 
-openocd_SOURCES = $(MAINFILE) 
-openocd_LDADD = libopenocd.la
+%C%_openocd_LDADD = %D%/libopenocd.la
 
-libopenocd_la_SOURCES = openocd.c
+%C%_openocd_LDADD += $(MINGWLDADD)
 
-# 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
+if INTERNAL_JIMTCL
+%C%_openocd_LDADD += $(top_builddir)/jimtcl/libjim.a
+else
+%C%_openocd_LDADD += -ljim
+endif
 
-libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\"
+%C%_libopenocd_la_CPPFLAGS =
 
+# banner output includes RELSTR appended to $VERSION from the configure script
+# guess-rev.sh returns either a repository version ID or "-snapshot"
 if RELEASE
-libopenocd_la_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
+%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"\"
+%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"\"
 else
-libopenocd_la_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
+%C%_libopenocd_la_CPPFLAGS += -DRELSTR=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
+%C%_libopenocd_la_CPPFLAGS += -DGITVERSION=\"`cd $(top_srcdir) && git describe`\"
+%C%_libopenocd_la_CPPFLAGS += -DPKGBLDDATE=\"`date +%F-%R`\"
 endif
 
 # add default CPPFLAGS
-libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
+%C%_libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
 
 # the library search path.
-libopenocd_la_LDFLAGS = $(all_libraries) 
+%C%_libopenocd_la_LDFLAGS = $(all_libraries)
 
 if IS_MINGW
-MINGWLDADD = -lwsock32
+MINGWLDADD = -lws2_32
 else
 MINGWLDADD =
 endif
 
-if FT2232_LIBFTDI
-FTDI2232LIB = -lftdi -lusb
-else
-if PRESTO_LIBFTDI
-FTDI2232LIB = -lftdi -lusb
-else
-FTDI2232LIB =
-endif
-endif
+%C%_libopenocd_la_LIBADD = \
+	%D%/xsvf/libxsvf.la \
+	%D%/svf/libsvf.la \
+	%D%/pld/libpld.la \
+	%D%/jtag/libjtag.la \
+	%D%/transport/libtransport.la \
+	%D%/flash/libflash.la \
+	%D%/target/libtarget.la \
+	%D%/server/libserver.la \
+	%D%/rtos/librtos.la \
+	%D%/helper/libhelper.la
 
-if USBPROG
-LIBUSB = -lusb
-else
-if JLINK
-LIBUSB = -lusb
-else
-if RLINK
-LIBUSB = -lusb
-else
-if VSLLINK
-LIBUSB = -lusb
-else
-LIBUSB =
-endif
-endif
-endif
-endif
+BIN2C = $(srcdir)/%D%/helper/bin2char.sh
 
-libopenocd_la_LIBADD = \
-	$(top_builddir)/src/xsvf/libxsvf.la \
-	$(top_builddir)/src/svf/libsvf.la \
-	$(top_builddir)/src/pld/libpld.la \
-	$(top_builddir)/src/jtag/libjtag.la \
-	$(top_builddir)/src/flash/libflash.la \
-	$(top_builddir)/src/target/libtarget.la \
-	$(top_builddir)/src/server/libserver.la \
-	$(top_builddir)/src/helper/libhelper.la \
-	$(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
-
-if HTTPD
-libopenocd_la_LIBADD += -lmicrohttpd
-endif
+STARTUP_TCL_SRCS =
+EXTRA_DIST += $(STARTUP_TCL_SRCS)
+
+BUILT_SOURCES += %D%/startup_tcl.inc
+
+# Convert .tcl to c-array
+%D%/startup_tcl.inc: $(STARTUP_TCL_SRCS)
+	cat $^ | $(BIN2C) > $@ || { rm -f $@; false; }
+
+# add generated files to make clean list
+CLEANFILES += %D%/startup_tcl.inc
+
+# we do not want generated file in the dist
+#dist-hook:
+#	rm -f $(distdir)/%D%/startup_tcl.inc
 
-MAINTAINERCLEANFILES = Makefile.in
+include %D%/helper/Makefile.am
+include %D%/jtag/Makefile.am
+include %D%/transport/Makefile.am
+include %D%/xsvf/Makefile.am
+include %D%/svf/Makefile.am
+include %D%/target/Makefile.am
+include %D%/rtos/Makefile.am
+include %D%/server/Makefile.am
+include %D%/flash/Makefile.am
+include %D%/pld/Makefile.am