From 7c790fe859dff062692964338091ffbbcdf63257 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 18 Aug 2009 12:40:24 -0700 Subject: [PATCH 1/1] Rename tools to ao- Use a consistent prefix to make it easier to remember which programs belong to this package Signed-off-by: Keith Packard --- .gitignore | 15 +++++++++------ Makefile.am | 2 +- ao-tools/Makefile.am | 1 + ao-tools/ao-bitbang/Makefile.am | 10 ++++++++++ .../ao-bitbang/ao-bitbang.c | 0 {cctools/s51 => ao-tools/ao-dbg}/.gitignore | 0 ao-tools/ao-dbg/Makefile.am | 12 ++++++++++++ .../ao-dbg/ao-dbg-command.c | 2 +- .../ao-dbg/ao-dbg-main.c | 2 +- .../ao-dbg/ao-dbg-parse.c | 2 +- cctools/s51/s51.1 => ao-tools/ao-dbg/ao-dbg.1 | 0 cctools/s51/s51.h => ao-tools/ao-dbg/ao-dbg.h | 0 {cctools/s51 => ao-tools/ao-dbg}/commands | 0 ao-tools/ao-eeprom/Makefile.am | 10 ++++++++++ .../ccdump.c => ao-tools/ao-eeprom/ao-eeprom.c | 0 ao-tools/ao-load/Makefile.am | 10 ++++++++++ .../aoload.c => ao-tools/ao-load/ao-load.c | 0 .../ccload => ao-tools/ao-rawload}/.gitignore | 0 ao-tools/ao-rawload/Makefile.am | 10 ++++++++++ .../ao-rawload/ao-rawload.c | 0 {cctools => ao-tools}/lib/Makefile.am | 4 ++-- {cctools => ao-tools}/lib/cc-bitbang.c | 0 {cctools => ao-tools}/lib/cc-bitbang.h | 0 {cctools => ao-tools}/lib/cc-usb.c | 0 {cctools => ao-tools}/lib/cc-usb.h | 0 {cctools => ao-tools}/lib/ccdbg-command.c | 0 {cctools => ao-tools}/lib/ccdbg-debug.c | 0 {cctools => ao-tools}/lib/ccdbg-debug.h | 0 {cctools => ao-tools}/lib/ccdbg-flash.c | 0 {cctools => ao-tools}/lib/ccdbg-hex.c | 0 {cctools => ao-tools}/lib/ccdbg-io.c | 0 {cctools => ao-tools}/lib/ccdbg-manual.c | 0 {cctools => ao-tools}/lib/ccdbg-memory.c | 0 {cctools => ao-tools}/lib/ccdbg-rom.c | 0 {cctools => ao-tools}/lib/ccdbg-state.c | 0 {cctools => ao-tools}/lib/ccdbg.h | 0 {cctools => ao-tools}/lib/cp-usb-async.c | 0 {cctools => ao-tools}/lib/cp-usb-async.h | 0 .../target/adc-serial/Makefile | 0 .../target/adc-serial/adc_serial.c | 0 {cctools => ao-tools}/target/adc/Makefile | 0 {cctools => ao-tools}/target/adc/adc.c | 0 .../target/beep-timer/Makefile | 0 .../target/beep-timer/beep_timer.c | 0 {cctools => ao-tools}/target/beep/Makefile | 0 {cctools => ao-tools}/target/beep/beep.c | 0 {cctools => ao-tools}/target/blink/.gitignore | 0 {cctools => ao-tools}/target/blink/Makefile | 0 {cctools => ao-tools}/target/blink/blink.c | 0 {cctools => ao-tools}/target/dma/Makefile | 0 {cctools => ao-tools}/target/dma/dma.c | 0 {cctools => ao-tools}/target/ee/Makefile | 0 {cctools => ao-tools}/target/ee/ee.c | 0 {cctools => ao-tools}/target/isr.c | 0 {cctools => ao-tools}/target/radio/Makefile | 0 {cctools => ao-tools}/target/radio/init.c | 0 {cctools => ao-tools}/target/radio/radio.h | 0 {cctools => ao-tools}/target/radio/recv.c | 0 {cctools => ao-tools}/target/radio/xmit.c | 0 {cctools => ao-tools}/target/serial/Makefile | 0 {cctools => ao-tools}/target/serial/serial.c | 0 {cctools => ao-tools}/target/simple/Makefile | 0 {cctools => ao-tools}/target/simple/simple.c | 0 {cctools => ao-tools}/target/timer/Makefile | 0 {cctools => ao-tools}/target/timer/cc1111.h | 0 {cctools => ao-tools}/target/timer/timer.c | 0 {cctools => ao-tools}/tests/blink-tiny | 0 {cctools => ao-tools}/tests/blink-tiny-ram | 0 {cctools => ao-tools}/tests/chip_id | 0 {cctools => ao-tools}/tests/debug_mode | 0 {cctools => ao-tools}/tests/get_pc | 0 {cctools => ao-tools}/tests/get_status | 0 {cctools => ao-tools}/tests/half_phase | 0 {cctools => ao-tools}/tests/in | 0 {cctools => ao-tools}/tests/p1_1 | 0 {cctools => ao-tools}/tests/rd_config | 0 {cctools => ao-tools}/tests/read_status | 0 {cctools => ao-tools}/tests/reset | 0 {cctools => ao-tools}/tests/wr_config | 0 ao-utils/Makefile.am | 1 + utils/ejection => ao-utils/ao-ejection | 0 {aoview => ao-view}/.gitignore | 0 {aoview => ao-view}/Makefile.am | 7 ++++--- {aoview => ao-view}/aoview.glade | 0 {aoview => ao-view}/aoview.h | 0 {aoview => ao-view}/aoview_convert.c | 0 {aoview => ao-view}/aoview_dev.c | 0 {aoview => ao-view}/aoview_dev_dialog.c | 0 {aoview => ao-view}/aoview_eeprom.c | 0 {aoview => ao-view}/aoview_file.c | 0 {aoview => ao-view}/aoview_flite.c | 0 {aoview => ao-view}/aoview_label.c | 0 {aoview => ao-view}/aoview_log.c | 0 {aoview => ao-view}/aoview_main.c | 0 {aoview => ao-view}/aoview_monitor.c | 0 {aoview => ao-view}/aoview_replay.c | 0 {aoview => ao-view}/aoview_serial.c | 0 {aoview => ao-view}/aoview_state.c | 0 {aoview => ao-view}/aoview_table.c | 0 {aoview => ao-view}/aoview_util.c | 0 {aoview => ao-view}/aoview_voice.c | 0 {aoview => ao-view}/design | 0 cctools/Makefile.am | 1 - cctools/aoload/Makefile.am | 10 ---------- cctools/ccdump/Makefile.am | 10 ---------- cctools/ccload/Makefile.am | 10 ---------- cctools/ccmanual/Makefile.am | 10 ---------- cctools/s51/Makefile.am | 12 ------------ configure.ac | 18 +++++++++--------- utils/Makefile.am | 1 - 110 files changed, 82 insertions(+), 78 deletions(-) create mode 100644 ao-tools/Makefile.am create mode 100644 ao-tools/ao-bitbang/Makefile.am rename cctools/ccmanual/ccmanual.c => ao-tools/ao-bitbang/ao-bitbang.c (100%) rename {cctools/s51 => ao-tools/ao-dbg}/.gitignore (100%) create mode 100644 ao-tools/ao-dbg/Makefile.am rename cctools/s51/s51-command.c => ao-tools/ao-dbg/ao-dbg-command.c (99%) rename cctools/s51/s51-main.c => ao-tools/ao-dbg/ao-dbg-main.c (99%) rename cctools/s51/s51-parse.c => ao-tools/ao-dbg/ao-dbg-parse.c (99%) rename cctools/s51/s51.1 => ao-tools/ao-dbg/ao-dbg.1 (100%) rename cctools/s51/s51.h => ao-tools/ao-dbg/ao-dbg.h (100%) rename {cctools/s51 => ao-tools/ao-dbg}/commands (100%) create mode 100644 ao-tools/ao-eeprom/Makefile.am rename cctools/ccdump/ccdump.c => ao-tools/ao-eeprom/ao-eeprom.c (100%) create mode 100644 ao-tools/ao-load/Makefile.am rename cctools/aoload/aoload.c => ao-tools/ao-load/ao-load.c (100%) rename {cctools/ccload => ao-tools/ao-rawload}/.gitignore (100%) create mode 100644 ao-tools/ao-rawload/Makefile.am rename cctools/ccload/ccload.c => ao-tools/ao-rawload/ao-rawload.c (100%) rename {cctools => ao-tools}/lib/Makefile.am (84%) rename {cctools => ao-tools}/lib/cc-bitbang.c (100%) rename {cctools => ao-tools}/lib/cc-bitbang.h (100%) rename {cctools => ao-tools}/lib/cc-usb.c (100%) rename {cctools => ao-tools}/lib/cc-usb.h (100%) rename {cctools => ao-tools}/lib/ccdbg-command.c (100%) rename {cctools => ao-tools}/lib/ccdbg-debug.c (100%) rename {cctools => ao-tools}/lib/ccdbg-debug.h (100%) rename {cctools => ao-tools}/lib/ccdbg-flash.c (100%) rename {cctools => ao-tools}/lib/ccdbg-hex.c (100%) rename {cctools => ao-tools}/lib/ccdbg-io.c (100%) rename {cctools => ao-tools}/lib/ccdbg-manual.c (100%) rename {cctools => ao-tools}/lib/ccdbg-memory.c (100%) rename {cctools => ao-tools}/lib/ccdbg-rom.c (100%) rename {cctools => ao-tools}/lib/ccdbg-state.c (100%) rename {cctools => ao-tools}/lib/ccdbg.h (100%) rename {cctools => ao-tools}/lib/cp-usb-async.c (100%) rename {cctools => ao-tools}/lib/cp-usb-async.h (100%) rename {cctools => ao-tools}/target/adc-serial/Makefile (100%) rename {cctools => ao-tools}/target/adc-serial/adc_serial.c (100%) rename {cctools => ao-tools}/target/adc/Makefile (100%) rename {cctools => ao-tools}/target/adc/adc.c (100%) rename {cctools => ao-tools}/target/beep-timer/Makefile (100%) rename {cctools => ao-tools}/target/beep-timer/beep_timer.c (100%) rename {cctools => ao-tools}/target/beep/Makefile (100%) rename {cctools => ao-tools}/target/beep/beep.c (100%) rename {cctools => ao-tools}/target/blink/.gitignore (100%) rename {cctools => ao-tools}/target/blink/Makefile (100%) rename {cctools => ao-tools}/target/blink/blink.c (100%) rename {cctools => ao-tools}/target/dma/Makefile (100%) rename {cctools => ao-tools}/target/dma/dma.c (100%) rename {cctools => ao-tools}/target/ee/Makefile (100%) rename {cctools => ao-tools}/target/ee/ee.c (100%) rename {cctools => ao-tools}/target/isr.c (100%) rename {cctools => ao-tools}/target/radio/Makefile (100%) rename {cctools => ao-tools}/target/radio/init.c (100%) rename {cctools => ao-tools}/target/radio/radio.h (100%) rename {cctools => ao-tools}/target/radio/recv.c (100%) rename {cctools => ao-tools}/target/radio/xmit.c (100%) rename {cctools => ao-tools}/target/serial/Makefile (100%) rename {cctools => ao-tools}/target/serial/serial.c (100%) rename {cctools => ao-tools}/target/simple/Makefile (100%) rename {cctools => ao-tools}/target/simple/simple.c (100%) rename {cctools => ao-tools}/target/timer/Makefile (100%) rename {cctools => ao-tools}/target/timer/cc1111.h (100%) rename {cctools => ao-tools}/target/timer/timer.c (100%) rename {cctools => ao-tools}/tests/blink-tiny (100%) rename {cctools => ao-tools}/tests/blink-tiny-ram (100%) rename {cctools => ao-tools}/tests/chip_id (100%) rename {cctools => ao-tools}/tests/debug_mode (100%) rename {cctools => ao-tools}/tests/get_pc (100%) rename {cctools => ao-tools}/tests/get_status (100%) rename {cctools => ao-tools}/tests/half_phase (100%) rename {cctools => ao-tools}/tests/in (100%) rename {cctools => ao-tools}/tests/p1_1 (100%) rename {cctools => ao-tools}/tests/rd_config (100%) rename {cctools => ao-tools}/tests/read_status (100%) rename {cctools => ao-tools}/tests/reset (100%) rename {cctools => ao-tools}/tests/wr_config (100%) create mode 100644 ao-utils/Makefile.am rename utils/ejection => ao-utils/ao-ejection (100%) rename {aoview => ao-view}/.gitignore (100%) rename {aoview => ao-view}/Makefile.am (85%) rename {aoview => ao-view}/aoview.glade (100%) rename {aoview => ao-view}/aoview.h (100%) rename {aoview => ao-view}/aoview_convert.c (100%) rename {aoview => ao-view}/aoview_dev.c (100%) rename {aoview => ao-view}/aoview_dev_dialog.c (100%) rename {aoview => ao-view}/aoview_eeprom.c (100%) rename {aoview => ao-view}/aoview_file.c (100%) rename {aoview => ao-view}/aoview_flite.c (100%) rename {aoview => ao-view}/aoview_label.c (100%) rename {aoview => ao-view}/aoview_log.c (100%) rename {aoview => ao-view}/aoview_main.c (100%) rename {aoview => ao-view}/aoview_monitor.c (100%) rename {aoview => ao-view}/aoview_replay.c (100%) rename {aoview => ao-view}/aoview_serial.c (100%) rename {aoview => ao-view}/aoview_state.c (100%) rename {aoview => ao-view}/aoview_table.c (100%) rename {aoview => ao-view}/aoview_util.c (100%) rename {aoview => ao-view}/aoview_voice.c (100%) rename {aoview => ao-view}/design (100%) delete mode 100644 cctools/Makefile.am delete mode 100644 cctools/aoload/Makefile.am delete mode 100644 cctools/ccdump/Makefile.am delete mode 100644 cctools/ccload/Makefile.am delete mode 100644 cctools/ccmanual/Makefile.am delete mode 100644 cctools/s51/Makefile.am delete mode 100644 utils/Makefile.am diff --git a/.gitignore b/.gitignore index 71b0a614..8b83dd3f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,16 +13,19 @@ *.sym .deps aclocal.m4 -ao_flight_test +src/ao_flight_test +src/ao_gps_test ao-teledongle.h ao-telemetrum.h ao-teleterra.h ao-tidongle.h -aoload/aoload -ccdump/ccdump -ccmanual/ccmanual -aoview/Makefile -aoview/aoview +ao-tools/ao-bitbang/ao-bitbang +ao-tools/ao-dbg/ao-dbg +ao-tools/ao-eeprom/ao-eeprom +ao-tools/ao-load/ao-load +ao-tools/ao-rawload/ao-rawload +ao-view/Makefile +ao-view/ao-view autom4te.cache config.* config.h diff --git a/Makefile.am b/Makefile.am index a619ae2b..2b76b5d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1 +1 @@ -SUBDIRS=src aoview cctools utils +SUBDIRS=src ao-view ao-tools ao-utils diff --git a/ao-tools/Makefile.am b/ao-tools/Makefile.am new file mode 100644 index 00000000..98b88f38 --- /dev/null +++ b/ao-tools/Makefile.am @@ -0,0 +1 @@ +SUBDIRS=lib ao-rawload ao-dbg ao-bitbang ao-eeprom ao-load diff --git a/ao-tools/ao-bitbang/Makefile.am b/ao-tools/ao-bitbang/Makefile.am new file mode 100644 index 00000000..f094c7bd --- /dev/null +++ b/ao-tools/ao-bitbang/Makefile.am @@ -0,0 +1,10 @@ +bin_PROGRAMS=ao-bitbang + +AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS) +AO_BITBANG_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a + +ao_bitbang_DEPENDENCIES = $(AO_BITBANG_LIBS) + +ao_bitbang_LDADD=$(AO_BITBANG_LIBS) $(LIBUSB_LIBS) + +ao_bitbang_SOURCES = ao-bitbang.c diff --git a/cctools/ccmanual/ccmanual.c b/ao-tools/ao-bitbang/ao-bitbang.c similarity index 100% rename from cctools/ccmanual/ccmanual.c rename to ao-tools/ao-bitbang/ao-bitbang.c diff --git a/cctools/s51/.gitignore b/ao-tools/ao-dbg/.gitignore similarity index 100% rename from cctools/s51/.gitignore rename to ao-tools/ao-dbg/.gitignore diff --git a/ao-tools/ao-dbg/Makefile.am b/ao-tools/ao-dbg/Makefile.am new file mode 100644 index 00000000..ad2cb280 --- /dev/null +++ b/ao-tools/ao-dbg/Makefile.am @@ -0,0 +1,12 @@ +bin_PROGRAMS=ao-dbg + +AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS) +AO_DBG_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a + +man_MANS = ao-dbg.1 + +ao_dbg_DEPENDENCIES = $(AO_DBG_LIBS) + +ao_dbg_LDADD=$(AO_DBG_LIBS) $(LIBUSB_LIBS) -lreadline + +ao_dbg_SOURCES = ao-dbg-parse.c ao-dbg-command.c ao-dbg-main.c diff --git a/cctools/s51/s51-command.c b/ao-tools/ao-dbg/ao-dbg-command.c similarity index 99% rename from cctools/s51/s51-command.c rename to ao-tools/ao-dbg/ao-dbg-command.c index 4f803060..eab7bc68 100644 --- a/cctools/s51/s51-command.c +++ b/ao-tools/ao-dbg/ao-dbg-command.c @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "s51.h" +#include "ao-dbg.h" static uint16_t start_address; diff --git a/cctools/s51/s51-main.c b/ao-tools/ao-dbg/ao-dbg-main.c similarity index 99% rename from cctools/s51/s51-main.c rename to ao-tools/ao-dbg/ao-dbg-main.c index 4dbd4c60..72249a6b 100644 --- a/cctools/s51/s51-main.c +++ b/ao-tools/ao-dbg/ao-dbg-main.c @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "s51.h" +#include "ao-dbg.h" #include #include #include diff --git a/cctools/s51/s51-parse.c b/ao-tools/ao-dbg/ao-dbg-parse.c similarity index 99% rename from cctools/s51/s51-parse.c rename to ao-tools/ao-dbg/ao-dbg-parse.c index 170c979d..5db6c01c 100644 --- a/cctools/s51/s51-parse.c +++ b/ao-tools/ao-dbg/ao-dbg-parse.c @@ -16,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "s51.h" +#include "ao-dbg.h" static struct command_function functions[] = { { "help", "?", command_help, "help", "Print this list\n" }, diff --git a/cctools/s51/s51.1 b/ao-tools/ao-dbg/ao-dbg.1 similarity index 100% rename from cctools/s51/s51.1 rename to ao-tools/ao-dbg/ao-dbg.1 diff --git a/cctools/s51/s51.h b/ao-tools/ao-dbg/ao-dbg.h similarity index 100% rename from cctools/s51/s51.h rename to ao-tools/ao-dbg/ao-dbg.h diff --git a/cctools/s51/commands b/ao-tools/ao-dbg/commands similarity index 100% rename from cctools/s51/commands rename to ao-tools/ao-dbg/commands diff --git a/ao-tools/ao-eeprom/Makefile.am b/ao-tools/ao-eeprom/Makefile.am new file mode 100644 index 00000000..587acee7 --- /dev/null +++ b/ao-tools/ao-eeprom/Makefile.am @@ -0,0 +1,10 @@ +bin_PROGRAMS=ao-eeprom + +AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS) +AO_EEPROM_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a + +ao_eeprom_DEPENDENCIES = $(AO_EEPROM_LIBS) + +ao_eeprom_LDADD=$(AO_EEPROM_LIBS) $(LIBUSB_LIBS) + +ao_eeprom_SOURCES = ao-eeprom.c diff --git a/cctools/ccdump/ccdump.c b/ao-tools/ao-eeprom/ao-eeprom.c similarity index 100% rename from cctools/ccdump/ccdump.c rename to ao-tools/ao-eeprom/ao-eeprom.c diff --git a/ao-tools/ao-load/Makefile.am b/ao-tools/ao-load/Makefile.am new file mode 100644 index 00000000..8a8392af --- /dev/null +++ b/ao-tools/ao-load/Makefile.am @@ -0,0 +1,10 @@ +bin_PROGRAMS=ao-load + +AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS) +AO_LOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a + +ao_load_DEPENDENCIES = $(AO_LOAD_LIBS) + +ao_load_LDADD=$(AO_LOAD_LIBS) $(LIBUSB_LIBS) + +ao_load_SOURCES = ao-load.c diff --git a/cctools/aoload/aoload.c b/ao-tools/ao-load/ao-load.c similarity index 100% rename from cctools/aoload/aoload.c rename to ao-tools/ao-load/ao-load.c diff --git a/cctools/ccload/.gitignore b/ao-tools/ao-rawload/.gitignore similarity index 100% rename from cctools/ccload/.gitignore rename to ao-tools/ao-rawload/.gitignore diff --git a/ao-tools/ao-rawload/Makefile.am b/ao-tools/ao-rawload/Makefile.am new file mode 100644 index 00000000..24013a85 --- /dev/null +++ b/ao-tools/ao-rawload/Makefile.am @@ -0,0 +1,10 @@ +bin_PROGRAMS=ao-rawload + +AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS) +AO_RAWLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a + +ao_rawload_DEPENDENCIES = $(AO_RAWLOAD_LIBS) + +ao_rawload_LDADD=$(AO_RAWLOAD_LIBS) $(LIBUSB_LIBS) + +ao_rawload_SOURCES = ao-rawload.c diff --git a/cctools/ccload/ccload.c b/ao-tools/ao-rawload/ao-rawload.c similarity index 100% rename from cctools/ccload/ccload.c rename to ao-tools/ao-rawload/ao-rawload.c diff --git a/cctools/lib/Makefile.am b/ao-tools/lib/Makefile.am similarity index 84% rename from cctools/lib/Makefile.am rename to ao-tools/lib/Makefile.am index 251ef6e6..9584e216 100644 --- a/cctools/lib/Makefile.am +++ b/ao-tools/lib/Makefile.am @@ -1,8 +1,8 @@ -noinst_LIBRARIES = libcc.a +noinst_LIBRARIES = libao-tools.a AM_CFLAGS=$(WARN_CFLAGS) $(LIBUSB_CFLAGS) -libcc_a_SOURCES = \ +libao_tools_a_SOURCES = \ ccdbg-command.c \ ccdbg-debug.c \ ccdbg-debug.h \ diff --git a/cctools/lib/cc-bitbang.c b/ao-tools/lib/cc-bitbang.c similarity index 100% rename from cctools/lib/cc-bitbang.c rename to ao-tools/lib/cc-bitbang.c diff --git a/cctools/lib/cc-bitbang.h b/ao-tools/lib/cc-bitbang.h similarity index 100% rename from cctools/lib/cc-bitbang.h rename to ao-tools/lib/cc-bitbang.h diff --git a/cctools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c similarity index 100% rename from cctools/lib/cc-usb.c rename to ao-tools/lib/cc-usb.c diff --git a/cctools/lib/cc-usb.h b/ao-tools/lib/cc-usb.h similarity index 100% rename from cctools/lib/cc-usb.h rename to ao-tools/lib/cc-usb.h diff --git a/cctools/lib/ccdbg-command.c b/ao-tools/lib/ccdbg-command.c similarity index 100% rename from cctools/lib/ccdbg-command.c rename to ao-tools/lib/ccdbg-command.c diff --git a/cctools/lib/ccdbg-debug.c b/ao-tools/lib/ccdbg-debug.c similarity index 100% rename from cctools/lib/ccdbg-debug.c rename to ao-tools/lib/ccdbg-debug.c diff --git a/cctools/lib/ccdbg-debug.h b/ao-tools/lib/ccdbg-debug.h similarity index 100% rename from cctools/lib/ccdbg-debug.h rename to ao-tools/lib/ccdbg-debug.h diff --git a/cctools/lib/ccdbg-flash.c b/ao-tools/lib/ccdbg-flash.c similarity index 100% rename from cctools/lib/ccdbg-flash.c rename to ao-tools/lib/ccdbg-flash.c diff --git a/cctools/lib/ccdbg-hex.c b/ao-tools/lib/ccdbg-hex.c similarity index 100% rename from cctools/lib/ccdbg-hex.c rename to ao-tools/lib/ccdbg-hex.c diff --git a/cctools/lib/ccdbg-io.c b/ao-tools/lib/ccdbg-io.c similarity index 100% rename from cctools/lib/ccdbg-io.c rename to ao-tools/lib/ccdbg-io.c diff --git a/cctools/lib/ccdbg-manual.c b/ao-tools/lib/ccdbg-manual.c similarity index 100% rename from cctools/lib/ccdbg-manual.c rename to ao-tools/lib/ccdbg-manual.c diff --git a/cctools/lib/ccdbg-memory.c b/ao-tools/lib/ccdbg-memory.c similarity index 100% rename from cctools/lib/ccdbg-memory.c rename to ao-tools/lib/ccdbg-memory.c diff --git a/cctools/lib/ccdbg-rom.c b/ao-tools/lib/ccdbg-rom.c similarity index 100% rename from cctools/lib/ccdbg-rom.c rename to ao-tools/lib/ccdbg-rom.c diff --git a/cctools/lib/ccdbg-state.c b/ao-tools/lib/ccdbg-state.c similarity index 100% rename from cctools/lib/ccdbg-state.c rename to ao-tools/lib/ccdbg-state.c diff --git a/cctools/lib/ccdbg.h b/ao-tools/lib/ccdbg.h similarity index 100% rename from cctools/lib/ccdbg.h rename to ao-tools/lib/ccdbg.h diff --git a/cctools/lib/cp-usb-async.c b/ao-tools/lib/cp-usb-async.c similarity index 100% rename from cctools/lib/cp-usb-async.c rename to ao-tools/lib/cp-usb-async.c diff --git a/cctools/lib/cp-usb-async.h b/ao-tools/lib/cp-usb-async.h similarity index 100% rename from cctools/lib/cp-usb-async.h rename to ao-tools/lib/cp-usb-async.h diff --git a/cctools/target/adc-serial/Makefile b/ao-tools/target/adc-serial/Makefile similarity index 100% rename from cctools/target/adc-serial/Makefile rename to ao-tools/target/adc-serial/Makefile diff --git a/cctools/target/adc-serial/adc_serial.c b/ao-tools/target/adc-serial/adc_serial.c similarity index 100% rename from cctools/target/adc-serial/adc_serial.c rename to ao-tools/target/adc-serial/adc_serial.c diff --git a/cctools/target/adc/Makefile b/ao-tools/target/adc/Makefile similarity index 100% rename from cctools/target/adc/Makefile rename to ao-tools/target/adc/Makefile diff --git a/cctools/target/adc/adc.c b/ao-tools/target/adc/adc.c similarity index 100% rename from cctools/target/adc/adc.c rename to ao-tools/target/adc/adc.c diff --git a/cctools/target/beep-timer/Makefile b/ao-tools/target/beep-timer/Makefile similarity index 100% rename from cctools/target/beep-timer/Makefile rename to ao-tools/target/beep-timer/Makefile diff --git a/cctools/target/beep-timer/beep_timer.c b/ao-tools/target/beep-timer/beep_timer.c similarity index 100% rename from cctools/target/beep-timer/beep_timer.c rename to ao-tools/target/beep-timer/beep_timer.c diff --git a/cctools/target/beep/Makefile b/ao-tools/target/beep/Makefile similarity index 100% rename from cctools/target/beep/Makefile rename to ao-tools/target/beep/Makefile diff --git a/cctools/target/beep/beep.c b/ao-tools/target/beep/beep.c similarity index 100% rename from cctools/target/beep/beep.c rename to ao-tools/target/beep/beep.c diff --git a/cctools/target/blink/.gitignore b/ao-tools/target/blink/.gitignore similarity index 100% rename from cctools/target/blink/.gitignore rename to ao-tools/target/blink/.gitignore diff --git a/cctools/target/blink/Makefile b/ao-tools/target/blink/Makefile similarity index 100% rename from cctools/target/blink/Makefile rename to ao-tools/target/blink/Makefile diff --git a/cctools/target/blink/blink.c b/ao-tools/target/blink/blink.c similarity index 100% rename from cctools/target/blink/blink.c rename to ao-tools/target/blink/blink.c diff --git a/cctools/target/dma/Makefile b/ao-tools/target/dma/Makefile similarity index 100% rename from cctools/target/dma/Makefile rename to ao-tools/target/dma/Makefile diff --git a/cctools/target/dma/dma.c b/ao-tools/target/dma/dma.c similarity index 100% rename from cctools/target/dma/dma.c rename to ao-tools/target/dma/dma.c diff --git a/cctools/target/ee/Makefile b/ao-tools/target/ee/Makefile similarity index 100% rename from cctools/target/ee/Makefile rename to ao-tools/target/ee/Makefile diff --git a/cctools/target/ee/ee.c b/ao-tools/target/ee/ee.c similarity index 100% rename from cctools/target/ee/ee.c rename to ao-tools/target/ee/ee.c diff --git a/cctools/target/isr.c b/ao-tools/target/isr.c similarity index 100% rename from cctools/target/isr.c rename to ao-tools/target/isr.c diff --git a/cctools/target/radio/Makefile b/ao-tools/target/radio/Makefile similarity index 100% rename from cctools/target/radio/Makefile rename to ao-tools/target/radio/Makefile diff --git a/cctools/target/radio/init.c b/ao-tools/target/radio/init.c similarity index 100% rename from cctools/target/radio/init.c rename to ao-tools/target/radio/init.c diff --git a/cctools/target/radio/radio.h b/ao-tools/target/radio/radio.h similarity index 100% rename from cctools/target/radio/radio.h rename to ao-tools/target/radio/radio.h diff --git a/cctools/target/radio/recv.c b/ao-tools/target/radio/recv.c similarity index 100% rename from cctools/target/radio/recv.c rename to ao-tools/target/radio/recv.c diff --git a/cctools/target/radio/xmit.c b/ao-tools/target/radio/xmit.c similarity index 100% rename from cctools/target/radio/xmit.c rename to ao-tools/target/radio/xmit.c diff --git a/cctools/target/serial/Makefile b/ao-tools/target/serial/Makefile similarity index 100% rename from cctools/target/serial/Makefile rename to ao-tools/target/serial/Makefile diff --git a/cctools/target/serial/serial.c b/ao-tools/target/serial/serial.c similarity index 100% rename from cctools/target/serial/serial.c rename to ao-tools/target/serial/serial.c diff --git a/cctools/target/simple/Makefile b/ao-tools/target/simple/Makefile similarity index 100% rename from cctools/target/simple/Makefile rename to ao-tools/target/simple/Makefile diff --git a/cctools/target/simple/simple.c b/ao-tools/target/simple/simple.c similarity index 100% rename from cctools/target/simple/simple.c rename to ao-tools/target/simple/simple.c diff --git a/cctools/target/timer/Makefile b/ao-tools/target/timer/Makefile similarity index 100% rename from cctools/target/timer/Makefile rename to ao-tools/target/timer/Makefile diff --git a/cctools/target/timer/cc1111.h b/ao-tools/target/timer/cc1111.h similarity index 100% rename from cctools/target/timer/cc1111.h rename to ao-tools/target/timer/cc1111.h diff --git a/cctools/target/timer/timer.c b/ao-tools/target/timer/timer.c similarity index 100% rename from cctools/target/timer/timer.c rename to ao-tools/target/timer/timer.c diff --git a/cctools/tests/blink-tiny b/ao-tools/tests/blink-tiny similarity index 100% rename from cctools/tests/blink-tiny rename to ao-tools/tests/blink-tiny diff --git a/cctools/tests/blink-tiny-ram b/ao-tools/tests/blink-tiny-ram similarity index 100% rename from cctools/tests/blink-tiny-ram rename to ao-tools/tests/blink-tiny-ram diff --git a/cctools/tests/chip_id b/ao-tools/tests/chip_id similarity index 100% rename from cctools/tests/chip_id rename to ao-tools/tests/chip_id diff --git a/cctools/tests/debug_mode b/ao-tools/tests/debug_mode similarity index 100% rename from cctools/tests/debug_mode rename to ao-tools/tests/debug_mode diff --git a/cctools/tests/get_pc b/ao-tools/tests/get_pc similarity index 100% rename from cctools/tests/get_pc rename to ao-tools/tests/get_pc diff --git a/cctools/tests/get_status b/ao-tools/tests/get_status similarity index 100% rename from cctools/tests/get_status rename to ao-tools/tests/get_status diff --git a/cctools/tests/half_phase b/ao-tools/tests/half_phase similarity index 100% rename from cctools/tests/half_phase rename to ao-tools/tests/half_phase diff --git a/cctools/tests/in b/ao-tools/tests/in similarity index 100% rename from cctools/tests/in rename to ao-tools/tests/in diff --git a/cctools/tests/p1_1 b/ao-tools/tests/p1_1 similarity index 100% rename from cctools/tests/p1_1 rename to ao-tools/tests/p1_1 diff --git a/cctools/tests/rd_config b/ao-tools/tests/rd_config similarity index 100% rename from cctools/tests/rd_config rename to ao-tools/tests/rd_config diff --git a/cctools/tests/read_status b/ao-tools/tests/read_status similarity index 100% rename from cctools/tests/read_status rename to ao-tools/tests/read_status diff --git a/cctools/tests/reset b/ao-tools/tests/reset similarity index 100% rename from cctools/tests/reset rename to ao-tools/tests/reset diff --git a/cctools/tests/wr_config b/ao-tools/tests/wr_config similarity index 100% rename from cctools/tests/wr_config rename to ao-tools/tests/wr_config diff --git a/ao-utils/Makefile.am b/ao-utils/Makefile.am new file mode 100644 index 00000000..705ff4d5 --- /dev/null +++ b/ao-utils/Makefile.am @@ -0,0 +1 @@ +dist_bin_SCRIPTS = ao-ejection diff --git a/utils/ejection b/ao-utils/ao-ejection similarity index 100% rename from utils/ejection rename to ao-utils/ao-ejection diff --git a/aoview/.gitignore b/ao-view/.gitignore similarity index 100% rename from aoview/.gitignore rename to ao-view/.gitignore diff --git a/aoview/Makefile.am b/ao-view/Makefile.am similarity index 85% rename from aoview/Makefile.am rename to ao-view/Makefile.am index 00851b67..e0cd068c 100644 --- a/aoview/Makefile.am +++ b/ao-view/Makefile.am @@ -1,11 +1,12 @@ VERSION=$(shell git describe) + AM_CFLAGS=$(GNOME_CFLAGS) $(ALSA_CFLAGS) -I$(top_srcdir)/src -DAOVIEW_VERSION=\"$(VERSION)\" @FLITE_INCS@ -bin_PROGRAMS=aoview +bin_PROGRAMS=ao-view -aoview_LDADD=$(GNOME_LIBS) $(FLITE_LIBS) $(ALSA_LIBS) +ao_view_LDADD=$(GNOME_LIBS) $(FLITE_LIBS) $(ALSA_LIBS) -aoview_SOURCES = \ +ao_view_SOURCES = \ aoview_main.c \ aoview_dev.c \ aoview_dev_dialog.c \ diff --git a/aoview/aoview.glade b/ao-view/aoview.glade similarity index 100% rename from aoview/aoview.glade rename to ao-view/aoview.glade diff --git a/aoview/aoview.h b/ao-view/aoview.h similarity index 100% rename from aoview/aoview.h rename to ao-view/aoview.h diff --git a/aoview/aoview_convert.c b/ao-view/aoview_convert.c similarity index 100% rename from aoview/aoview_convert.c rename to ao-view/aoview_convert.c diff --git a/aoview/aoview_dev.c b/ao-view/aoview_dev.c similarity index 100% rename from aoview/aoview_dev.c rename to ao-view/aoview_dev.c diff --git a/aoview/aoview_dev_dialog.c b/ao-view/aoview_dev_dialog.c similarity index 100% rename from aoview/aoview_dev_dialog.c rename to ao-view/aoview_dev_dialog.c diff --git a/aoview/aoview_eeprom.c b/ao-view/aoview_eeprom.c similarity index 100% rename from aoview/aoview_eeprom.c rename to ao-view/aoview_eeprom.c diff --git a/aoview/aoview_file.c b/ao-view/aoview_file.c similarity index 100% rename from aoview/aoview_file.c rename to ao-view/aoview_file.c diff --git a/aoview/aoview_flite.c b/ao-view/aoview_flite.c similarity index 100% rename from aoview/aoview_flite.c rename to ao-view/aoview_flite.c diff --git a/aoview/aoview_label.c b/ao-view/aoview_label.c similarity index 100% rename from aoview/aoview_label.c rename to ao-view/aoview_label.c diff --git a/aoview/aoview_log.c b/ao-view/aoview_log.c similarity index 100% rename from aoview/aoview_log.c rename to ao-view/aoview_log.c diff --git a/aoview/aoview_main.c b/ao-view/aoview_main.c similarity index 100% rename from aoview/aoview_main.c rename to ao-view/aoview_main.c diff --git a/aoview/aoview_monitor.c b/ao-view/aoview_monitor.c similarity index 100% rename from aoview/aoview_monitor.c rename to ao-view/aoview_monitor.c diff --git a/aoview/aoview_replay.c b/ao-view/aoview_replay.c similarity index 100% rename from aoview/aoview_replay.c rename to ao-view/aoview_replay.c diff --git a/aoview/aoview_serial.c b/ao-view/aoview_serial.c similarity index 100% rename from aoview/aoview_serial.c rename to ao-view/aoview_serial.c diff --git a/aoview/aoview_state.c b/ao-view/aoview_state.c similarity index 100% rename from aoview/aoview_state.c rename to ao-view/aoview_state.c diff --git a/aoview/aoview_table.c b/ao-view/aoview_table.c similarity index 100% rename from aoview/aoview_table.c rename to ao-view/aoview_table.c diff --git a/aoview/aoview_util.c b/ao-view/aoview_util.c similarity index 100% rename from aoview/aoview_util.c rename to ao-view/aoview_util.c diff --git a/aoview/aoview_voice.c b/ao-view/aoview_voice.c similarity index 100% rename from aoview/aoview_voice.c rename to ao-view/aoview_voice.c diff --git a/aoview/design b/ao-view/design similarity index 100% rename from aoview/design rename to ao-view/design diff --git a/cctools/Makefile.am b/cctools/Makefile.am deleted file mode 100644 index 86f2fad5..00000000 --- a/cctools/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS=lib ccload s51 ccmanual ccdump aoload diff --git a/cctools/aoload/Makefile.am b/cctools/aoload/Makefile.am deleted file mode 100644 index 48fb89f3..00000000 --- a/cctools/aoload/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS=aoload - -AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS) -AOLOAD_LIBS=$(top_builddir)/cctools/lib/libcc.a - -aoload_DEPENDENCIES = $(AOLOAD_LIBS) - -aoload_LDADD=$(AOLOAD_LIBS) $(LIBUSB_LIBS) - -aoload_SOURCES = aoload.c diff --git a/cctools/ccdump/Makefile.am b/cctools/ccdump/Makefile.am deleted file mode 100644 index 752eb407..00000000 --- a/cctools/ccdump/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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/cctools/ccload/Makefile.am b/cctools/ccload/Makefile.am deleted file mode 100644 index b07e9b70..00000000 --- a/cctools/ccload/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS=ccload - -AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS) -CCLOAD_LIBS=$(top_builddir)/cctools/lib/libcc.a - -ccload_DEPENDENCIES = $(CCLOAD_LIBS) - -ccload_LDADD=$(CCLOAD_LIBS) $(LIBUSB_LIBS) - -ccload_SOURCES = ccload.c diff --git a/cctools/ccmanual/Makefile.am b/cctools/ccmanual/Makefile.am deleted file mode 100644 index b0b33514..00000000 --- a/cctools/ccmanual/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS=ccmanual - -AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS) -CCMANUAL_LIBS=$(top_builddir)/cctools/lib/libcc.a - -ccmanual_DEPENDENCIES = $(CCMANUAL_LIBS) - -ccmanual_LDADD=$(CCMANUAL_LIBS) $(LIBUSB_LIBS) - -ccmanual_SOURCES = ccmanual.c diff --git a/cctools/s51/Makefile.am b/cctools/s51/Makefile.am deleted file mode 100644 index 4b95b3f7..00000000 --- a/cctools/s51/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS=s51 - -AM_CFLAGS=-I$(top_srcdir)/cctools/lib $(LIBUSB_CFLAGS) -S51_LIBS=$(top_builddir)/cctools/lib/libcc.a -lreadline - -man_MANS = s51.1 - -s51_DEPENDENCIES = $(S51_LIBS) - -s51_LDADD=$(S51_LIBS) $(LIBUSB_LIBS) - -s51_SOURCES = s51-parse.c s51-command.c s51-main.c diff --git a/configure.ac b/configure.ac index e3bc2df9..b52bb6e9 100644 --- a/configure.ac +++ b/configure.ac @@ -73,13 +73,13 @@ PKG_CHECK_MODULES([ALSA], [alsa]) AC_OUTPUT([ Makefile -aoview/Makefile -cctools/Makefile -cctools/lib/Makefile -cctools/ccload/Makefile -cctools/s51/Makefile -cctools/ccmanual/Makefile -cctools/ccdump/Makefile -cctools/aoload/Makefile -utils/Makefile +ao-view/Makefile +ao-tools/Makefile +ao-tools/lib/Makefile +ao-tools/ao-rawload/Makefile +ao-tools/ao-dbg/Makefile +ao-tools/ao-bitbang/Makefile +ao-tools/ao-eeprom/Makefile +ao-tools/ao-load/Makefile +ao-utils/Makefile ]) diff --git a/utils/Makefile.am b/utils/Makefile.am deleted file mode 100644 index b0260c87..00000000 --- a/utils/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_bin_SCRIPTS = ejection -- 2.30.2