From b252e04ddcaa013071fb6ec58f6aea3064bee6a4 Mon Sep 17 00:00:00 2001 From: Rutger Hofman Date: Fri, 24 Apr 2009 15:28:59 +0000 Subject: [PATCH] Use libtool: patch in the changes by Przemyslaw Iskra git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1531 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/ChangeLog | 7 +++ urjtag/Makefile.am | 3 +- urjtag/configure.ac | 2 +- urjtag/src/Makefile.am | 51 +++++++++---------- urjtag/src/bsdl/Makefile.am | 5 +- urjtag/src/bus/Makefile.am | 96 ++++++++++++++++++------------------ urjtag/src/cmd/Makefile.am | 86 ++++++++++++++++---------------- urjtag/src/flash/Makefile.am | 6 +-- urjtag/src/jim/Makefile.am | 4 +- urjtag/src/lib/Makefile.am | 4 +- urjtag/src/part/Makefile.am | 4 +- urjtag/src/svf/Makefile.am | 5 +- urjtag/src/tap/Makefile.am | 50 +++++++++---------- 13 files changed, 163 insertions(+), 160 deletions(-) diff --git a/urjtag/ChangeLog b/urjtag/ChangeLog index 78c24139..f740ab9b 100644 --- a/urjtag/ChangeLog +++ b/urjtag/ChangeLog @@ -1,3 +1,10 @@ +2009-04-23 Rutger Hofman + + Use the changes by Przemyslaw Iskra, published as + $ svn co http://labserver.uv.es/svn_FPGA/trunk/source/urjtag urjtag-lib + to use libtool from now on. He based on r1427. + * configure.ac, **/Makefile.am: use libtool to create one shared liburjtag.la + 2009-04-23 Rutger Hofman Expand tabs also in #defines -- indent skips them. diff --git a/urjtag/Makefile.am b/urjtag/Makefile.am index 576e0315..8c93186e 100644 --- a/urjtag/Makefile.am +++ b/urjtag/Makefile.am @@ -38,7 +38,8 @@ noinst_HEADERS = \ EXTRA_DIST = \ Makefile.rules \ - UrJTAG.nsi + UrJTAG.nsi \ + tools/config.rpath ACLOCAL_AMFLAGS = -I m4 diff --git a/urjtag/configure.ac b/urjtag/configure.ac index fcab49f3..1f99039a 100644 --- a/urjtag/configure.ac +++ b/urjtag/configure.ac @@ -84,8 +84,8 @@ AM_GNU_GETTEXT(external) AM_GNU_GETTEXT_VERSION(0.14.1) AC_PROG_CC -AC_PROG_RANLIB AC_PROG_YACC +AC_PROG_LIBTOOL AC_SEARCH_LIBS([ioperm], [ioperm]) diff --git a/urjtag/src/Makefile.am b/urjtag/src/Makefile.am index 44897b08..b7b43ca0 100644 --- a/urjtag/src/Makefile.am +++ b/urjtag/src/Makefile.am @@ -39,6 +39,10 @@ if ENABLE_BSDL SUBDIRS += bsdl endif +if ENABLE_JIM +SUBDIRS += jim +endif + bin_PROGRAMS = \ jtag @@ -48,52 +52,41 @@ dist_bin_SCRIPTS = \ jtag_SOURCES = \ jtag.c -jtag_DEPENDENCIES = \ - flash/libflash.a \ - lib/libjtaglib.a \ - tap/libtap.a \ - part/libpart.a \ - bus/libbus.a \ - cmd/libcmd.a - -if ENABLE_SVF -jtag_DEPENDENCIES += svf/libsvf.a -endif +lib_LTLIBRARIES = liburjtag.la +liburjtag_la_LDFLAGS = -version-info 0:0:0 -if ENABLE_BSDL -jtag_DEPENDENCIES += bsdl/libbsdl.a -endif +liburjtag_la_SOURCES = -jtag_LDADD = \ - -Lcmd -lcmd \ - -Ltap -ltap \ - -Lpart -lpart \ - -Llib -ljtaglib \ - -Lflash -lflash \ - -Ltap -ltap \ - -Lflash -lflash \ - -Lbus -lbus \ +liburjtag_la_LIBADD = \ + tap/libtap.la \ + part/libpart.la \ + lib/libjtaglib.la \ + flash/libflash.la \ + bus/libbus.la \ + cmd/libcmd.la \ -lm \ @FTD2XXLIB@ \ @LIBINTL@ if ENABLE_SVF -jtag_LDADD += -Lsvf -lsvf +liburjtag_la_LIBADD += svf/libsvf.la endif if ENABLE_BSDL -jtag_LDADD += -Lbsdl -lbsdl +liburjtag_la_LIBADD += bsdl/libbsdl.la endif if ENABLE_JIM -SUBDIRS += jim -jtag_LDADD += -Ljim -ljim -jtag_DEPENDENCIES += jim/libjim.a +liburjtag_la_LIBADD += jim/libjim.la endif if DMALLOC -jtag_LDADD += -ldmalloc +liburjtag_la_LIBADD += -ldmalloc endif +jtag_LDADD = \ + liburjtag.la \ + @LIBINTL@ + localedir = $(datadir)/locale INCLUDES = -DLOCALEDIR=\"$(localedir)\" diff --git a/urjtag/src/bsdl/Makefile.am b/urjtag/src/bsdl/Makefile.am index 53de5c96..44f4840b 100644 --- a/urjtag/src/bsdl/Makefile.am +++ b/urjtag/src/bsdl/Makefile.am @@ -21,9 +21,10 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libbsdl.a +OBJEXT = lo +noinst_LTLIBRARIES = libbsdl.la -libbsdl_a_SOURCES = \ +libbsdl_la_SOURCES = \ vhdl_bison.y \ vhdl_flex.l \ bsdl_bison.y \ diff --git a/urjtag/src/bus/Makefile.am b/urjtag/src/bus/Makefile.am index 7c3c8881..eaa029d0 100644 --- a/urjtag/src/bus/Makefile.am +++ b/urjtag/src/bus/Makefile.am @@ -23,9 +23,9 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libbus.a +noinst_LTLIBRARIES = libbus.la -libbus_a_SOURCES = \ +libbus_la_SOURCES = \ buses.c \ buses.h \ generic_bus.c \ @@ -35,145 +35,145 @@ libbus_a_SOURCES = \ writemem.c if ENABLE_BUS_AU1500 -libbus_a_SOURCES += au1500.c +libbus_la_SOURCES += au1500.c endif if ENABLE_BUS_AVR32 -libbus_a_SOURCES += avr32.c +libbus_la_SOURCES += avr32.c endif if ENABLE_BUS_BCM1250 -libbus_a_SOURCES += bcm1250.c +libbus_la_SOURCES += bcm1250.c endif if ENABLE_BUS_BF526_EZKIT -libbus_a_SOURCES += bf537_stamp.c -endif - +libbus_la_SOURCES += bf537_stamp.c +else if ENABLE_BUS_BF527_EZKIT -libbus_a_SOURCES += bf537_stamp.c +libbus_la_SOURCES += bf537_stamp.c +else +if ENABLE_BUS_BF537_STAMP +libbus_la_SOURCES += bf537_stamp.c +else +if ENABLE_BUS_BF537_EZKIT +libbus_la_SOURCES += bf537_stamp.c +else +if ENABLE_BUS_BF538F_EZKIT +libbus_la_SOURCES += bf537_stamp.c +endif endif - -if ENABLE_BUS_BF533_STAMP -libbus_a_SOURCES += bf533_stamp.c endif - -if ENABLE_BUS_BF533_EZKIT -libbus_a_SOURCES += bf533_ezkit.c endif - -if ENABLE_BUS_BF537_STAMP -libbus_a_SOURCES += bf537_stamp.c endif -if ENABLE_BUS_BF537_EZKIT -libbus_a_SOURCES += bf537_stamp.c +if ENABLE_BUS_BF533_STAMP +libbus_la_SOURCES += bf533_stamp.c endif -if ENABLE_BUS_BF538F_EZKIT -libbus_a_SOURCES += bf537_stamp.c +if ENABLE_BUS_BF533_EZKIT +libbus_la_SOURCES += bf533_ezkit.c endif if ENABLE_BUS_BF548_EZKIT -libbus_a_SOURCES += bf548_ezkit.c +libbus_la_SOURCES += bf548_ezkit.c endif if ENABLE_BUS_BF561_EZKIT -libbus_a_SOURCES += bf561_ezkit.c +libbus_la_SOURCES += bf561_ezkit.c endif if ENABLE_BUS_BSCOACH -libbus_a_SOURCES += bscoach.c +libbus_la_SOURCES += bscoach.c endif if ENABLE_BUS_EJTAG -libbus_a_SOURCES += ejtag.c +libbus_la_SOURCES += ejtag.c endif if ENABLE_BUS_EJTAG_DMA -libbus_a_SOURCES += ejtag_dma.c +libbus_la_SOURCES += ejtag_dma.c endif if ENABLE_BUS_FJMEM -libbus_a_SOURCES += fjmem.c +libbus_la_SOURCES += fjmem.c endif if ENABLE_BUS_H7202 -libbus_a_SOURCES += h7202.c +libbus_la_SOURCES += h7202.c endif if ENABLE_BUS_IXP425 -libbus_a_SOURCES += ixp425.c +libbus_la_SOURCES += ixp425.c endif if ENABLE_BUS_JOPCYC -libbus_a_SOURCES += jopcyc.c +libbus_la_SOURCES += jopcyc.c endif if ENABLE_BUS_LH7A400 -libbus_a_SOURCES += lh7a400.c +libbus_la_SOURCES += lh7a400.c endif if ENABLE_BUS_MPC5200 -libbus_a_SOURCES += mpc5200.c +libbus_la_SOURCES += mpc5200.c endif if ENABLE_BUS_MPC824X -libbus_a_SOURCES += mpc824x.c +libbus_la_SOURCES += mpc824x.c endif if ENABLE_BUS_PPC405EP -libbus_a_SOURCES += ppc405ep.c +libbus_la_SOURCES += ppc405ep.c endif if ENABLE_BUS_PPC440GX_EBC8 -libbus_a_SOURCES += ppc440gx_ebc8.c +libbus_la_SOURCES += ppc440gx_ebc8.c endif if ENABLE_BUS_PROTOTYPE -libbus_a_SOURCES += prototype.c +libbus_la_SOURCES += prototype.c endif if ENABLE_BUS_PXA2X0 -libbus_a_SOURCES += pxa2x0.c +libbus_la_SOURCES += pxa2x0.c else if ENABLE_BUS_PXA27X -libbus_a_SOURCES += pxa2x0.c +libbus_la_SOURCES += pxa2x0.c endif endif if ENABLE_BUS_S3C4510 -libbus_a_SOURCES += s3c4510x.c +libbus_la_SOURCES += s3c4510x.c endif if ENABLE_BUS_SA1110 -libbus_a_SOURCES += sa1110.c +libbus_la_SOURCES += sa1110.c endif if ENABLE_BUS_SH7727 -libbus_a_SOURCES += sh7727.c +libbus_la_SOURCES += sh7727.c endif if ENABLE_BUS_SH7750R -libbus_a_SOURCES += sh7750r.c +libbus_la_SOURCES += sh7750r.c endif if ENABLE_BUS_SH7751R -libbus_a_SOURCES += sh7751r.c +libbus_la_SOURCES += sh7751r.c endif if ENABLE_BUS_SHARC_21065L -libbus_a_SOURCES += sharc21065l.c +libbus_la_SOURCES += sharc21065l.c endif if ENABLE_BUS_SLSUP3 -libbus_a_SOURCES += slsup3.c +libbus_la_SOURCES += slsup3.c endif if ENABLE_BUS_TX4925 -libbus_a_SOURCES += tx4925.c +libbus_la_SOURCES += tx4925.c endif if ENABLE_BUS_ZEFANT_XS3 -libbus_a_SOURCES += zefant-xs3.c +libbus_la_SOURCES += zefant-xs3.c endif diff --git a/urjtag/src/cmd/Makefile.am b/urjtag/src/cmd/Makefile.am index c626356b..562a3cae 100644 --- a/urjtag/src/cmd/Makefile.am +++ b/urjtag/src/cmd/Makefile.am @@ -23,55 +23,55 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libcmd.a +noinst_LTLIBRARIES = libcmd.la -libcmd_a_SOURCES = -libcmd_a_SOURCES += cmd_frequency.c -libcmd_a_SOURCES += cmd_cable.c -libcmd_a_SOURCES += cmd_reset.c -libcmd_a_SOURCES += cmd_discovery.c -libcmd_a_SOURCES += cmd_idcode.c -libcmd_a_SOURCES += cmd_detect.c -libcmd_a_SOURCES += cmd_detectflash.c -libcmd_a_SOURCES += cmd_help.c -libcmd_a_SOURCES += cmd_quit.c -libcmd_a_SOURCES += cmd_scan.c -libcmd_a_SOURCES += cmd_signal.c -libcmd_a_SOURCES += cmd_salias.c -libcmd_a_SOURCES += cmd_bit.c -libcmd_a_SOURCES += cmd_register.c -libcmd_a_SOURCES += cmd_initbus.c -libcmd_a_SOURCES += cmd_print.c -libcmd_a_SOURCES += cmd_part.c -libcmd_a_SOURCES += cmd_bus.c -libcmd_a_SOURCES += cmd_instruction.c -libcmd_a_SOURCES += cmd_shift.c -libcmd_a_SOURCES += cmd_dr.c -libcmd_a_SOURCES += cmd_get.c -libcmd_a_SOURCES += cmd_test.c -libcmd_a_SOURCES += cmd_debug.c -libcmd_a_SOURCES += cmd_shell.c -libcmd_a_SOURCES += cmd_set.c -libcmd_a_SOURCES += cmd_endian.c -libcmd_a_SOURCES += cmd_parse.c -libcmd_a_SOURCES += cmd_peekpoke.c -libcmd_a_SOURCES += cmd_pod.c -libcmd_a_SOURCES += cmd_readmem.c -libcmd_a_SOURCES += cmd_writemem.c -libcmd_a_SOURCES += cmd_flashmem.c -libcmd_a_SOURCES += cmd_eraseflash.c -libcmd_a_SOURCES += cmd_include.c -libcmd_a_SOURCES += cmd_addpart.c -libcmd_a_SOURCES += cmd_cmd.c -libcmd_a_SOURCES += cmd_usleep.c -libcmd_a_SOURCES += cmd_jtag_data_dir.c +libcmd_la_SOURCES = \ + cmd_frequency.c \ + cmd_cable.c \ + cmd_reset.c \ + cmd_discovery.c \ + cmd_idcode.c \ + cmd_detect.c \ + cmd_detectflash.c \ + cmd_help.c \ + cmd_quit.c \ + cmd_scan.c \ + cmd_signal.c \ + cmd_salias.c \ + cmd_bit.c \ + cmd_register.c \ + cmd_initbus.c \ + cmd_print.c \ + cmd_part.c \ + cmd_bus.c \ + cmd_instruction.c \ + cmd_shift.c \ + cmd_dr.c \ + cmd_get.c \ + cmd_test.c \ + cmd_debug.c \ + cmd_shell.c \ + cmd_set.c \ + cmd_endian.c \ + cmd_parse.c \ + cmd_peekpoke.c \ + cmd_pod.c \ + cmd_readmem.c \ + cmd_writemem.c \ + cmd_flashmem.c \ + cmd_eraseflash.c \ + cmd_include.c \ + cmd_addpart.c \ + cmd_cmd.c \ + cmd_usleep.c \ + cmd_jtag_data_dir.c if ENABLE_SVF -libcmd_a_SOURCES += cmd_svf.c +libcmd_la_SOURCES += cmd_svf.c endif if ENABLE_BSDL -libcmd_a_SOURCES += cmd_bsdl.c +libcmd_la_SOURCES += cmd_bsdl.c endif AM_CPPFLAGS = -DJTAG_BIN_DIR=\"$(bindir)\" -DJTAG_DATA_DIR=\"$(pkgdatadir)\" diff --git a/urjtag/src/flash/Makefile.am b/urjtag/src/flash/Makefile.am index b7583660..240a1f5d 100644 --- a/urjtag/src/flash/Makefile.am +++ b/urjtag/src/flash/Makefile.am @@ -23,9 +23,9 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libflash.a +noinst_LTLIBRARIES = libflash.la -libflash_a_SOURCES = \ +libflash_la_SOURCES = \ amd.c \ amd_flash.c \ cfi.c \ @@ -35,7 +35,7 @@ libflash_a_SOURCES = \ jedec.c if JEDEC_EXP -libflash_a_SOURCES += \ +libflash_la_SOURCES += \ jedec_exp.c endif diff --git a/urjtag/src/jim/Makefile.am b/urjtag/src/jim/Makefile.am index f38124a7..622fc88c 100644 --- a/urjtag/src/jim/Makefile.am +++ b/urjtag/src/jim/Makefile.am @@ -23,9 +23,9 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libjim.a +noinst_LTLIBRARIES = libjim.la -libjim_a_SOURCES = \ +libjim_la_SOURCES = \ tap.c \ some_cpu.c \ intel_28f800b3.c diff --git a/urjtag/src/lib/Makefile.am b/urjtag/src/lib/Makefile.am index cc59faa5..70a4588a 100644 --- a/urjtag/src/lib/Makefile.am +++ b/urjtag/src/lib/Makefile.am @@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libjtaglib.a +noinst_LTLIBRARIES = libjtaglib.la if JTAG_RELOCATABLE libiberty_sources = \ @@ -39,7 +39,7 @@ else libiberty_sources = endif -libjtaglib_a_SOURCES = \ +libjtaglib_la_SOURCES = \ getdelim.c \ getline.c \ fclock.c \ diff --git a/urjtag/src/part/Makefile.am b/urjtag/src/part/Makefile.am index 19536cd9..b2b622df 100644 --- a/urjtag/src/part/Makefile.am +++ b/urjtag/src/part/Makefile.am @@ -23,9 +23,9 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libpart.a +noinst_LTLIBRARIES = libpart.la -libpart_a_SOURCES = \ +libpart_la_SOURCES = \ signal.c \ instruction.c \ data_register.c \ diff --git a/urjtag/src/svf/Makefile.am b/urjtag/src/svf/Makefile.am index 7d39376f..f78dc6f7 100644 --- a/urjtag/src/svf/Makefile.am +++ b/urjtag/src/svf/Makefile.am @@ -23,9 +23,10 @@ include $(top_srcdir)/Makefile.rules AM_YFLAGS = -d -noinst_LIBRARIES = libsvf.a +OBJEXT = lo +noinst_LTLIBRARIES = libsvf.la -libsvf_a_SOURCES = \ +libsvf_la_SOURCES = \ svf_bison.y \ svf_flex.l \ svf.h \ diff --git a/urjtag/src/tap/Makefile.am b/urjtag/src/tap/Makefile.am index 2b4da0b2..90b5eceb 100644 --- a/urjtag/src/tap/Makefile.am +++ b/urjtag/src/tap/Makefile.am @@ -23,9 +23,9 @@ include $(top_srcdir)/Makefile.rules -noinst_LIBRARIES = libtap.a +noinst_LTLIBRARIES = libtap.la -libtap_a_SOURCES = \ +libtap_la_SOURCES = \ tap.c \ register.c \ state.c \ @@ -46,119 +46,119 @@ libtap_a_SOURCES = \ cable/cmd_xfer.c if ENABLE_CABLE_ARCOM -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/arcom.c endif if ENABLE_CABLE_BYTEBLASTER -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/byteblaster.c endif if ENABLE_CABLE_DLC5 -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/dlc5.c endif if ENABLE_CABLE_EA253 -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/ea253.c endif if ENABLE_CABLE_EI012 -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/ei012.c endif if ENABLE_CABLE_KEITHKOEP -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/keithkoep.c endif if ENABLE_CABLE_LATTICE -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/lattice.c endif if ENABLE_CABLE_MPCBDM -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/mpcbdm.c endif if ENABLE_CABLE_TRITON -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/triton.c endif if ENABLE_CABLE_WIGGLER -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/wiggler.c \ cable/wiggler2.c endif if ENABLE_CABLE_JLINK -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/jlink.c endif if ENABLE_CABLE_XPC -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/xpc.c endif if ENABLE_CABLE_USBBLASTER -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/usbblaster.c endif if ENABLE_CABLE_FT2232 -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/ft2232.c endif if ENABLE_CABLE_TS7800 -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/ts7800.c endif if HAVE_LIBUSB -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ usbconn/libusb.c endif if ENABLE_JIM -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/jim.c endif if ENABLE_LOWLEVEL_FTDI -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ usbconn/libftdi.c endif if ENABLE_LOWLEVEL_FTD2XX -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ usbconn/libftd2xx.c endif if ENABLE_LOWLEVEL_DIRECT -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ parport/direct.c endif if ENABLE_LOWLEVEL_PPDEV -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ parport/ppdev.c endif if ENABLE_LOWLEVEL_PPI -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ parport/ppi.c endif if ENABLE_CABLE_EP9307 -libtap_a_SOURCES += \ +libtap_la_SOURCES += \ cable/vision_ep9307.c endif