From c5881fc1558784739269800a26b7452c8cf46aba Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 14 May 1999 15:31:07 +0000 Subject: Enabled compilation of rtems_servers at request of Jake Janovetz . --- c/src/lib/libnetworking/Makefile.in | 3 +-- c/src/lib/libnetworking/include/Makefile.in | 6 +++++- c/src/lib/libnetworking/rtems_servers/Makefile.in | 2 +- c/src/lib/libnetworking/wrapup/Makefile.in | 3 +-- c/src/libnetworking/Makefile.in | 3 +-- c/src/libnetworking/include/Makefile.in | 6 +++++- c/src/libnetworking/rtems_servers/Makefile.in | 2 +- c/src/libnetworking/wrapup/Makefile.in | 3 +-- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/c/src/lib/libnetworking/Makefile.in b/c/src/lib/libnetworking/Makefile.in index 219b183f54..f3c7d966fb 100644 --- a/c/src/lib/libnetworking/Makefile.in +++ b/c/src/lib/libnetworking/Makefile.in @@ -18,8 +18,7 @@ VPATH = @srcdir@ include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg include $(RTEMS_ROOT)/make/directory.cfg -# add rtems_servers -SUB_DIRS=kern lib libc net netinet nfs rtems wrapup +SUB_DIRS=kern lib libc net netinet nfs rtems rtems_servers wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libnetworking/include/Makefile.in b/c/src/lib/libnetworking/include/Makefile.in index 1829f68872..18d53065dc 100644 --- a/c/src/lib/libnetworking/include/Makefile.in +++ b/c/src/lib/libnetworking/include/Makefile.in @@ -50,9 +50,12 @@ ARPA_H_FILES=$(ARPA_H_PIECES:%=$(srcdir)/../arpa/%.h) NFS_H_PIECES= krpc nfs nfsdiskless nfsproto rpcv2 xdr_subs NFS_H_FILES=$(NFS_H_PIECES:%=$(srcdir)/../nfs/%.h) +RTEMS_SERVERS_H_PIECES= ftpd +RTEMS_SERVERS_H_FILES=$(RTEMS_SERVERS_H_PIECES:%=$(srcdir)/../rtems_servers/%.h) + SRCS=$(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(MACHINE_H_FILES) \ $(VM_H_FILES) $(NET_H_FILES) $(NETINET_H_FILES) $(ARPA_H_FILES) \ - $(NFS_H_FILES) + $(NFS_H_FILES) $(RTEMS_SERVERS_H_FILES) include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg include $(RTEMS_ROOT)/make/leaf.cfg @@ -70,6 +73,7 @@ all: $(SRCS) $(INSTALL_CHANGE) -m 444 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet $(INSTALL_CHANGE) -m 444 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa $(INSTALL_CHANGE) -m 444 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs + $(INSTALL_CHANGE) -m 444 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/lib/libnetworking/rtems_servers/Makefile.in b/c/src/lib/libnetworking/rtems_servers/Makefile.in index 02c5f91572..bc518bed2b 100644 --- a/c/src/lib/libnetworking/rtems_servers/Makefile.in +++ b/c/src/lib/libnetworking/rtems_servers/Makefile.in @@ -33,7 +33,7 @@ include $(RTEMS_ROOT)/make/lib.cfg # Add local stuff here using += # -DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +DEFINES += CPPFLAGS += CFLAGS += diff --git a/c/src/lib/libnetworking/wrapup/Makefile.in b/c/src/lib/libnetworking/wrapup/Makefile.in index 82c235d7e2..7493b22f69 100644 --- a/c/src/lib/libnetworking/wrapup/Makefile.in +++ b/c/src/lib/libnetworking/wrapup/Makefile.in @@ -15,8 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -NET_PIECES=kern lib libc net netinet nfs rtems -# Add rtems_servers +NET_PIECES=kern lib libc net netinet nfs rtems rtems_servers OBJS=$(foreach piece, $(NET_PIECES), ../$(piece)/$(ARCH)/*.o) LIB=$(ARCH)/libnetworking.a diff --git a/c/src/libnetworking/Makefile.in b/c/src/libnetworking/Makefile.in index 219b183f54..f3c7d966fb 100644 --- a/c/src/libnetworking/Makefile.in +++ b/c/src/libnetworking/Makefile.in @@ -18,8 +18,7 @@ VPATH = @srcdir@ include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg include $(RTEMS_ROOT)/make/directory.cfg -# add rtems_servers -SUB_DIRS=kern lib libc net netinet nfs rtems wrapup +SUB_DIRS=kern lib libc net netinet nfs rtems rtems_servers wrapup Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/libnetworking/include/Makefile.in b/c/src/libnetworking/include/Makefile.in index 1829f68872..18d53065dc 100644 --- a/c/src/libnetworking/include/Makefile.in +++ b/c/src/libnetworking/include/Makefile.in @@ -50,9 +50,12 @@ ARPA_H_FILES=$(ARPA_H_PIECES:%=$(srcdir)/../arpa/%.h) NFS_H_PIECES= krpc nfs nfsdiskless nfsproto rpcv2 xdr_subs NFS_H_FILES=$(NFS_H_PIECES:%=$(srcdir)/../nfs/%.h) +RTEMS_SERVERS_H_PIECES= ftpd +RTEMS_SERVERS_H_FILES=$(RTEMS_SERVERS_H_PIECES:%=$(srcdir)/../rtems_servers/%.h) + SRCS=$(H_FILES) $(SYS_H_FILES) $(RTEMS_H_FILES) $(MACHINE_H_FILES) \ $(VM_H_FILES) $(NET_H_FILES) $(NETINET_H_FILES) $(ARPA_H_FILES) \ - $(NFS_H_FILES) + $(NFS_H_FILES) $(RTEMS_SERVERS_H_FILES) include $(RTEMS_ROOT)/make/custom/${RTEMS_BSP}.cfg include $(RTEMS_ROOT)/make/leaf.cfg @@ -70,6 +73,7 @@ all: $(SRCS) $(INSTALL_CHANGE) -m 444 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet $(INSTALL_CHANGE) -m 444 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa $(INSTALL_CHANGE) -m 444 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs + $(INSTALL_CHANGE) -m 444 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ diff --git a/c/src/libnetworking/rtems_servers/Makefile.in b/c/src/libnetworking/rtems_servers/Makefile.in index 02c5f91572..bc518bed2b 100644 --- a/c/src/libnetworking/rtems_servers/Makefile.in +++ b/c/src/libnetworking/rtems_servers/Makefile.in @@ -33,7 +33,7 @@ include $(RTEMS_ROOT)/make/lib.cfg # Add local stuff here using += # -DEFINES += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__ +DEFINES += CPPFLAGS += CFLAGS += diff --git a/c/src/libnetworking/wrapup/Makefile.in b/c/src/libnetworking/wrapup/Makefile.in index 82c235d7e2..7493b22f69 100644 --- a/c/src/libnetworking/wrapup/Makefile.in +++ b/c/src/libnetworking/wrapup/Makefile.in @@ -15,8 +15,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@ -NET_PIECES=kern lib libc net netinet nfs rtems -# Add rtems_servers +NET_PIECES=kern lib libc net netinet nfs rtems rtems_servers OBJS=$(foreach piece, $(NET_PIECES), ../$(piece)/$(ARCH)/*.o) LIB=$(ARCH)/libnetworking.a -- cgit v1.2.3