RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

build: Merge ftpd/Makefile.am

Browse Source
This commit is contained in:
Sebastian Huber
2018-09-13 06:35:03 +02:00
parent 60c4ba1238
commit 690718ab37
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cpukit/Makefile.am
View File

@@ -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

1
cpukit/configure.ac
View File

@@ -515,7 +515,6 @@ libdl/Makefile
libstdthreads/Makefile
libdebugger/Makefile
zlib/Makefile
ftpd/Makefile
telnetd/Makefile
pppd/Makefile
mghttpd/Makefile

11
cpukit/ftpd/Makefile.am
View File

@@ -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