Changeset f26145b in rtems for cpukit/ftpd

Timestamp:

Feb 4, 2005, 12:40:16 PM (16 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

4bf6a9f2

Parents:

f26a9760

Message:

2005-02-03 Ralf Corsepius <ralf.corsepius@…>

PR 756/rtems

• ftpd/ftpd.c, ftpd/ftpd.h, ftpd/Makefile.am: New (relocated from /c/src/libnetworking/ftpd)
• ftpd/ftd.h: New header guards.
• ftpd/Makefile.am: Install libftd.a, install ftp.h to rtems/ftp.h.
• configure.ac: Add ftpd/Makefile.
• Makefile.am: Add ftpd.

Location:

cpukit/ftpd

Files:

• Makefile.am (modified) (2 diffs)
• ftpd.h (modified) (2 diffs)

cpukit/ftpd/Makefile.am

@@ -5 +5 @@
 include $(top_srcdir)/automake/compile.am
 
-noinst_LIBRARIES =
+if HAS_NETWORKING
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = ftpd.h
 
-if HAS_NETWORKING
-include_HEADERS = ftpd.h
-
-noinst_LIBRARIES += libftpd.a
+project_lib_LIBRARIES = libftpd.a
 libftpd_a_SOURCES = ftpd.c ftpd.h
 libftpd_a_CPPFLAGS = $(AM_CPPFLAGS)
@@ -19 +18 @@
 PREINSTALL_DIRS =
 PREINSTALL_FILES =
+TMPINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/$(dirstamp):
-        @$(mkdir_p) $(PROJECT_INCLUDE)
-        @: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
+$(PROJECT_LIB)/$(dirstamp):
+        @$(mkdir_p) $(PROJECT_LIB)
+        @: > $(PROJECT_LIB)/$(dirstamp)
+TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
 
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/$(dirstamp)
-        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ftpd.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/ftpd.h
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
+        @$(mkdir_p) $(PROJECT_INCLUDE)/rtems
+        @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/ftpd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/ftpd.h
+
+$(PROJECT_LIB)/libftpd.a: libftpd.a $(PROJECT_LIB)/$(dirstamp)
+        $(INSTALL_DATA) $< $(PROJECT_LIB)/libftpd.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/libftpd.a
 endif
 
 CLEANFILES = $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
+CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/automake/local.am

cpukit/ftpd/ftpd.h

@@ -5 +5 @@
  */
 
-#ifndef __FTPD_H__
-#define __FTPD_H__
+#ifndef _RTEMS_FTPD_H
+#define _RTEMS_FTPD_H
 
 
@@ -54 +54 @@
 int rtems_initialize_ftpd();
 
-#endif  /* __FTPD_H__ */
+#endif  /* _RTEMS_FTPD_H */