--- cpukit/Makefile.am | 21 ++++++++++++++++++++- cpukit/configure.ac | 1 - cpukit/libdebugger/Makefile.am | 22 ---------------------- 3 files changed, 20 insertions(+), 24 deletions(-) delete mode 100644 cpukit/libdebugger/Makefile.am
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 14f8df7653..32a0758a6c 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -346,7 +346,6 @@ _SUBDIRS += libmd _SUBDIRS += libgnat _SUBDIRS += libdl _SUBDIRS += libstdthreads -_SUBDIRS += libdebugger _SUBDIRS += wrapup # other libraries @@ -365,6 +364,26 @@ libftpd_a_SOURCES = libftpd_a_SOURCES += ftpd/ftpd.c libftpd_a_SOURCES += ftpd/ftpd-init.c +if LIBDEBUGGER + +project_lib_LIBRARIES += libdebugger.a + +$(PROJECT_LIB)/libdebugger.a: libdebugger.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libdebugger.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libdebugger.a + +libdebugger_a_SOURCES = +libdebugger_a_SOURCES += rtems-debugger-block.c +libdebugger_a_SOURCES += rtems-debugger-cmd.c +libdebugger_a_SOURCES += rtems-debugger-remote.c +libdebugger_a_SOURCES += rtems-debugger-remote-tcp.c +libdebugger_a_SOURCES += rtems-debugger-@RTEMS_CPU@.c +libdebugger_a_SOURCES += rtems-debugger-server.c +libdebugger_a_SOURCES += rtems-debugger-target.c +libdebugger_a_SOURCES += rtems-debugger-threads.c + +endif + include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/local.am include $(srcdir)/headers.am diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 5c1efa0860..6b7c719bdd 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -509,7 +509,6 @@ libi2c/Makefile libmd/Makefile libdl/Makefile libstdthreads/Makefile -libdebugger/Makefile zlib/Makefile telnetd/Makefile pppd/Makefile diff --git a/cpukit/libdebugger/Makefile.am b/cpukit/libdebugger/Makefile.am deleted file mode 100644 index 6ff35d197f..0000000000 --- a/cpukit/libdebugger/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -if LIBDEBUGGER - -project_lib_LIBRARIES = libdebugger.a -libdebugger_a_SOURCES = \ - rtems-debugger-block.c \ - rtems-debugger-cmd.c \ - rtems-debugger-remote.c \ - rtems-debugger-server.c \ - rtems-debugger-target.c \ - rtems-debugger-remote-tcp.c \ - rtems-debugger-threads.c \ - rtems-debugger-@RTEMS_CPU@.c - -$(PROJECT_LIB)/libdebugger.a: libdebugger.a - $(INSTALL_DATA) $< $(PROJECT_LIB)/libdebugger.a -TMPINSTALL_FILES = $(PROJECT_LIB)/libdebugger.a - -endif - -include $(top_srcdir)/automake/local.am -- 2.13.7 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
