Changeset 9e36910 in rtems

Timestamp:

04/09/18 04:37:39 (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

f0bcae38

Parents:

af6168c6

git-author:

Sebastian Huber <sebastian.huber@…> (04/09/18 04:37:39)

git-committer:

Sebastian Huber <sebastian.huber@…> (04/12/18 05:08:53)

Message:

NFS: Remove support for cexp

Avoid use of RTEMS_RELLDFLAGS.

Close #3390.

Location:

cpukit/libfs/src/nfsclient

Files:

• Makefile.am (modified) (1 diff)
• src/cexphelp.c (deleted)
• src/dirutils.c (deleted)
• src/nfs.c (modified) (1 diff)
• src/nfs.modini.c (deleted)
• src/nfsTest.c (deleted)
• src/rpcio.modini.c (deleted)

cpukit/libfs/src/nfsclient/Makefile.am

@@ -1 +1 @@
 include $(top_srcdir)/automake/compile.am
-
-#%dirutils.obj: %dirutils.o
-#       $(LD) -r -o $@ $^
-project_lib_PROGRAMS = dirutils.rel
-dirutils_rel_SOURCES = src/dirutils.c
-dirutils_rel_CPPFLAGS = $(AM_CPPFLAGS)
-dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
 
 if LIBNETWORKING
 project_lib_LIBRARIES = libnfs.a
-
-$(PROJECT_LIB)/libnfs.a: libnfs.a
-        $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a
-TMPINSTALL_FILES = $(PROJECT_LIB)/libnfs.a
-
-
-# if you have CEXP set this variable to 'YES'
-# and some "help" info will be compiled in.
-libnfs_a_SOURCES = src/rpcio.c src/rpcio.h
-libnfs_a_SOURCES += src/nfs.c src/sock_mbuf.c src/xdr_mbuf.c
-libnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h
-
-# With CEXP
-# libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c
-
-# PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj
-
-libnfs_a_CPPFLAGS = $(AM_CPPFLAGS)
-libnfs_a_CPPFLAGS += -I$(srcdir)/proto
-libnfs_a_CPPFLAGS += -UHAVE_CEXP
-
-#%nfs.obj: %nfs.o %nfs.modini.o
-#       $(LD) -r -o $@ $^ -L../proto/$(ARCH) -lnfsprot
-project_lib_PROGRAMS += nfs.rel
-nfs_rel_SOURCES = src/nfs.c proto/nfs_prot.h proto/mount_prot.h
-nfs_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/proto
-nfs_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-nfs_rel_LDADD = libnfs.a
-
-#%rpcio.obj: %rpcio.o %sock_mbuf.o %xdr_mbuf.o %rpcio.modini.o
-#       $(LD) -r -o $@ $^
-project_lib_PROGRAMS += rpcio.rel
-rpcio_rel_SOURCES = src/rpcio.c src/sock_mbuf.c src/xdr_mbuf.c
-rpcio_rel_CPPFLAGS = $(AM_CPPFLAGS)
-rpcio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
-
-libnfs_a_SOURCES += proto/nfs_prot_xdr.c proto/nfs_prot.h
-libnfs_a_SOURCES += proto/mount_prot_xdr.c proto/mount_prot.h
-
-libnfs_a_CPPFLAGS += -I$(srcdir)/proto
-libnfs_a_CPPFLAGS += -UHAVE_CEXP
+libnfs_a_SOURCES =
+libnfs_a_SOURCES += proto/mount_prot_xdr.c
+libnfs_a_SOURCES += proto/nfs_prot_xdr.c
+libnfs_a_SOURCES += src/nfs.c
+libnfs_a_SOURCES += src/rpcio.c
+libnfs_a_SOURCES += src/sock_mbuf.c
+libnfs_a_SOURCES += src/xdr_mbuf.c
 endif
 

cpukit/libfs/src/nfsclient/src/nfs.c

@@ -81 +81 @@
 #include <arpa/inet.h>
 
-#include <nfs_prot.h>
-#include <mount_prot.h>
+#include "../proto/nfs_prot.h"
+#include "../proto/mount_prot.h"
 
 #include "rpcio.h"