This is an automated email from Gerrit. Tomasz CEDRO ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/1039
-- gerrit commit ce1ce19900ba94bae5ff8de09d454f90caeb3931 Author: Tomek CEDRO <[email protected]> Date: Fri Nov 16 01:34:23 2012 +0100 Adding LibSWD submodule to build and link process. LibSWD will not be part of the OpenOCD binary. Change-Id: I1f7dbbfe42ed1759bc175671165ea5104c862fd0 Signed-off-by: Tomek CEDRO <[email protected]> diff --git a/Makefile.am b/Makefile.am index 722c373..b3cd113 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,10 +12,13 @@ nobase_dist_pkgdata_DATA = \ contrib/libdcc/README \ contrib/openocd.udev -if INTERNAL_JIMTCL -SUBDIRS = jimtcl -else SUBDIRS = +if INTERNAL_JIMTCL +SUBDIRS += jimtcl +endif + +if INTERNAL_LIBSWD +SUBDIRS += submodules/libswd endif SUBDIRS += src doc diff --git a/common.mk b/common.mk index 1cb0743..ee5f414 100644 --- a/common.mk +++ b/common.mk @@ -10,3 +10,9 @@ if INTERNAL_JIMTCL AM_CPPFLAGS += -I$(top_srcdir)/jimtcl \ -I$(top_builddir)/jimtcl endif + +if INTERNAL_LIBSWD +AM_CPPFLAGS += -I$(top_srcdir)/submodules/libswd/src \ + -I$(top_builddir)/submodules/libswd/src +endif + diff --git a/src/Makefile.am b/src/Makefile.am index 863b111..75043ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,6 +27,12 @@ else openocd_LDADD += -ljim endif +if INTERNAL_LIBSWD +openocd_LDADD += $(top_builddir)/submodules/libswd/src/.libs/libswd.a +else +openocd_LDADD += -lswd +endif + if ULINK openocd_LDADD += -lm endif -- ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
