fix array2mem/mem2array when used as a "method" on a target.

[openocd.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 30b67f2693215ea90f2cf69cfb01fd6fe278dc17..c785e2acd7d80375283f674492c26fc5241e418a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = helper jtag xsvf svf target server flash pld
+
+lib_LTLIBRARIES = libopenocd.la

 bin_PROGRAMS = openocd
 
 if ECOSBOARD
 bin_PROGRAMS = openocd
 
 if ECOSBOARD


@@ -6,30 +9,39 @@ else
 MAINFILE = main.c
 endif
 
 MAINFILE = main.c
 endif
 

-openocd_SOURCES = $(MAINFILE) openocd.c
+openocd_SOURCES = $(MAINFILE) 
+openocd_LDADD = libopenocd.la
+
+libopenocd_la_SOURCES = openocd.c

 
 # set the include path found by configure
 
 # set the include path found by configure

-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/helper \
-       -I$(top_srcdir)/src/jtag -I$(top_srcdir)/src/target -I$(top_srcdir)/src/xsvf -I$(top_srcdir)/src/svf \
-       -I$(top_srcdir)/src/server -I$(top_srcdir)/src/flash -I$(top_srcdir)/src/pld $(all_includes)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/helper \
+       -I$(top_srcdir)/src/jtag \
+       -I$(top_srcdir)/src/target \
+       -I$(top_srcdir)/src/xsvf \
+       -I$(top_srcdir)/src/svf \
+       -I$(top_srcdir)/src/server \
+       -I$(top_srcdir)/src/flash \
+       -I$(top_srcdir)/src/pld

 
 # pass path to prefix path
 
 # pass path to prefix path

-openocd_CPPFLAGS = \
+libopenocd_la_CPPFLAGS = \

  -DPKGLIBDIR=\"$(pkglibdir)\" \
  -DPKGBLDDATE=\"`date +%F-%R`\"
 
 if RELEASE
  -DPKGLIBDIR=\"$(pkglibdir)\" \
  -DPKGBLDDATE=\"`date +%F-%R`\"
 
 if RELEASE

-openocd_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"
+libopenocd_la_CPPFLAGS += -DRELSTR=\"Release\" -DPKGBLDREV=\"\"

 else
 else

-openocd_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh`\"
+libopenocd_la_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"

 endif
 
 # add default CPPFLAGS
 endif
 
 # add default CPPFLAGS

-openocd_CPPFLAGS += @CPPFLAGS@
+libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)

 
 # the library search path.
 
 # the library search path.

-openocd_LDFLAGS = $(all_libraries) 
-SUBDIRS = helper jtag xsvf svf target server flash pld
+libopenocd_la_LDFLAGS = $(all_libraries) 

 
 if IS_MINGW
 MINGWLDADD = -lwsock32
 
 if IS_MINGW
 MINGWLDADD = -lwsock32


@@ -65,16 +77,19 @@ endif
 endif
 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 \
-       $(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 \
+libopenocd_la_LIBADD = \
+       $(top_builddir)/src/xsvf/libxsvf.la \
+       $(top_builddir)/src/svf/libsvf.la \
+       $(top_builddir)/src/pld/libpld.la \
+       $(top_builddir)/src/jtag/libjtag.la \
+       $(top_builddir)/src/flash/libflash.la \
+       $(top_builddir)/src/target/libtarget.la \
+       $(top_builddir)/src/server/libserver.la \
+       $(top_builddir)/src/helper/libhelper.la \

        $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
 if HTTPD
        $(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
 
 if HTTPD

-openocd_LDADD += -lmicrohttpd
+libopenocd_la_LIBADD += -lmicrohttpd

 endif
 
 nobase_dist_pkglib_DATA = \
 endif
 
 nobase_dist_pkglib_DATA = \