[PATCH 3/9] ftpfs: Always build FTP client

[Sebastian Huber]

Move FTP client filesystem to separate library libftpfs.a.

Update #3419.
---
 cpukit/headers.am                               | 1 +
 cpukit/{libnetworking => include}/rtems/ftpfs.h | 0
 cpukit/libnetworking/Makefile.am                | 8 +++++++-
 cpukit/libnetworking/headers.am                 | 1 -
 testsuites/libtests/Makefile.am                 | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)
 rename cpukit/{libnetworking => include}/rtems/ftpfs.h (100%)

diff --git a/cpukit/headers.am b/cpukit/headers.am
index 048cef6d83..66efcb5c58 100644
--- a/cpukit/headers.am
+++ b/cpukit/headers.am
@@ -124,6 +124,7 @@ include_rtems_HEADERS += include/rtems/framebuffer.h
 include_rtems_HEADERS += include/rtems/fs.h
 include_rtems_HEADERS += include/rtems/fsmount.h
 include_rtems_HEADERS += include/rtems/ftpd.h
+include_rtems_HEADERS += include/rtems/ftpfs.h
 include_rtems_HEADERS += include/rtems/gxx_wrappers.h
 include_rtems_HEADERS += include/rtems/ide_part_table.h
 include_rtems_HEADERS += include/rtems/imfs.h
diff --git a/cpukit/libnetworking/rtems/ftpfs.h b/cpukit/include/rtems/ftpfs.h
similarity index 100%
rename from cpukit/libnetworking/rtems/ftpfs.h
rename to cpukit/include/rtems/ftpfs.h
diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am
index 1f6be15312..372f642610 100644
--- a/cpukit/libnetworking/Makefile.am
+++ b/cpukit/libnetworking/Makefile.am
@@ -4,6 +4,12 @@ include $(top_srcdir)/automake/compile.am
 project_lib_LIBRARIES =
 TMPINSTALL_FILES =
 
+project_lib_LIBRARIES += libftpfs.a
+libftpfs_a_SOURCES = lib/ftpfs.c
+$(PROJECT_LIB)/libftpfs.a: libftpfs.a
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/libftpfs.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libftpfs.a
+
 project_lib_LIBRARIES += libtftpfs.a
 libtftpfs_a_SOURCES = lib/tftpDriver.c
 $(PROJECT_LIB)/libtftpfs.a: libtftpfs.a
@@ -134,7 +140,7 @@ lib_CPPFLAGS = -DNOPOLL -DNOSELECT
 noinst_LIBRARIES += lib.a
 lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(lib_CPPFLAGS) -D__BSD_VISIBLE
 
-lib_a_SOURCES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c lib/ftpfs.c \
+lib_a_SOURCES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c \
     lib/syslog.c
 lib_a_SOURCES += rtems/rtems_syscall_api.c
 endif
diff --git a/cpukit/libnetworking/headers.am b/cpukit/libnetworking/headers.am
index ce4c7c77e0..93dce6ef8f 100644
--- a/cpukit/libnetworking/headers.am
+++ b/cpukit/libnetworking/headers.am
@@ -106,7 +106,6 @@ include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS =
 include_rtems_HEADERS += rtems/bootp.h
 include_rtems_HEADERS += rtems/dhcp.h
-include_rtems_HEADERS += rtems/ftpfs.h
 include_rtems_HEADERS += rtems/mkrootfs.h
 include_rtems_HEADERS += rtems/rtems_bsdnet.h
 include_rtems_HEADERS += rtems/rtems_bsdnet_internal.h
diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 68ff80a585..36f7a2f84c 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -582,7 +582,7 @@ lib_docs += ftp01/ftp01.doc
 ftp01_SOURCES = ftp01/init.c
 ftp01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_ftp01) \
 	$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
-ftp01_LDADD = -lftpd
+ftp01_LDADD = -lftpd -lftpfs
 endif
 endif
 
-- 
2.12.3