summaryrefslogtreecommitdiffstats
path: root/cpukit/ftpd
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2005-02-04 12:40:16 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2005-02-04 12:40:16 +0000
commitf26145b8007f458d29b297f5b286954fb8f090e4 (patch)
treea614de79ab19e34db785e22f90054828a7cb3658 /cpukit/ftpd
parentf26a97602e89a09c0928e54327c9a8cba8d66733 (diff)
downloadrtems-f26145b8007f458d29b297f5b286954fb8f090e4.tar.bz2
2005-02-03 Ralf Corsepius <ralf.corsepius@rtems.org>
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.
Diffstat (limited to 'cpukit/ftpd')
-rw-r--r--cpukit/ftpd/Makefile.am32
-rw-r--r--cpukit/ftpd/ftpd.h6
2 files changed, 24 insertions, 14 deletions
diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 92e730ff10..5e88bd8296 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -4,12 +4,11 @@
include $(top_srcdir)/automake/compile.am
-noinst_LIBRARIES =
-
if HAS_NETWORKING
-include_HEADERS = ftpd.h
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = ftpd.h
-noinst_LIBRARIES += libftpd.a
+project_lib_LIBRARIES = libftpd.a
libftpd_a_SOURCES = ftpd.c ftpd.h
libftpd_a_CPPFLAGS = $(AM_CPPFLAGS)
endif
@@ -18,19 +17,30 @@ all-local: $(PREINSTALL_FILES)
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
diff --git a/cpukit/ftpd/ftpd.h b/cpukit/ftpd/ftpd.h
index e429e9baf4..445780452c 100644
--- a/cpukit/ftpd/ftpd.h
+++ b/cpukit/ftpd/ftpd.h
@@ -4,8 +4,8 @@
* $Id$
*/
-#ifndef __FTPD_H__
-#define __FTPD_H__
+#ifndef _RTEMS_FTPD_H
+#define _RTEMS_FTPD_H
#define FTPD_CONTROL_PORT 21
@@ -53,4 +53,4 @@ struct rtems_ftpd_configuration
int rtems_initialize_ftpd();
-#endif /* __FTPD_H__ */
+#endif /* _RTEMS_FTPD_H */