diff options
| author | kc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-01-20 04:03:31 +0000 |
|---|---|---|
| committer | kc8apf <kc8apf@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2009-01-20 04:03:31 +0000 |
| commit | 15b4be1c9c8abff091a9c6048b3bb5bea256dce9 (patch) | |
| tree | db8edb23e978ea24fe7c9208771a60eea0d3f8d1 /src/Makefile.am | |
| parent | 93180753be73daa7bf90e02585a7192fa6960a96 (diff) | |
| download | openocd+libswd-15b4be1c9c8abff091a9c6048b3bb5bea256dce9.tar.gz openocd+libswd-15b4be1c9c8abff091a9c6048b3bb5bea256dce9.tar.bz2 openocd+libswd-15b4be1c9c8abff091a9c6048b3bb5bea256dce9.tar.xz openocd+libswd-15b4be1c9c8abff091a9c6048b3bb5bea256dce9.zip | |
Fixes for handling release versions
git-svn-id: svn://svn.berlios.de/openocd/trunk@1347 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 1103e575..30b67f26 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`\" +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 \ |