diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-25 16:56:48 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-09-25 16:56:48 +0000 |
commit | 96eadec43e7ef0e1b01779e40c38dbd414fc71db (patch) | |
tree | 966374e9df2020f21727bcb5e8d1c82d5bf322d6 /c/src | |
parent | 2007-09-24 Chris Johns <chrisj@rtems.org> (diff) | |
download | rtems-96eadec43e7ef0e1b01779e40c38dbd414fc71db.tar.bz2 |
2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com>
* nfsclient/Makefile.am, nfsclient/preinstall.am: Install libnfs.a.
Diffstat (limited to 'c/src')
-rw-r--r-- | c/src/ChangeLog | 4 | ||||
-rw-r--r-- | c/src/nfsclient/Makefile.am | 32 | ||||
-rw-r--r-- | c/src/nfsclient/preinstall.am | 4 |
3 files changed, 23 insertions, 17 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 24f6e1ff12..1520b688c9 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,3 +1,7 @@ +2007-09-25 Joel Sherrill <joel.sherrill@OARcorp.com> + + * nfsclient/Makefile.am, nfsclient/preinstall.am: Install libnfs.a. + 2007-09-21 Ralf Corsépius <ralf.corsepius@rtems.org> * aclocal/version.m4: Bump RTEMS_API to 4.9. diff --git a/c/src/nfsclient/Makefile.am b/c/src/nfsclient/Makefile.am index 6133c4917a..8da9c7eaf1 100644 --- a/c/src/nfsclient/Makefile.am +++ b/c/src/nfsclient/Makefile.am @@ -12,29 +12,29 @@ dirutils_rel_CPPFLAGS = $(AM_CPPFLAGS) dirutils_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) if HAS_NETWORKING -noinst_LIBRARIES = librtemsnfs.a +project_lib_LIBRARIES = libnfs.a # if you have CEXP set this variable to 'YES' # and some "help" info will be compiled in. -librtemsnfs_a_SOURCES = src/rpcio.c src/rpcio.h -librtemsnfs_a_SOURCES += src/nfs.c src/sock_mbuf.c src/xdr_mbuf.c -librtemsnfs_a_SOURCES += proto/mount_prot.h proto/nfs_prot.h +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 -# librtemsnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c +# libnfs_a_SOURCES += dirutils.c rpcio.modini.c nfs.modini.c cexphelp.c include_HEADERS = src/librtemsNfs.h # PGMS=${ARCH}/nfs.obj ${ARCH}/rpcio.obj ${ARCH}/dirutils.obj -librtemsnfs_a_CPPFLAGS = $(AM_CPPFLAGS) -librtemsnfs_a_CPPFLAGS += -I$(srcdir)/proto -librtemsnfs_a_CPPFLAGS += -UHAVE_CEXP +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 src/nfs.modini.c proto/nfs_prot.h proto/mount_prot.h +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 = libnfsprot.a @@ -42,18 +42,16 @@ nfs_rel_LDADD = libnfsprot.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 src/rpcio.modini.c +rpcio_rel_SOURCES = src/rpcio.c src/sock_mbuf.c src/xdr_mbuf.c rpcio_rel_CPPFLAGS = $(AM_CPPFLAGS) rpcio_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -noinst_LIBRARIES += libnfsprot.a +libnfs_a_SOURCES += proto/nfs_prot_xdr.c proto/nfs_prot.h +libnfs_a_SOURCES += proto/mount_prot_xdr.c proto/mount_prot.h -libnfsprot_a_SOURCES = proto/nfs_prot_xdr.c proto/nfs_prot.h -libnfsprot_a_SOURCES += proto/mount_prot_xdr.c proto/mount_prot.h - -libnfsprot_a_CPPFLAGS = $(AM_CPPFLAGS) -libnfsprot_a_CPPFLAGS += -I$(srcdir)/proto -libnfsprot_a_CPPFLAGS += -UHAVE_CEXP +libnfs_a_CPPFLAGS = $(AM_CPPFLAGS) +libnfs_a_CPPFLAGS += -I$(srcdir)/proto +libnfs_a_CPPFLAGS += -UHAVE_CEXP endif diff --git a/c/src/nfsclient/preinstall.am b/c/src/nfsclient/preinstall.am index a2dfef90dd..ad72b0e68b 100644 --- a/c/src/nfsclient/preinstall.am +++ b/c/src/nfsclient/preinstall.am @@ -33,6 +33,10 @@ $(PROJECT_LIB)/dirutils.rel: dirutils.rel $(PROJECT_LIB)/$(dirstamp) TMPINSTALL_FILES += $(PROJECT_LIB)/dirutils.rel if HAS_NETWORKING +$(PROJECT_LIB)/libnfs.a: libnfs.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/libnfs.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libnfs.a + $(PROJECT_INCLUDE)/librtemsNfs.h: src/librtemsNfs.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/librtemsNfs.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/librtemsNfs.h |