diff options
| author | duane <duane@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-27 01:15:50 +0000 |
|---|---|---|
| committer | duane <duane@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-12-27 01:15:50 +0000 |
| commit | f7274784a22e975dbab6a8b24770b652a813e64d (patch) | |
| tree | 72f5c7d3c22aff2ee18bbff753e939c1b695d071 /src | |
| parent | 437a981878d450baf31081506f6ec9005c43a9fb (diff) | |
| download | openocd+libswd-f7274784a22e975dbab6a8b24770b652a813e64d.tar.gz openocd+libswd-f7274784a22e975dbab6a8b24770b652a813e64d.tar.bz2 openocd+libswd-f7274784a22e975dbab6a8b24770b652a813e64d.tar.xz openocd+libswd-f7274784a22e975dbab6a8b24770b652a813e64d.zip | |
Build Permutations with ftd2xx and libftdi addressed. Also added a new se of regression makefiles to build openocd in multiple ways
git-svn-id: svn://svn.berlios.de/openocd/trunk@1275 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 22 | ||||
| -rw-r--r-- | src/helper/options.c | 3 | ||||
| -rw-r--r-- | src/jtag/Makefile.am | 11 |
3 files changed, 5 insertions, 31 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 6a9f62a8..b2542917 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -55,25 +55,7 @@ endif endif endif -if IS_WIN32 -if FTD2XXDIR -FTD2XXLDADD = @WITH_FTD2XX@/FTD2XX.lib -else -FTD2XXLDADD = -lftd2xx -endif -else -FTD2XXLDADD = -lftd2xx -endif - -if FT2232_FTD2XX -FTD2XXLIB = $(FTD2XXLDADD) -else -if PRESTO_FTD2XX -FTD2XXLIB = $(FTD2XXLDADD) -else -FTD2XXLIB = -endif -endif + openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \ $(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \ @@ -81,7 +63,7 @@ openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a \ $(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \ $(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \ $(top_builddir)/src/pld/libpld.a \ - $(FTDI2232LIB) $(FTD2XXLIB) $(MINGWLDADD) $(LIBUSB) + $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB) if HTTPD diff --git a/src/helper/options.c b/src/helper/options.c index 2ac9143e..203791bd 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -178,7 +178,8 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] if (version_flag) { /* Nothing to do, version gets printed automatically. */ - exit(-1); + // It is not an error to request the VERSION number. + exit(0); } return ERROR_OK; diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index d73eee7e..0c581296 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -1,15 +1,6 @@ -if FTD2XXDIR -if IS_MINGW -FTD2XXINC = -I@WITH_FTD2XX@ -else -FTD2XXINC = -I@WITH_FTD2XX@/ -endif -else -FTD2XXINC = -endif -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper $(FTD2XXINC) $(all_includes) -I$(top_srcdir)/src/target +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper $(all_includes) -I$(top_srcdir)/src/target METASOURCES = AUTO noinst_LIBRARIES = libjtag.a |