From dcbad07c1269e03e36541421fdbe804f0dacd2f1 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 30 Jan 2004 01:59:28 +0000 Subject: 2004-01-30 Ralf Corsepius * Makefile.am: Merge-in debug_ada/Makefile.am, debug_c/Makefile.am, dos_sup/Makefile.am, network_ada/adasockets/Makefile.am, network_ada/Makefile.am, network_ada/listener/Makefile.am, network_ada/tcprelay/Makefile.am, ts_1325_ada/Makefile.am. Use automake compilation rules. * debug_ada/Makefile.am, debug_c/Makefile.am, dos_sup/Makefile.am, network_ada/adasockets/Makefile.am, network_ada/Makefile.am, network_ada/listener/Makefile.am, network_ada/tcprelay/Makefile.am, ts_1325_ada/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog | 13 +++++++ c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am | 45 ++++++++++++++++++++-- c/src/lib/libbsp/i386/ts_386ex/tools/configure.ac | 11 +----- .../i386/ts_386ex/tools/debug_ada/.cvsignore | 2 - .../i386/ts_386ex/tools/debug_ada/Makefile.am | 8 ---- .../libbsp/i386/ts_386ex/tools/debug_c/.cvsignore | 2 - .../libbsp/i386/ts_386ex/tools/debug_c/Makefile.am | 8 ---- .../libbsp/i386/ts_386ex/tools/dos_sup/.cvsignore | 2 - .../libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am | 7 ---- .../i386/ts_386ex/tools/network_ada/.cvsignore | 2 - .../i386/ts_386ex/tools/network_ada/Makefile.am | 10 ----- .../tools/network_ada/adasockets/.cvsignore | 2 - .../tools/network_ada/adasockets/Makefile.am | 10 ----- .../ts_386ex/tools/network_ada/listener/.cvsignore | 2 - .../tools/network_ada/listener/Makefile.am | 7 ---- .../ts_386ex/tools/network_ada/tcprelay/.cvsignore | 2 - .../tools/network_ada/tcprelay/Makefile.am | 7 ---- .../i386/ts_386ex/tools/ts_1325_ada/.cvsignore | 2 - .../i386/ts_386ex/tools/ts_1325_ada/Makefile.am | 9 ----- 19 files changed, 55 insertions(+), 96 deletions(-) delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/.cvsignore delete mode 100644 c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog index 4af42077c9..9a573a608c 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ChangeLog @@ -1,3 +1,16 @@ +2004-01-30 Ralf Corsepius + + * Makefile.am: Merge-in debug_ada/Makefile.am, debug_c/Makefile.am, + dos_sup/Makefile.am, network_ada/adasockets/Makefile.am, + network_ada/Makefile.am, network_ada/listener/Makefile.am, + network_ada/tcprelay/Makefile.am, ts_1325_ada/Makefile.am. Use automake + compilation rules. + * debug_ada/Makefile.am, debug_c/Makefile.am, dos_sup/Makefile.am, + network_ada/adasockets/Makefile.am, network_ada/Makefile.am, + network_ada/listener/Makefile.am, network_ada/tcprelay/Makefile.am, + ts_1325_ada/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-12-12 Ralf Corsepius * configure.ac: Require automake >= 1.8, autoconf >= 2.59. diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am index 207ca5d637..770bb37f6d 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/Makefile.am @@ -4,11 +4,48 @@ ACLOCAL_AMFLAGS = -I ../../../../../aclocal -noinst_SCRIPTS = coff2bin elf2exe +dist_noinst_SCRIPTS = coff2bin elf2exe -SUBDIRS = ts_1325_ada network_ada debug_ada debug_c dos_sup +EXTRA_DIST = README -EXTRA_DIST = $(noinst_SCRIPTS) +EXTRA_DIST += debug_ada/Makefile.ts_386ex debug_ada/cmds debug_ada/ddd-rtems \ + debug_ada/debug.adb debug_ada/init.c debug_ada/serial_debug.adb \ + debug_ada/serial_debug.ads + +EXTRA_DIST += debug_c/cmds debug_c/ddd-rtems debug_c/debug_test.c \ + debug_c/init.c debug_c/serial_gdb.c debug_c/serial_gdb.h \ + debug_c/system.h + +EXTRA_DIST += dos_sup/loader.com dos_sup/loader_hybrid_com.asm \ + dos_sup/ts1325.inc + +EXTRA_DIST += network_ada/adasockets/AUTHORS network_ada/adasockets/COPYING \ + network_ada/adasockets/NEWS network_ada/adasockets/README \ + network_ada/adasockets/sockets-constants.ads \ + network_ada/adasockets/sockets-link.ads \ + network_ada/adasockets/sockets-multicast.adb \ + network_ada/adasockets/sockets-multicast.ads \ + network_ada/adasockets/sockets-naming.adb \ + network_ada/adasockets/sockets-naming.ads \ + network_ada/adasockets/sockets-thin.ads \ + network_ada/adasockets/sockets-utils.adb \ + network_ada/adasockets/sockets-utils.ads \ + network_ada/adasockets/sockets.adb network_ada/adasockets/sockets.ads + +EXTRA_DIST += network_ada/README network_ada/networkconfig.h + +EXTRA_DIST += network_ada/listener/Makefile.ts_386ex \ + network_ada/listener/init.c network_ada/listener/listener.adb + +EXTRA_DIST += network_ada/tcprelay/Makefile.ts_386ex \ + network_ada/tcprelay/init.c network_ada/tcprelay/print_error.c \ + network_ada/tcprelay/tcprelay.adb + +EXTRA_DIST += ts_1325_ada/Makefile.ts_386ex ts_1325_ada/README \ + ts_1325_ada/i386_ports.adb ts_1325_ada/i386_ports.ads ts_1325_ada/init.c \ + ts_1325_ada/ts1325-button.adb ts_1325_ada/ts1325-button.ads \ + ts_1325_ada/ts1325-led.adb ts_1325_ada/ts1325-led.ads \ + ts_1325_ada/ts1325-parallel.adb ts_1325_ada/ts1325-parallel.ads \ + ts_1325_ada/ts1325.ads ts_1325_ada/ts1325_test.adb include $(top_srcdir)/../../../../../automake/host.am -include $(top_srcdir)/../../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/configure.ac b/c/src/lib/libbsp/i386/ts_386ex/tools/configure.ac index 4986235a79..1ea6180a46 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/configure.ac +++ b/c/src/lib/libbsp/i386/ts_386ex/tools/configure.ac @@ -16,14 +16,5 @@ RTEMS_PROJECT_ROOT RTEMS_TOOLPATHS # Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile -dos_sup/Makefile -ts_1325_ada/Makefile -debug_ada/Makefile -debug_c/Makefile -network_ada/Makefile -network_ada/adasockets/Makefile -network_ada/listener/Makefile -network_ada/tcprelay/Makefile -]) +AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am deleted file mode 100644 index c1226ad777..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = Makefile.ts_386ex cmds ddd-rtems debug.adb init.c \ - serial_debug.adb serial_debug.ads - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am deleted file mode 100644 index 1bc26812ff..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_c/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = cmds ddd-rtems debug_test.c init.c serial_gdb.c serial_gdb.h \ - system.h - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am deleted file mode 100644 index 8737342d19..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/dos_sup/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = loader.com loader_hybrid_com.asm ts1325.inc - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am deleted file mode 100644 index 405ea968f4..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -SUBDIRS = adasockets listener tcprelay - -EXTRA_DIST = README networkconfig.h - -include $(top_srcdir)/../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am deleted file mode 100644 index d5756a9f16..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/adasockets/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = AUTHORS COPYING NEWS README sockets-constants.ads \ - sockets-link.ads sockets-multicast.adb sockets-multicast.ads \ - sockets-naming.adb sockets-naming.ads sockets-thin.ads sockets-utils.adb \ - sockets-utils.ads sockets.adb sockets.ads - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am deleted file mode 100644 index 1b4f1a5e86..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = Makefile.ts_386ex init.c listener.adb - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am deleted file mode 100644 index 6829546d14..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = Makefile.ts_386ex init.c print_error.c tcprelay.adb - -include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/.cvsignore b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am deleted file mode 100644 index 1f109b2aa2..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = Makefile.ts_386ex ts1325-button.adb ts1325-parallel.adb \ - i386_ports.adb ts1325-button.ads ts1325-parallel.ads i386_ports.ads \ - ts1325-led.adb ts1325.ads init.c ts1325-led.ads ts1325_test.adb - -include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3