Move TCL script files -- Step 1 of 2:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Wed, 27 May 2009 06:44:43 +0000 (06:44 +0000)
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Wed, 27 May 2009 06:44:43 +0000 (06:44 +0000)
- Move src/target/{interface,target,board,test}/ into src/tcl/
- Remove existing rules in src/Makefile.am and src/target/Makefile.am.
- Add Makefile.am handling of *.cfg and *.tcl files in top Makefile.am:
  - Add dist-hook to include such files under src/tcl in the distribution.
  - Add install-data-hook to install contents of '$(top_srcdir)/src/tcl/'.
  - Add uninstall-hook to remove the installed script files.
- Change paths to (un)install script files in '$(pkgdatadir)/scripts'.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1918 b42882b7-edfa-0310-969c-e2dbd0fdcd60

119 files changed:
Makefile.am
configure.in
src/Makefile.am
src/target/Makefile.am
src/tcl/board/arm_evaluator7t.cfg [moved from src/target/board/arm_evaluator7t.cfg with 100% similarity]
src/tcl/board/at91rm9200-dk.cfg [moved from src/target/board/at91rm9200-dk.cfg with 100% similarity]
src/tcl/board/crossbow_tech_imote2.cfg [moved from src/target/board/crossbow_tech_imote2.cfg with 100% similarity]
src/tcl/board/digi_connectcore_wi-9c.cfg [moved from src/target/board/digi_connectcore_wi-9c.cfg with 100% similarity]
src/tcl/board/dm355evm.cfg [moved from src/target/board/dm355evm.cfg with 100% similarity]
src/tcl/board/eir.cfg [moved from src/target/board/eir.cfg with 100% similarity]
src/tcl/board/hammer.cfg [moved from src/target/board/hammer.cfg with 100% similarity]
src/tcl/board/hitex_stm32-performancestick.cfg [moved from src/target/board/hitex_stm32-performancestick.cfg with 100% similarity]
src/tcl/board/hitex_str9-comstick.cfg [moved from src/target/board/hitex_str9-comstick.cfg with 100% similarity]
src/tcl/board/iar_str912_sk.cfg [moved from src/target/board/iar_str912_sk.cfg with 100% similarity]
src/tcl/board/imx27ads.cfg [moved from src/target/board/imx27ads.cfg with 100% similarity]
src/tcl/board/imx27lnst.cfg [moved from src/target/board/imx27lnst.cfg with 100% similarity]
src/tcl/board/imx31pdk.cfg [moved from src/target/board/imx31pdk.cfg with 100% similarity]
src/tcl/board/keil_mcb2140.cfg [moved from src/target/board/keil_mcb2140.cfg with 100% similarity]
src/tcl/board/linksys_nslu2.cfg [moved from src/target/board/linksys_nslu2.cfg with 100% similarity]
src/tcl/board/logicpd_imx27.cfg [moved from src/target/board/logicpd_imx27.cfg with 100% similarity]
src/tcl/board/olimex_LPC2378STK.cfg [moved from src/target/board/olimex_LPC2378STK.cfg with 100% similarity]
src/tcl/board/olimex_lpc_h2148.cfg [moved from src/target/board/olimex_lpc_h2148.cfg with 100% similarity]
src/tcl/board/olimex_sam7_ex256.cfg [moved from src/target/board/olimex_sam7_ex256.cfg with 100% similarity]
src/tcl/board/olimex_sam9_l9260.cfg [moved from src/target/board/olimex_sam9_l9260.cfg with 100% similarity]
src/tcl/board/olimex_stm32_h103.cfg [moved from src/target/board/olimex_stm32_h103.cfg with 100% similarity]
src/tcl/board/pic-p32mx.cfg [moved from src/target/board/pic-p32mx.cfg with 100% similarity]
src/tcl/board/pxa255_sst.cfg [moved from src/target/board/pxa255_sst.cfg with 100% similarity]
src/tcl/board/sheevaplug.cfg [moved from src/target/board/sheevaplug.cfg with 100% similarity]
src/tcl/board/stm3210e_eval.cfg [moved from src/target/board/stm3210e_eval.cfg with 100% similarity]
src/tcl/board/stm32f10x_128k_eval.cfg [moved from src/target/board/stm32f10x_128k_eval.cfg with 100% similarity]
src/tcl/board/str910-eval.cfg [moved from src/target/board/str910-eval.cfg with 100% similarity]
src/tcl/board/ti_beagleboard.cfg [moved from src/target/board/ti_beagleboard.cfg with 100% similarity]
src/tcl/board/unknown-board-atmel-at91sam9260.cfg [moved from src/target/board/unknown-board-atmel-at91sam9260.cfg with 100% similarity]
src/tcl/board/x300t.cfg [moved from src/target/board/x300t.cfg with 100% similarity]
src/tcl/board/zy1000.cfg [moved from src/target/board/zy1000.cfg with 100% similarity]
src/tcl/interface/arm-jtag-ew.cfg [moved from src/target/interface/arm-jtag-ew.cfg with 100% similarity]
src/tcl/interface/arm-usb-ocd.cfg [moved from src/target/interface/arm-usb-ocd.cfg with 100% similarity]
src/tcl/interface/at91rm9200.cfg [moved from src/target/interface/at91rm9200.cfg with 100% similarity]
src/tcl/interface/axm0432.cfg [moved from src/target/interface/axm0432.cfg with 100% similarity]
src/tcl/interface/calao-usb-a9260-c01.cfg [moved from src/target/interface/calao-usb-a9260-c01.cfg with 100% similarity]
src/tcl/interface/calao-usb-a9260-c02.cfg [moved from src/target/interface/calao-usb-a9260-c02.cfg with 100% similarity]
src/tcl/interface/calao-usb-a9260.cfg [moved from src/target/interface/calao-usb-a9260.cfg with 100% similarity]
src/tcl/interface/chameleon.cfg [moved from src/target/interface/chameleon.cfg with 100% similarity]
src/tcl/interface/dummy.cfg [moved from src/target/interface/dummy.cfg with 100% similarity]
src/tcl/interface/flyswatter.cfg [moved from src/target/interface/flyswatter.cfg with 100% similarity]
src/tcl/interface/hitex_str9-comstick.cfg [moved from src/target/interface/hitex_str9-comstick.cfg with 100% similarity]
src/tcl/interface/icebear.cfg [moved from src/target/interface/icebear.cfg with 100% similarity]
src/tcl/interface/jlink.cfg [moved from src/target/interface/jlink.cfg with 100% similarity]
src/tcl/interface/jtagkey-tiny.cfg [moved from src/target/interface/jtagkey-tiny.cfg with 100% similarity]
src/tcl/interface/jtagkey.cfg [moved from src/target/interface/jtagkey.cfg with 100% similarity]
src/tcl/interface/luminary-lm3s811.cfg [moved from src/target/interface/luminary-lm3s811.cfg with 100% similarity]
src/tcl/interface/luminary.cfg [moved from src/target/interface/luminary.cfg with 100% similarity]
src/tcl/interface/olimex-arm-usb-ocd.cfg [moved from src/target/interface/olimex-arm-usb-ocd.cfg with 100% similarity]
src/tcl/interface/olimex-jtag-tiny.cfg [moved from src/target/interface/olimex-jtag-tiny.cfg with 100% similarity]
src/tcl/interface/oocdlink.cfg [moved from src/target/interface/oocdlink.cfg with 100% similarity]
src/tcl/interface/openocd-usb.cfg [moved from src/target/interface/openocd-usb.cfg with 100% similarity]
src/tcl/interface/parport.cfg [moved from src/target/interface/parport.cfg with 100% similarity]
src/tcl/interface/parport_dlc5.cfg [moved from src/target/interface/parport_dlc5.cfg with 100% similarity]
src/tcl/interface/rlink.cfg [moved from src/target/interface/rlink.cfg with 100% similarity]
src/tcl/interface/sheevaplug.cfg [moved from src/target/interface/sheevaplug.cfg with 100% similarity]
src/tcl/interface/signalyzer.cfg [moved from src/target/interface/signalyzer.cfg with 100% similarity]
src/tcl/interface/stm32-stick.cfg [moved from src/target/interface/stm32-stick.cfg with 100% similarity]
src/tcl/interface/turtelizer2.cfg [moved from src/target/interface/turtelizer2.cfg with 100% similarity]
src/tcl/interface/usbprog.cfg [moved from src/target/interface/usbprog.cfg with 100% similarity]
src/tcl/interface/vsllink.cfg [moved from src/target/interface/vsllink.cfg with 100% similarity]
src/tcl/target/aduc702x.cfg [moved from src/target/target/aduc702x.cfg with 100% similarity]
src/tcl/target/at91eb40a.cfg [moved from src/target/target/at91eb40a.cfg with 100% similarity]
src/tcl/target/at91r40008.cfg [moved from src/target/target/at91r40008.cfg with 100% similarity]
src/tcl/target/at91rm9200.cfg [moved from src/target/target/at91rm9200.cfg with 100% similarity]
src/tcl/target/at91sam9260.cfg [moved from src/target/target/at91sam9260.cfg with 100% similarity]
src/tcl/target/at91sam9260_ext_RAM_ext_flash.cfg [moved from src/target/target/at91sam9260_ext_RAM_ext_flash.cfg with 100% similarity]
src/tcl/target/davinci.cfg [moved from src/target/target/davinci.cfg with 100% similarity]
src/tcl/target/epc9301.cfg [moved from src/target/target/epc9301.cfg with 100% similarity]
src/tcl/target/feroceon.cfg [moved from src/target/target/feroceon.cfg with 100% similarity]
src/tcl/target/imx21.cfg [moved from src/target/target/imx21.cfg with 100% similarity]
src/tcl/target/imx27.cfg [moved from src/target/target/imx27.cfg with 100% similarity]
src/tcl/target/imx31.cfg [moved from src/target/target/imx31.cfg with 100% similarity]
src/tcl/target/imx35.cfg [moved from src/target/target/imx35.cfg with 100% similarity]
src/tcl/target/is5114.cfg [moved from src/target/target/is5114.cfg with 100% similarity]
src/tcl/target/ixp42x.cfg [moved from src/target/target/ixp42x.cfg with 100% similarity]
src/tcl/target/lm3s3748.cfg [moved from src/target/target/lm3s3748.cfg with 100% similarity]
src/tcl/target/lm3s6965.cfg [moved from src/target/target/lm3s6965.cfg with 100% similarity]
src/tcl/target/lm3s811.cfg [moved from src/target/target/lm3s811.cfg with 100% similarity]
src/tcl/target/lpc2103.cfg [moved from src/target/target/lpc2103.cfg with 100% similarity]
src/tcl/target/lpc2124.cfg [moved from src/target/target/lpc2124.cfg with 100% similarity]
src/tcl/target/lpc2129.cfg [moved from src/target/target/lpc2129.cfg with 100% similarity]
src/tcl/target/lpc2148.cfg [moved from src/target/target/lpc2148.cfg with 100% similarity]
src/tcl/target/lpc2294.cfg [moved from src/target/target/lpc2294.cfg with 100% similarity]
src/tcl/target/lpc2378.cfg [moved from src/target/target/lpc2378.cfg with 100% similarity]
src/tcl/target/lpc2478.cfg [moved from src/target/target/lpc2478.cfg with 100% similarity]
src/tcl/target/mega128.cfg [moved from src/target/target/mega128.cfg with 100% similarity]
src/tcl/target/netx500.cfg [moved from src/target/target/netx500.cfg with 100% similarity]
src/tcl/target/omap3530.cfg [moved from src/target/target/omap3530.cfg with 100% similarity]
src/tcl/target/omap5912.cfg [moved from src/target/target/omap5912.cfg with 100% similarity]
src/tcl/target/pic32mx.cfg [moved from src/target/target/pic32mx.cfg with 100% similarity]
src/tcl/target/pxa255.cfg [moved from src/target/target/pxa255.cfg with 100% similarity]
src/tcl/target/pxa270.cfg [moved from src/target/target/pxa270.cfg with 100% similarity]
src/tcl/target/readme.txt [moved from src/target/target/readme.txt with 100% similarity]
src/tcl/target/sam7se512.cfg [moved from src/target/target/sam7se512.cfg with 100% similarity]
src/tcl/target/sam7x256.cfg [moved from src/target/target/sam7x256.cfg with 100% similarity]
src/tcl/target/samsung_s3c2410.cfg [moved from src/target/target/samsung_s3c2410.cfg with 100% similarity]
src/tcl/target/samsung_s3c2440.cfg [moved from src/target/target/samsung_s3c2440.cfg with 100% similarity]
src/tcl/target/samsung_s3c4510.cfg [moved from src/target/target/samsung_s3c4510.cfg with 100% similarity]
src/tcl/target/samsung_s3c6410.cfg [moved from src/target/target/samsung_s3c6410.cfg with 100% similarity]
src/tcl/target/sharp_lh79532.cfg [moved from src/target/target/sharp_lh79532.cfg with 100% similarity]
src/tcl/target/smdk6410.cfg [moved from src/target/target/smdk6410.cfg with 100% similarity]
src/tcl/target/smp8634.cfg [moved from src/target/target/smp8634.cfg with 100% similarity]
src/tcl/target/stm32.cfg [moved from src/target/target/stm32.cfg with 100% similarity]
src/tcl/target/str710.cfg [moved from src/target/target/str710.cfg with 100% similarity]
src/tcl/target/str730.cfg [moved from src/target/target/str730.cfg with 100% similarity]
src/tcl/target/str750.cfg [moved from src/target/target/str750.cfg with 100% similarity]
src/tcl/target/str912.cfg [moved from src/target/target/str912.cfg with 100% similarity]
src/tcl/target/test_reset_syntax_error.cfg [moved from src/target/target/test_reset_syntax_error.cfg with 100% similarity]
src/tcl/target/test_syntax_error.cfg [moved from src/target/target/test_syntax_error.cfg with 100% similarity]
src/tcl/target/ti_dm355.cfg [moved from src/target/target/ti_dm355.cfg with 100% similarity]
src/tcl/target/ti_dm6446.cfg [moved from src/target/target/ti_dm6446.cfg with 100% similarity]
src/tcl/target/xba_revA3.cfg [moved from src/target/target/xba_revA3.cfg with 100% similarity]
src/tcl/test/selftest.cfg [moved from src/target/test/selftest.cfg with 100% similarity]
src/tcl/test/syntax1.cfg [moved from src/target/test/syntax1.cfg with 100% similarity]

index c14c81f..431244b 100644 (file)
@@ -29,6 +29,29 @@ doxygen::
        $(MAKE) Doxyfile
        doxygen Doxyfile 2>&1 | perl $(srcdir)/tools/logger.pl > doxygen.log
 
+TCL_PATH = src/tcl
+# command to find paths of script files, relative to TCL_PATH
+TCL_FILES := find $(srcdir)/$(TCL_PATH) -name '*.cfg' -o -name '*.tcl' | \
+               sed -e 's,^$(srcdir)/$(TCL_PATH),,'
+
+dist-hook:
+       for i in $$($(TCL_FILES)); do \
+               j="$(distdir)/$(TCL_PATH)/$$i" && \
+               mkdir -p "$$(dirname $$j)" && \
+               $(INSTALL_DATA) $(srcdir)/$(TCL_PATH)/$$i $$j; \
+       done
+
+install-data-hook:
+       for i in $$($(TCL_FILES)); do \
+               j="$(DESTDIR)$(pkgdatadir)/scripts/$$i" && \
+               mkdir -p "$$(dirname $$j)" && \
+               $(INSTALL_DATA) $(srcdir)/$(TCL_PATH)/$$i $$j; \
+       done
+
+uninstall-hook:
+       rm -rf $(DESTDIR)$(pkgdatadir)/scripts
+
+
 distclean-local:
        rm -rf Doxyfile doxygen
 
index e46f06f..93c9598 100644 (file)
@@ -834,6 +834,7 @@ AC_PROG_CC_C99
 AM_PROG_CC_C_O
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
+AC_PROG_INSTALL
 
 dnl configure checks required for Jim files (these are obsolete w/ C99)
 AC_C_CONST
index c785e2a..6b78d09 100644 (file)
@@ -92,24 +92,4 @@ if HTTPD
 libopenocd_la_LIBADD += -lmicrohttpd
 endif
 
-nobase_dist_pkglib_DATA = \
-       tcl/bitsbytes.tcl                       \
-       tcl/chip/atmel/at91/aic.tcl             \
-       tcl/chip/atmel/at91/at91sam7x128.tcl    \
-       tcl/chip/atmel/at91/at91sam7x256.tcl    \
-       tcl/chip/atmel/at91/pmc.tcl             \
-       tcl/chip/atmel/at91/rtt.tcl             \
-       tcl/chip/atmel/at91/usarts.tcl          \
-       tcl/chip/st/stm32/stm32.tcl             \
-       tcl/chip/st/stm32/stm32_rcc.tcl         \
-       tcl/chip/st/stm32/stm32_regs.tcl        \
-       tcl/cpu/arm/arm7tdmi.tcl                \
-       tcl/cpu/arm/arm920.tcl                  \
-       tcl/cpu/arm/arm946.tcl                  \
-       tcl/cpu/arm/arm966.tcl                  \
-       tcl/cpu/arm/cortex_m3.tcl               \
-       tcl/memory.tcl                          \
-       tcl/mmr_helpers.tcl                     \
-       tcl/readable.tcl
-
 MAINTAINERCLEANFILES = Makefile.in
index 9079618..28a2981 100644 (file)
@@ -26,14 +26,5 @@ noinst_HEADERS = target.h trace.h register.h armv4_5.h embeddedice.h etm.h arm7t
 nobase_dist_pkglib_DATA =
 nobase_dist_pkglib_DATA += xscale/debug_handler.bin 
 nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
-# Various chip targets
-nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/target/*.cfg)
-# Various jtag interfaces
-nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/interface/*.cfg)
-# Various preconfigured boards
-nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/board/*.cfg)
-
-# test files
-nobase_dist_pkglib_DATA += $(wildcard $(srcdir)/test/*.cfg)
 
 MAINTAINERCLEANFILES = Makefile.in