mirror of https://github.com/rusefi/openocd.git
Extend autotools build to create shared library libopenocd with libtool:
- Add libtoolize step too bootstrap script; creates ltmain.sh script. - Add AC_PROG_LIBTOOL to configure.in to add libtool support to build. - Change Makefile.am library rules from static (_a) to libtool (_la). - Install libopenocd.{la,so,a} in $(libdir); update openocd link rules. - Extend MAINTAINERCLEANFILES in top-level Makefile.am to remove ltmain.sh. git-svn-id: svn://svn.berlios.de/openocd/trunk@1695 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
parent
104580e0bf
commit
647e61cc6d
|
@ -20,6 +20,7 @@ MAINTAINERCLEANFILES = \
|
||||||
config.h.in \
|
config.h.in \
|
||||||
config.h.in~ \
|
config.h.in~ \
|
||||||
compile \
|
compile \
|
||||||
|
ltmain.sh \
|
||||||
missing \
|
missing \
|
||||||
aclocal.m4 \
|
aclocal.m4 \
|
||||||
install-sh
|
install-sh
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
aclocal \
|
aclocal \
|
||||||
&& autoheader \
|
&& autoheader \
|
||||||
|
&& libtoolize --automake \
|
||||||
&& automake --foreign --add-missing --copy \
|
&& automake --foreign --add-missing --copy \
|
||||||
&& autoconf
|
&& autoconf
|
||||||
|
|
||||||
|
|
|
@ -787,6 +787,7 @@ AC_PROG_CC
|
||||||
AC_PROG_CC_C99
|
AC_PROG_CC_C99
|
||||||
AM_PROG_CC_C_O
|
AM_PROG_CC_C_O
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
# Look for environ alternatives. Possibility #1: is environ in unistd.h or stdlib.h?
|
# Look for environ alternatives. Possibility #1: is environ in unistd.h or stdlib.h?
|
||||||
AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
|
AC_MSG_CHECKING([for environ in unistd.h and stdlib.h])
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
SUBDIRS = helper jtag xsvf svf target server flash pld
|
||||||
|
|
||||||
|
lib_LTLIBRARIES = libopenocd.la
|
||||||
bin_PROGRAMS = openocd
|
bin_PROGRAMS = openocd
|
||||||
|
|
||||||
if ECOSBOARD
|
if ECOSBOARD
|
||||||
|
@ -6,7 +9,10 @@ else
|
||||||
MAINFILE = main.c
|
MAINFILE = main.c
|
||||||
endif
|
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
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
|
@ -21,22 +27,21 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/pld
|
-I$(top_srcdir)/src/pld
|
||||||
|
|
||||||
# pass path to prefix path
|
# pass path to prefix path
|
||||||
openocd_CPPFLAGS = \
|
libopenocd_la_CPPFLAGS = \
|
||||||
-DPKGLIBDIR=\"$(pkglibdir)\" \
|
-DPKGLIBDIR=\"$(pkglibdir)\" \
|
||||||
-DPKGBLDDATE=\"`date +%F-%R`\"
|
-DPKGBLDDATE=\"`date +%F-%R`\"
|
||||||
|
|
||||||
if RELEASE
|
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 $(top_srcdir)`\"
|
libopenocd_la_CPPFLAGS += -DRELSTR=\"svn:\" -DPKGBLDREV=\"`$(top_srcdir)/guess-rev.sh $(top_srcdir)`\"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# add default CPPFLAGS
|
# add default CPPFLAGS
|
||||||
openocd_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
|
libopenocd_la_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS)
|
||||||
|
|
||||||
# the library search path.
|
# the library search path.
|
||||||
openocd_LDFLAGS = $(all_libraries)
|
libopenocd_la_LDFLAGS = $(all_libraries)
|
||||||
SUBDIRS = helper jtag xsvf svf target server flash pld
|
|
||||||
|
|
||||||
if IS_MINGW
|
if IS_MINGW
|
||||||
MINGWLDADD = -lwsock32
|
MINGWLDADD = -lwsock32
|
||||||
|
@ -72,16 +77,19 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
openocd_LDADD = $(top_builddir)/src/xsvf/libxsvf.a $(top_builddir)/src/svf/libsvf.a \
|
libopenocd_la_LIBADD = \
|
||||||
$(top_builddir)/src/target/libtarget.a $(top_builddir)/src/jtag/libjtag.a \
|
$(top_builddir)/src/xsvf/libxsvf.la \
|
||||||
$(top_builddir)/src/helper/libhelper.a \
|
$(top_builddir)/src/svf/libsvf.la \
|
||||||
$(top_builddir)/src/server/libserver.a $(top_builddir)/src/helper/libhelper.a \
|
$(top_builddir)/src/pld/libpld.la \
|
||||||
$(top_builddir)/src/flash/libflash.a $(top_builddir)/src/target/libtarget.a \
|
$(top_builddir)/src/jtag/libjtag.la \
|
||||||
$(top_builddir)/src/pld/libpld.a \
|
$(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)
|
$(FTDI2232LIB) $(MINGWLDADD) $(LIBUSB)
|
||||||
|
|
||||||
if HTTPD
|
if HTTPD
|
||||||
openocd_LDADD += -lmicrohttpd
|
libopenocd_la_LIBADD += -lmicrohttpd
|
||||||
endif
|
endif
|
||||||
|
|
||||||
nobase_dist_pkglib_DATA = \
|
nobase_dist_pkglib_DATA = \
|
||||||
|
|
|
@ -4,8 +4,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/target
|
-I$(top_srcdir)/src/target
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libflash.a
|
noinst_LTLIBRARIES = libflash.la
|
||||||
libflash_a_SOURCES = \
|
libflash_la_SOURCES = \
|
||||||
flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c \
|
flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c \
|
||||||
str7x.c str9x.c aduc702x.c nand.c nand_ecc.c \
|
str7x.c str9x.c aduc702x.c nand.c nand_ecc.c \
|
||||||
lpc3180_nand_controller.c stellaris.c str9xpec.c stm32x.c tms470.c \
|
lpc3180_nand_controller.c stellaris.c str9xpec.c stm32x.c tms470.c \
|
||||||
|
|
|
@ -5,7 +5,7 @@ AM_CPPFLAGS = \
|
||||||
-DPKGLIBDIR=\"$(pkglibdir)\"
|
-DPKGLIBDIR=\"$(pkglibdir)\"
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libhelper.a
|
noinst_LTLIBRARIES = libhelper.la
|
||||||
|
|
||||||
if ECOSBOARD
|
if ECOSBOARD
|
||||||
CONFIGFILES =
|
CONFIGFILES =
|
||||||
|
@ -15,19 +15,19 @@ endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
libhelper_a_SOURCES = \
|
libhelper_la_SOURCES = \
|
||||||
binarybuffer.c $(CONFIGFILES) configuration.c \
|
binarybuffer.c $(CONFIGFILES) configuration.c \
|
||||||
log.c command.c time_support.c \
|
log.c command.c time_support.c \
|
||||||
replacements.c fileio.c startup_tcl.c
|
replacements.c fileio.c startup_tcl.c
|
||||||
|
|
||||||
if IOUTIL
|
if IOUTIL
|
||||||
libhelper_a_SOURCES += ioutil.c
|
libhelper_la_SOURCES += ioutil.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libhelper_a_CFLAGS =
|
libhelper_la_CFLAGS =
|
||||||
if IS_MINGW
|
if IS_MINGW
|
||||||
# FD_* macros are sloppy with their signs on MinGW32 platform
|
# FD_* macros are sloppy with their signs on MinGW32 platform
|
||||||
libhelper_a_CFLAGS += -Wno-sign-compare
|
libhelper_la_CFLAGS += -Wno-sign-compare
|
||||||
endif
|
endif
|
||||||
|
|
||||||
noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
|
noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
|
||||||
|
|
|
@ -3,7 +3,7 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/target
|
-I$(top_srcdir)/src/target
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libjtag.a
|
noinst_LTLIBRARIES = libjtag.la
|
||||||
|
|
||||||
if BITBANG
|
if BITBANG
|
||||||
BITBANGFILES = bitbang.c
|
BITBANGFILES = bitbang.c
|
||||||
|
@ -109,8 +109,12 @@ else
|
||||||
ARMJTAGEWFILES =
|
ARMJTAGEWFILES =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libjtag_a_SOURCES = jtag.c $(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) $(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
|
libjtag_la_SOURCES = jtag.c \
|
||||||
$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) $(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) $(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES) $(ARMJTAGEWFILES)
|
$(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) \
|
||||||
|
$(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
|
||||||
|
$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) \
|
||||||
|
$(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) \
|
||||||
|
$(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES) $(ARMJTAGEWFILES)
|
||||||
|
|
||||||
noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
|
noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/jtag
|
-I$(top_srcdir)/src/jtag
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libpld.a
|
noinst_LTLIBRARIES = libpld.la
|
||||||
noinst_HEADERS = pld.h xilinx_bit.h virtex2.h
|
noinst_HEADERS = pld.h xilinx_bit.h virtex2.h
|
||||||
libpld_a_SOURCES = pld.c xilinx_bit.c virtex2.c
|
libpld_la_SOURCES = pld.c xilinx_bit.c virtex2.c
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
|
@ -6,23 +6,23 @@ AM_CPPFLAGS = \
|
||||||
-DPKGLIBDIR=\"$(pkglibdir)\"
|
-DPKGLIBDIR=\"$(pkglibdir)\"
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libserver.a
|
noinst_LTLIBRARIES = libserver.la
|
||||||
noinst_HEADERS = server.h telnet_server.h gdb_server.h
|
noinst_HEADERS = server.h telnet_server.h gdb_server.h
|
||||||
libserver_a_SOURCES = server.c telnet_server.c gdb_server.c
|
libserver_la_SOURCES = server.c telnet_server.c gdb_server.c
|
||||||
|
|
||||||
if HTTPD
|
if HTTPD
|
||||||
libserver_a_SOURCES += httpd.c
|
libserver_la_SOURCES += httpd.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libserver_a_CFLAGS =
|
libserver_la_CFLAGS =
|
||||||
if IS_MINGW
|
if IS_MINGW
|
||||||
# FD_* macros are sloppy with their signs on MinGW32 platform
|
# FD_* macros are sloppy with their signs on MinGW32 platform
|
||||||
libserver_a_CFLAGS += -Wno-sign-compare
|
libserver_la_CFLAGS += -Wno-sign-compare
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# tcl server addons
|
# tcl server addons
|
||||||
noinst_HEADERS += tcl_server.h
|
noinst_HEADERS += tcl_server.h
|
||||||
libserver_a_SOURCES += tcl_server.c
|
libserver_la_SOURCES += tcl_server.c
|
||||||
|
|
||||||
if HTTPD
|
if HTTPD
|
||||||
nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
|
nobase_dist_pkglib_DATA = $(wildcard $(srcdir)/httpd/*.tcl $(srcdir)/httpd/*.css $(srcdir)/httpd/menu_cuts/*.png)
|
||||||
|
|
|
@ -4,8 +4,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/jtag
|
-I$(top_srcdir)/src/jtag
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libsvf.a
|
noinst_LTLIBRARIES = libsvf.la
|
||||||
noinst_HEADERS = svf.h
|
noinst_HEADERS = svf.h
|
||||||
libsvf_a_SOURCES = svf.c
|
libsvf_la_SOURCES = svf.c
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
|
@ -11,8 +11,9 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/xsvf
|
-I$(top_srcdir)/src/xsvf
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libtarget.a
|
noinst_LTLIBRARIES = libtarget.la
|
||||||
libtarget_a_SOURCES = target.c register.c breakpoints.c armv4_5.c embeddedice.c etm.c arm7tdmi.c arm9tdmi.c \
|
libtarget_la_SOURCES = target.c register.c breakpoints.c \
|
||||||
|
armv4_5.c embeddedice.c etm.c arm7tdmi.c arm9tdmi.c \
|
||||||
arm_jtag.c arm7_9_common.c algorithm.c arm920t.c arm720t.c armv4_5_mmu.c armv4_5_cache.c arm_disassembler.c \
|
arm_jtag.c arm7_9_common.c algorithm.c arm920t.c arm720t.c armv4_5_mmu.c armv4_5_cache.c arm_disassembler.c \
|
||||||
arm966e.c arm926ejs.c feroceon.c etb.c xscale.c arm_simulator.c image.c armv7m.c cortex_m3.c cortex_a8.c arm_adi_v5.c \
|
arm966e.c arm926ejs.c feroceon.c etb.c xscale.c arm_simulator.c image.c armv7m.c cortex_m3.c cortex_a8.c arm_adi_v5.c \
|
||||||
etm_dummy.c $(OOCD_TRACE_FILES) target_request.c trace.c arm11.c arm11_dbgtap.c mips32.c mips_m4k.c \
|
etm_dummy.c $(OOCD_TRACE_FILES) target_request.c trace.c arm11.c arm11_dbgtap.c mips32.c mips_m4k.c \
|
||||||
|
|
|
@ -4,8 +4,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/jtag
|
-I$(top_srcdir)/src/jtag
|
||||||
|
|
||||||
METASOURCES = AUTO
|
METASOURCES = AUTO
|
||||||
noinst_LIBRARIES = libxsvf.a
|
noinst_LTLIBRARIES = libxsvf.la
|
||||||
noinst_HEADERS = xsvf.h
|
noinst_HEADERS = xsvf.h
|
||||||
libxsvf_a_SOURCES = xsvf.c
|
libxsvf_la_SOURCES = xsvf.c
|
||||||
|
|
||||||
MAINTAINERCLEANFILES = Makefile.in
|
MAINTAINERCLEANFILES = Makefile.in
|
||||||
|
|
Loading…
Reference in New Issue