From 48d6ac229d331a0a1d24b11db550998f882b838a Mon Sep 17 00:00:00 2001
From: Tomek CEDRO <cederom@tlen.pl>
Date: Wed, 22 Jun 2011 00:47:09 +0200
Subject: SUBMODULE/LIBSWD: Integrated (conditional) libswd build into source
 tree configure and build process (just as JimTCL) in configure.in and
 Makefile.am. By default build is enabled, using switch
 '--disable-internal-libswd' build can be disabled and use external one. Added
 compilers flags to use internal libswd source tree in common.mk.

---
 Makefile.am | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index b31bcea9..54528606 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,12 @@ 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
-- 
cgit v1.2.3