X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2FMakefile.am;h=a49957948e269f12eee4c65008e161de576a4509;hp=1103e57511088b77baf9b9cb7b12165a98507dbf;hb=6cacbd9575e03c37057719a97bf260217c4e275f;hpb=93180753be73daa7bf90e02585a7192fa6960a96 diff --git a/src/Makefile.am b/src/Makefile.am index 1103e57511..a49957948e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,6 @@ else MAINFILE = main.c endif - openocd_SOURCES = $(MAINFILE) openocd.c # set the include path found by configure @@ -17,9 +16,16 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \ # pass path to prefix path openocd_CPPFLAGS = \ -DPKGLIBDIR=\"$(pkglibdir)\" \ - -DPKGBLDDATE=\"`date +%F-%R`\" \ - -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\" \ - @CPPFLAGS@ + -DPKGBLDDATE=\"`date +%F-%R`\" + +if RELEASE +openocd_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\" +else +openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\" +endif + +# add default CPPFLAGS +openocd_CPPFLAGS += @CPPFLAGS@ # the library search path. openocd_LDFLAGS = $(all_libraries) @@ -59,8 +65,6 @@ endif endif endif - - openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a $(top_builddir)/src/svf/libsvf.a \ $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \ $(top_builddir)/src/helper/libhelper.a \ @@ -69,13 +73,10 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a $(top_builddir)/src/svf/libsv $(top_builddir)/src/pld/libpld.a \ $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB) - if HTTPD openocd_LDADD += -lmicrohttpd endif - - nobase_dist_pkglib_DATA = \ tcl/bitsbytes.tcl \ tcl/chip/atmel/at91/aic.tcl \