diff options
| -rw-r--r-- | cpukit/Makefile.am | 14 | ||||
| -rw-r--r-- | cpukit/configure.ac | 1 | ||||
| -rw-r--r-- | cpukit/ftpd/Makefile.am | 11 |
3 files changed, 13 insertions, 13 deletions
diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 6a5ef61813..7a3e8319ff 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -3,6 +3,9 @@ ACLOCAL_AMFLAGS = -I aclocal include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/multilib.am +project_lib_LIBRARIES = +TMPINSTALL_FILES = + noinst_LIBRARIES = libcpukit.a libcpukit_a_SOURCES = @@ -110,11 +113,20 @@ _SUBDIRS += wrapup # other libraries _SUBDIRS += zlib -_SUBDIRS += ftpd _SUBDIRS += telnetd _SUBDIRS += pppd _SUBDIRS += mghttpd +project_lib_LIBRARIES += libftpd.a + +$(PROJECT_LIB)/libftpd.a: libftpd.a + $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libftpd.a + +libftpd_a_SOURCES = +libftpd_a_SOURCES += ftpd/ftpd.c +libftpd_a_SOURCES += ftpd/ftpd-init.c + 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 e45114f6ab..df9ee8c05b 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -515,7 +515,6 @@ libdl/Makefile libstdthreads/Makefile libdebugger/Makefile zlib/Makefile -ftpd/Makefile telnetd/Makefile pppd/Makefile mghttpd/Makefile diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am deleted file mode 100644 index dddf91935e..0000000000 --- a/cpukit/ftpd/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_srcdir)/automake/compile.am - -project_lib_LIBRARIES = libftpd.a - -$(PROJECT_LIB)/libftpd.a: libftpd.a - $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a -TMPINSTALL_FILES = $(PROJECT_LIB)/libftpd.a - -libftpd_a_SOURCES = ftpd.c ftpd-init.c - -include $(top_srcdir)/automake/local.am |