From e803ae576042a8c9d6f61e1e1ec58f26bf56aaa2 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 28 Nov 2012 20:21:53 -0800 Subject: [PATCH] Rearrange the header files. Move the headers we install to ./include/nfsc and start including nfsc/libnfs-zdr.h from all the other header files. --- examples/Makefile.am | 1 + include/Makefile.am | 7 ++++--- include/{ => nfsc}/libnfs-raw.h | 1 + include/{ => nfsc}/libnfs-zdr.h | 0 include/{ => nfsc}/libnfs.h | 0 lib/Makefile.am | 1 + mount/Makefile.am | 3 ++- mount/libnfs-raw-mount.h | 3 +-- nfs/Makefile.am | 3 ++- nfs/libnfs-raw-nfs.h | 3 +-- nlm/Makefile.am | 3 ++- nlm/libnfs-raw-nlm.h | 3 +-- portmap/Makefile.am | 3 ++- portmap/libnfs-raw-portmap.h | 3 +-- rquota/Makefile.am | 3 ++- rquota/libnfs-raw-rquota.h | 3 +-- 16 files changed, 22 insertions(+), 18 deletions(-) rename include/{ => nfsc}/libnfs-raw.h (99%) rename include/{ => nfsc}/libnfs-zdr.h (100%) rename include/{ => nfsc}/libnfs.h (100%) diff --git a/examples/Makefile.am b/examples/Makefile.am index 878ac1a..fec0ff3 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -2,6 +2,7 @@ noinst_PROGRAMS = nfsclient-async nfsclient-raw nfsclient-sync nfsclient-bcast n AM_CPPFLAGS = \ -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc \ -I../mount \ -I../nfs \ -I../rquota \ diff --git a/include/Makefile.am b/include/Makefile.am index ef3545e..d757d2b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,9 +1,10 @@ nfscdir = $(includedir)/nfsc dist_nfsc_HEADERS = \ - libnfs.h \ - libnfs-raw.h \ - libnfs-zdr.h \ + nfsc/libnfs.h \ + nfsc/libnfs-raw.h \ + nfsc/libnfs-zdr.h \ ${abs_top_srcdir}/mount/libnfs-raw-mount.h \ ${abs_top_srcdir}/portmap/libnfs-raw-portmap.h \ ${abs_top_srcdir}/nfs/libnfs-raw-nfs.h \ + ${abs_top_srcdir}/nlm/libnfs-raw-nlm.h \ ${abs_top_srcdir}/rquota/libnfs-raw-rquota.h diff --git a/include/libnfs-raw.h b/include/nfsc/libnfs-raw.h similarity index 99% rename from include/libnfs-raw.h rename to include/nfsc/libnfs-raw.h index 8503e0b..b71e6b0 100644 --- a/include/libnfs-raw.h +++ b/include/nfsc/libnfs-raw.h @@ -23,6 +23,7 @@ #define _LIBNFS_RAW_H_ #include +#include struct rpc_data { int size; diff --git a/include/libnfs-zdr.h b/include/nfsc/libnfs-zdr.h similarity index 100% rename from include/libnfs-zdr.h rename to include/nfsc/libnfs-zdr.h diff --git a/include/libnfs.h b/include/nfsc/libnfs.h similarity index 100% rename from include/libnfs.h rename to include/nfsc/libnfs.h diff --git a/lib/Makefile.am b/lib/Makefile.am index 1b5a66f..e1c7c6c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,7 @@ lib_LTLIBRARIES = libnfs.la libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc \ -I../mount \ -I../nfs \ -I../nlm \ diff --git a/mount/Makefile.am b/mount/Makefile.am index c063316..e05df7d 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -6,7 +6,8 @@ mount_GENERATED = $(mount_SOURCES_GENERATED) $(mount_HEADERS_GENERATED) CLEANFILES = $(mount_GENERATED) mount-stamp -libmount_la_CPPFLAGS = -I$(abs_top_srcdir)/include +libmount_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc libmount_la_SOURCES = \ $(mount_SOURCES_GENERATED) \ mount.c libnfs-raw-mount.c diff --git a/mount/libnfs-raw-mount.h b/mount/libnfs-raw-mount.h index 23900ab..1cb2775 100644 --- a/mount/libnfs-raw-mount.h +++ b/mount/libnfs-raw-mount.h @@ -6,8 +6,7 @@ #ifndef _MOUNT_H_RPCGEN #define _MOUNT_H_RPCGEN - - +#include #ifdef __cplusplus extern "C" { diff --git a/nfs/Makefile.am b/nfs/Makefile.am index 1f0b1b4..0f1c80e 100644 --- a/nfs/Makefile.am +++ b/nfs/Makefile.am @@ -6,7 +6,8 @@ nfs_GENERATED = $(nfs_SOURCES_GENERATED) $(nfs_HEADERS_GENERATED) CLEANFILES = $(nfs_GENERATED) nfs-stamp -libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include +libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc libnfs_la_SOURCES = \ $(nfs_SOURCES_GENERATED) \ nfs.c nfsacl.c libnfs-raw-nfs.c diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h index 4ba504f..2d04497 100644 --- a/nfs/libnfs-raw-nfs.h +++ b/nfs/libnfs-raw-nfs.h @@ -6,8 +6,7 @@ #ifndef _NFS_H_RPCGEN #define _NFS_H_RPCGEN - - +#include #ifdef __cplusplus extern "C" { diff --git a/nlm/Makefile.am b/nlm/Makefile.am index 19391bd..18d2ddc 100644 --- a/nlm/Makefile.am +++ b/nlm/Makefile.am @@ -6,7 +6,8 @@ nlm_GENERATED = $(nlm_SOURCES_GENERATED) $(nlm_HEADERS_GENERATED) CLEANFILES = $(nlm_GENERATED) nlm-stamp -libnlm_la_CPPFLAGS = -I$(abs_top_srcdir)/include +libnlm_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc libnlm_la_SOURCES = \ $(nlm_SOURCES_GENERATED) \ nlm.c libnfs-raw-nlm.c diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h index ca4dbe2..3c9fbd5 100644 --- a/nlm/libnfs-raw-nlm.h +++ b/nlm/libnfs-raw-nlm.h @@ -6,8 +6,7 @@ #ifndef _NLM_H_RPCGEN #define _NLM_H_RPCGEN - - +#include #ifdef __cplusplus extern "C" { diff --git a/portmap/Makefile.am b/portmap/Makefile.am index 96fc61f..5b21870 100644 --- a/portmap/Makefile.am +++ b/portmap/Makefile.am @@ -6,7 +6,8 @@ portmap_GENERATED = $(portmap_SOURCES_GENERATED) $(portmap_HEADERS_GENERATED) CLEANFILES = $(portmap_GENERATED) portmap-stamp -libportmap_la_CPPFLAGS = -I$(abs_top_srcdir)/include +libportmap_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc libportmap_la_SOURCES = \ $(portmap_SOURCES_GENERATED) \ portmap.c libnfs-raw-portmap.c diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h index 2af2e48..df88b67 100644 --- a/portmap/libnfs-raw-portmap.h +++ b/portmap/libnfs-raw-portmap.h @@ -6,8 +6,7 @@ #ifndef _PORTMAP_H_RPCGEN #define _PORTMAP_H_RPCGEN - - +#include #ifdef __cplusplus extern "C" { diff --git a/rquota/Makefile.am b/rquota/Makefile.am index eb93504..ad2db51 100644 --- a/rquota/Makefile.am +++ b/rquota/Makefile.am @@ -6,7 +6,8 @@ rquota_GENERATED = $(rquota_SOURCES_GENERATED) $(rquota_HEADERS_GENERATED) CLEANFILES = $(rquota_GENERATED) rquota-stamp -librquota_la_CPPFLAGS = -I$(abs_top_srcdir)/include +librquota_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ + -I$(abs_top_srcdir)/include/nfsc librquota_la_SOURCES = \ $(rquota_SOURCES_GENERATED) \ rquota.c libnfs-raw-rquota.c diff --git a/rquota/libnfs-raw-rquota.h b/rquota/libnfs-raw-rquota.h index 0cb42fa..4690da6 100644 --- a/rquota/libnfs-raw-rquota.h +++ b/rquota/libnfs-raw-rquota.h @@ -6,8 +6,7 @@ #ifndef _RQUOTA_H_RPCGEN #define _RQUOTA_H_RPCGEN - - +#include #ifdef __cplusplus extern "C" { -- 2.34.1