Move build and debug tools to 'cctools' directory.

These tools were merged in from the ccdbg package.

Signed-off-by: Keith Packard <keithp@keithp.com>

84 files changed, 27 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index b0d059ea..7bfda5bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS=src aoview lib ccload s51 ccmanual ccdump aoload
+SUBDIRS=src aoview cctools
diff --git a/ccdump/Makefile.am b/ccdump/Makefile.am
deleted file mode 100644
index 976383f7..00000000
--- a/ccdump/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-bin_PROGRAMS=ccdump
-
-AM_CFLAGS=-I$(top_srcdir)/lib $(LIBUSB_CFLAGS)
-CCLOAD_LIBS=../lib/libcc.a
-
-ccdump_DEPENDENCIES = $(CCLOAD_LIBS)
-
-ccdump_LDADD=$(CCLOAD_LIBS) $(LIBUSB_LIBS)
-
-ccdump_SOURCES = ccdump.c
diff --git a/cctools/Makefile.am b/cctools/Makefile.am
new file mode 100644
index 00000000..a7bf7fa5
--- /dev/null
+++ b/cctools/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=ccload s51 ccmanual ccdump aoload
diff --git a/aoload/Makefile.am b/cctools/aoload/Makefile.am
index 2e32c0b9..48fb89f3 100644
--- a/aoload/Makefile.am
+++ b/cctools/aoload/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS=aoload
 
-AM_CFLAGS=-I$(top_srcdir)/lib $(LIBUSB_CFLAGS)
-AOLOAD_LIBS=../lib/libcc.a
+AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
+AOLOAD_LIBS=$(top_builddir)/cctools/lib/libcc.a
 
 aoload_DEPENDENCIES = $(AOLOAD_LIBS)
 
diff --git a/aoload/aoload.c b/cctools/aoload/aoload.c
index b84a88a6..b84a88a6 100644
--- a/aoload/aoload.c
+++ b/cctools/aoload/aoload.c
diff --git a/cctools/ccdump/Makefile.am b/cctools/ccdump/Makefile.am
new file mode 100644
index 00000000..752eb407
--- /dev/null
+++ b/cctools/ccdump/Makefile.am
@@ -0,0 +1,10 @@
+bin_PROGRAMS=ccdump
+
+AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
+CCDUMP_LIBS=$(top_builddir)/cctools/lib/libcc.a
+
+ccdump_DEPENDENCIES = $(CCDUMP_LIBS)
+
+ccdump_LDADD=$(CCDUMP_LIBS) $(LIBUSB_LIBS)
+
+ccdump_SOURCES = ccdump.c
diff --git a/ccdump/ccdump.c b/cctools/ccdump/ccdump.c
index 399732d9..399732d9 100644
--- a/ccdump/ccdump.c
+++ b/cctools/ccdump/ccdump.c
diff --git a/ccload/.gitignore b/cctools/ccload/.gitignore
index 3899747a..3899747a 100644
--- a/ccload/.gitignore
+++ b/cctools/ccload/.gitignore
diff --git a/ccload/Makefile.am b/cctools/ccload/Makefile.am
index 3a754b23..b07e9b70 100644
--- a/ccload/Makefile.am
+++ b/cctools/ccload/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS=ccload
 
-AM_CFLAGS=-I$(top_srcdir)/lib $(LIBUSB_CFLAGS)
-CCLOAD_LIBS=../lib/libcc.a
+AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
+CCLOAD_LIBS=$(top_builddir)/cctools/lib/libcc.a
 
 ccload_DEPENDENCIES = $(CCLOAD_LIBS)
 
diff --git a/ccload/ccload.c b/cctools/ccload/ccload.c
index 5f7708fd..5f7708fd 100644
--- a/ccload/ccload.c
+++ b/cctools/ccload/ccload.c
diff --git a/ccmanual/Makefile.am b/cctools/ccmanual/Makefile.am
index 4477ef8a..b0b33514 100644
--- a/ccmanual/Makefile.am
+++ b/cctools/ccmanual/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS=ccmanual
 
-AM_CFLAGS=-I$(top_srcdir)/lib $(LIBUSB_CFLAGS)
-CCMANUAL_LIBS=../lib/libcc.a
+AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
+CCMANUAL_LIBS=$(top_builddir)/cctools/lib/libcc.a
 
 ccmanual_DEPENDENCIES = $(CCMANUAL_LIBS)
 
diff --git a/ccmanual/ccmanual.c b/cctools/ccmanual/ccmanual.c
index 7090c9a3..7090c9a3 100644
--- a/ccmanual/ccmanual.c
+++ b/cctools/ccmanual/ccmanual.c
diff --git a/lib/Makefile.am b/cctools/lib/Makefile.am
index 4d9ded3a..4d9ded3a 100644
--- a/lib/Makefile.am
+++ b/cctools/lib/Makefile.am
diff --git a/lib/cc-bitbang.c b/cctools/lib/cc-bitbang.c
index 1d3ba476..1d3ba476 100644
--- a/lib/cc-bitbang.c
+++ b/cctools/lib/cc-bitbang.c
diff --git a/lib/cc-bitbang.h b/cctools/lib/cc-bitbang.h
index 54b20e2c..54b20e2c 100644
--- a/lib/cc-bitbang.h
+++ b/cctools/lib/cc-bitbang.h
diff --git a/lib/cc-usb.c b/cctools/lib/cc-usb.c
index dc764c24..dc764c24 100644
--- a/lib/cc-usb.c
+++ b/cctools/lib/cc-usb.c
diff --git a/lib/cc-usb.h b/cctools/lib/cc-usb.h
index d7acfbd2..d7acfbd2 100644
--- a/lib/cc-usb.h
+++ b/cctools/lib/cc-usb.h
diff --git a/lib/cccp.c b/cctools/lib/cccp.c
index 34e866e8..34e866e8 100644
--- a/lib/cccp.c
+++ b/cctools/lib/cccp.c
diff --git a/lib/cccp.h b/cctools/lib/cccp.h
index eecdbb49..eecdbb49 100644
--- a/lib/cccp.h
+++ b/cctools/lib/cccp.h
diff --git a/lib/ccdbg-command.c b/cctools/lib/ccdbg-command.c
index a1002879..a1002879 100644
--- a/lib/ccdbg-command.c
+++ b/cctools/lib/ccdbg-command.c
diff --git a/lib/ccdbg-debug.c b/cctools/lib/ccdbg-debug.c
index 6eb4e0c5..6eb4e0c5 100644
--- a/lib/ccdbg-debug.c
+++ b/cctools/lib/ccdbg-debug.c
diff --git a/lib/ccdbg-debug.h b/cctools/lib/ccdbg-debug.h
index 0b5b44c1..0b5b44c1 100644
--- a/lib/ccdbg-debug.h
+++ b/cctools/lib/ccdbg-debug.h
diff --git a/lib/ccdbg-flash.c b/cctools/lib/ccdbg-flash.c
index 3e672985..3e672985 100644
--- a/lib/ccdbg-flash.c
+++ b/cctools/lib/ccdbg-flash.c
diff --git a/lib/ccdbg-hex.c b/cctools/lib/ccdbg-hex.c
index dfea9156..dfea9156 100644
--- a/lib/ccdbg-hex.c
+++ b/cctools/lib/ccdbg-hex.c
diff --git a/lib/ccdbg-io.c b/cctools/lib/ccdbg-io.c
index 9c6693cd..9c6693cd 100644
--- a/lib/ccdbg-io.c
+++ b/cctools/lib/ccdbg-io.c
diff --git a/lib/ccdbg-manual.c b/cctools/lib/ccdbg-manual.c
index 0e811b76..0e811b76 100644
--- a/lib/ccdbg-manual.c
+++ b/cctools/lib/ccdbg-manual.c
diff --git a/lib/ccdbg-memory.c b/cctools/lib/ccdbg-memory.c
index 554ac637..554ac637 100644
--- a/lib/ccdbg-memory.c
+++ b/cctools/lib/ccdbg-memory.c
diff --git a/lib/ccdbg-rom.c b/cctools/lib/ccdbg-rom.c
index 71bed220..71bed220 100644
--- a/lib/ccdbg-rom.c
+++ b/cctools/lib/ccdbg-rom.c
diff --git a/lib/ccdbg-state.c b/cctools/lib/ccdbg-state.c
index 9aca8d2e..9aca8d2e 100644
--- a/lib/ccdbg-state.c
+++ b/cctools/lib/ccdbg-state.c
diff --git a/lib/ccdbg.h b/cctools/lib/ccdbg.h
index 4a2e3b9f..4a2e3b9f 100644
--- a/lib/ccdbg.h
+++ b/cctools/lib/ccdbg.h
diff --git a/lib/cp-usb-async.c b/cctools/lib/cp-usb-async.c
index 6539394b..6539394b 100644
--- a/lib/cp-usb-async.c
+++ b/cctools/lib/cp-usb-async.c
diff --git a/lib/cp-usb-async.h b/cctools/lib/cp-usb-async.h
index 976a320e..976a320e 100644
--- a/lib/cp-usb-async.h
+++ b/cctools/lib/cp-usb-async.h
diff --git a/lib/cp-usb.c b/cctools/lib/cp-usb.c
index 530848db..530848db 100644
--- a/lib/cp-usb.c
+++ b/cctools/lib/cp-usb.c
diff --git a/lib/cp-usb.h b/cctools/lib/cp-usb.h
index 3e5f25ff..3e5f25ff 100644
--- a/lib/cp-usb.h
+++ b/cctools/lib/cp-usb.h
diff --git a/s51/.gitignore b/cctools/s51/.gitignore
index cb909cf0..cb909cf0 100644
--- a/s51/.gitignore
+++ b/cctools/s51/.gitignore
diff --git a/s51/Makefile.am b/cctools/s51/Makefile.am
index 4778d66b..4b95b3f7 100644
--- a/s51/Makefile.am
+++ b/cctools/s51/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS=s51
 
-AM_CFLAGS=-I$(top_srcdir)/lib $(LIBUSB_CFLAGS)
-S51_LIBS=../lib/libcc.a -lreadline
+AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS)
+S51_LIBS=$(top_builddir)/cctools/lib/libcc.a -lreadline
 
 man_MANS = s51.1
 
diff --git a/s51/commands b/cctools/s51/commands
index aba65cd0..aba65cd0 100644
--- a/s51/commands
+++ b/cctools/s51/commands
diff --git a/s51/s51-command.c b/cctools/s51/s51-command.c
index 4f803060..4f803060 100644
--- a/s51/s51-command.c
+++ b/cctools/s51/s51-command.c
diff --git a/s51/s51-main.c b/cctools/s51/s51-main.c
index 4dbd4c60..4dbd4c60 100644
--- a/s51/s51-main.c
+++ b/cctools/s51/s51-main.c
diff --git a/s51/s51-parse.c b/cctools/s51/s51-parse.c
index 170c979d..170c979d 100644
--- a/s51/s51-parse.c
+++ b/cctools/s51/s51-parse.c
diff --git a/s51/s51.1 b/cctools/s51/s51.1
index f2f59a52..f2f59a52 100644
--- a/s51/s51.1
+++ b/cctools/s51/s51.1
diff --git a/s51/s51.h b/cctools/s51/s51.h
index f4dcce66..f4dcce66 100644
--- a/s51/s51.h
+++ b/cctools/s51/s51.h
diff --git a/target/adc-serial/Makefile b/cctools/target/adc-serial/Makefile
index 9a8bf5c6..9a8bf5c6 100644
--- a/target/adc-serial/Makefile
+++ b/cctools/target/adc-serial/Makefile
diff --git a/target/adc-serial/adc_serial.c b/cctools/target/adc-serial/adc_serial.c
index 1f7b6880..1f7b6880 100644
--- a/target/adc-serial/adc_serial.c
+++ b/cctools/target/adc-serial/adc_serial.c
diff --git a/target/adc/Makefile b/cctools/target/adc/Makefile
index 54c1211a..54c1211a 100644
--- a/target/adc/Makefile
+++ b/cctools/target/adc/Makefile
diff --git a/target/adc/adc.c b/cctools/target/adc/adc.c
index 3a63a2c6..3a63a2c6 100644
--- a/target/adc/adc.c
+++ b/cctools/target/adc/adc.c
diff --git a/target/beep-timer/Makefile b/cctools/target/beep-timer/Makefile
index 008adbd5..008adbd5 100644
--- a/target/beep-timer/Makefile
+++ b/cctools/target/beep-timer/Makefile
diff --git a/target/beep-timer/beep_timer.c b/cctools/target/beep-timer/beep_timer.c
index b3fa8754..b3fa8754 100644
--- a/target/beep-timer/beep_timer.c
+++ b/cctools/target/beep-timer/beep_timer.c
diff --git a/target/beep/Makefile b/cctools/target/beep/Makefile
index 8f600b4a..8f600b4a 100644
--- a/target/beep/Makefile
+++ b/cctools/target/beep/Makefile
diff --git a/target/beep/beep.c b/cctools/target/beep/beep.c
index 09c915b7..09c915b7 100644
--- a/target/beep/beep.c
+++ b/cctools/target/beep/beep.c
diff --git a/target/blink/.gitignore b/cctools/target/blink/.gitignore
index 40f72de9..40f72de9 100644
--- a/target/blink/.gitignore
+++ b/cctools/target/blink/.gitignore
diff --git a/target/blink/Makefile b/cctools/target/blink/Makefile
index d0112e62..d0112e62 100644
--- a/target/blink/Makefile
+++ b/cctools/target/blink/Makefile
diff --git a/target/blink/blink.c b/cctools/target/blink/blink.c
index 907c82b8..907c82b8 100644
--- a/target/blink/blink.c
+++ b/cctools/target/blink/blink.c
diff --git a/target/dma/Makefile b/cctools/target/dma/Makefile
index 9cb3e327..9cb3e327 100644
--- a/target/dma/Makefile
+++ b/cctools/target/dma/Makefile
diff --git a/target/dma/dma.c b/cctools/target/dma/dma.c
index 1762b658..1762b658 100644
--- a/target/dma/dma.c
+++ b/cctools/target/dma/dma.c
diff --git a/target/ee/Makefile b/cctools/target/ee/Makefile
index 4c9abd1f..4c9abd1f 100644
--- a/target/ee/Makefile
+++ b/cctools/target/ee/Makefile
diff --git a/target/ee/ee.c b/cctools/target/ee/ee.c
index 9ea22cdc..9ea22cdc 100644
--- a/target/ee/ee.c
+++ b/cctools/target/ee/ee.c
diff --git a/target/isr.c b/cctools/target/isr.c
index ae4d04c5..ae4d04c5 100644
--- a/target/isr.c
+++ b/cctools/target/isr.c
diff --git a/target/radio/Makefile b/cctools/target/radio/Makefile
index 97706fef..97706fef 100644
--- a/target/radio/Makefile
+++ b/cctools/target/radio/Makefile
diff --git a/target/radio/init.c b/cctools/target/radio/init.c
index ea7c984c..ea7c984c 100644
--- a/target/radio/init.c
+++ b/cctools/target/radio/init.c
diff --git a/target/radio/radio.h b/cctools/target/radio/radio.h
index f68001e4..f68001e4 100644
--- a/target/radio/radio.h
+++ b/cctools/target/radio/radio.h
diff --git a/target/radio/recv.c b/cctools/target/radio/recv.c
index c50c3205..c50c3205 100644
--- a/target/radio/recv.c
+++ b/cctools/target/radio/recv.c
diff --git a/target/radio/xmit.c b/cctools/target/radio/xmit.c
index e80a0f8b..e80a0f8b 100644
--- a/target/radio/xmit.c
+++ b/cctools/target/radio/xmit.c
diff --git a/target/serial/Makefile b/cctools/target/serial/Makefile
index 3a1d81e8..3a1d81e8 100644
--- a/target/serial/Makefile
+++ b/cctools/target/serial/Makefile
diff --git a/target/serial/serial.c b/cctools/target/serial/serial.c
index 63f6c6de..63f6c6de 100644
--- a/target/serial/serial.c
+++ b/cctools/target/serial/serial.c
diff --git a/target/simple/Makefile b/cctools/target/simple/Makefile
index 70c0f888..70c0f888 100644
--- a/target/simple/Makefile
+++ b/cctools/target/simple/Makefile
diff --git a/target/simple/simple.c b/cctools/target/simple/simple.c
index b7ea1019..b7ea1019 100644
--- a/target/simple/simple.c
+++ b/cctools/target/simple/simple.c
diff --git a/target/timer/Makefile b/cctools/target/timer/Makefile
index 99e06b8d..99e06b8d 100644
--- a/target/timer/Makefile
+++ b/cctools/target/timer/Makefile
diff --git a/target/timer/cc1111.h b/cctools/target/timer/cc1111.h
index 76c95c27..76c95c27 100644
--- a/target/timer/cc1111.h
+++ b/cctools/target/timer/cc1111.h
diff --git a/target/timer/timer.c b/cctools/target/timer/timer.c
index ae75d0a8..ae75d0a8 100644
--- a/target/timer/timer.c
+++ b/cctools/target/timer/timer.c
diff --git a/tests/blink-tiny b/cctools/tests/blink-tiny
index fd075e57..fd075e57 100644
--- a/tests/blink-tiny
+++ b/cctools/tests/blink-tiny
diff --git a/tests/blink-tiny-ram b/cctools/tests/blink-tiny-ram
index 018716d5..018716d5 100644
--- a/tests/blink-tiny-ram
+++ b/cctools/tests/blink-tiny-ram
diff --git a/tests/chip_id b/cctools/tests/chip_id
index b3ecf314..b3ecf314 100644
--- a/tests/chip_id
+++ b/cctools/tests/chip_id
diff --git a/tests/debug_mode b/cctools/tests/debug_mode
index 2b5ec020..2b5ec020 100644
--- a/tests/debug_mode
+++ b/cctools/tests/debug_mode
diff --git a/tests/get_pc b/cctools/tests/get_pc
index 13bcba15..13bcba15 100644
--- a/tests/get_pc
+++ b/cctools/tests/get_pc
diff --git a/tests/get_status b/cctools/tests/get_status
index 3e67a2e0..3e67a2e0 100644
--- a/tests/get_status
+++ b/cctools/tests/get_status
diff --git a/tests/half_phase b/cctools/tests/half_phase
index 3ca4a303..3ca4a303 100644
--- a/tests/half_phase
+++ b/cctools/tests/half_phase
diff --git a/tests/in b/cctools/tests/in
index 93341e32..93341e32 100644
--- a/tests/in
+++ b/cctools/tests/in
diff --git a/tests/p1_1 b/cctools/tests/p1_1
index 08d8ab50..08d8ab50 100644
--- a/tests/p1_1
+++ b/cctools/tests/p1_1
diff --git a/tests/rd_config b/cctools/tests/rd_config
index e2d43f10..e2d43f10 100644
--- a/tests/rd_config
+++ b/cctools/tests/rd_config
diff --git a/tests/read_status b/cctools/tests/read_status
index 3ae46058..3ae46058 100644
--- a/tests/read_status
+++ b/cctools/tests/read_status
diff --git a/tests/reset b/cctools/tests/reset
index a32c8bec..a32c8bec 100644
--- a/tests/reset
+++ b/cctools/tests/reset
diff --git a/tests/wr_config b/cctools/tests/wr_config
index 1ee31623..1ee31623 100644
--- a/tests/wr_config
+++ b/cctools/tests/wr_config
diff --git a/configure.ac b/configure.ac
index 99511a6e..f7587a3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,10 +50,11 @@ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0])
 AC_OUTPUT([
 Makefile
 aoview/Makefile
-lib/Makefile
-ccload/Makefile
-s51/Makefile
-ccmanual/Makefile
-ccdump/Makefile
-aoload/Makefile
+cctools/Makefile
+cctools/lib/Makefile
+cctools/ccload/Makefile
+cctools/s51/Makefile
+cctools/ccmanual/Makefile
+cctools/ccdump/Makefile
+cctools/aoload/Makefile
 ])