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.

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 878ac1abb73cb95c8c9ad66eec020b95c6d2ecc2..fec0ff3a5161789fce02ea3522a61eef870350e0 100644 (file)
--- 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 ef3545e481d66b9d5e5284a84543230255bc564f..d757d2b8c03ac16f28c8b60b1d4976266f1c622a 100644 (file)
--- 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 8503e0be98805d725c8287e63fa88e491a050e26..b71e6b0f0cd8c41c8704bf590eb990776eb6e002 100644 (file)
--- a/include/libnfs-raw.h
+++ b/include/nfsc/libnfs-raw.h
@@ -23,6 +23,7 @@
 #define _LIBNFS_RAW_H_
 
 #include <stdint.h>
+#include <nfsc/libnfs-zdr.h>
 
 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 1b5a66fb4411d44dc8f13b4d3b4ba6d20e0fbb6b..e1c7c6c64386543f9adb8bfb09ef6f1744e2c768 100644 (file)
--- 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 c0633169263d1ea129bdb507697cda7aaa4c5696..e05df7d3429bb4d86c1c440f4a34a1b9607660bb 100644 (file)
--- 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 23900abc00a1e29018426cc372952f589624d4a8..1cb2775c5b5d598e6372dd9ea5e5f25b502fbe49 100644 (file)
--- 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 <nfsc/libnfs-zdr.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index 1f0b1b4e165c43186128138bf4759a6d853da5ee..0f1c80ee41f8461518ba513621f7cb861013b8a1 100644 (file)
--- 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 4ba504fdf0cf46b2c314c85e8c2aa3b6a5031116..2d0449781d42f5cf095e338ff8667b654c9c1068 100644 (file)
--- 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 <nfsc/libnfs-zdr.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/nlm/Makefile.am b/nlm/Makefile.am
index 19391bd3f709435feb4d5c613b7543540892df94..18d2ddcbf92f58d38482599ee951605f995814f4 100644 (file)
--- 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 ca4dbe2a1512cc7ceead25eb84491f77ebe10c36..3c9fbd56c0184e0a974b20cbdeaf5d3ce91ff63d 100644 (file)
--- 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 <nfsc/libnfs-zdr.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/portmap/Makefile.am b/portmap/Makefile.am
index 96fc61fca27aefc44d474360f824d50de3596781..5b218702bce51eca2fa98002d44c254d9443f5fe 100644 (file)
--- 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 2af2e487b7dfb983040139caf27b67e89a91c5f5..df88b6786b58f9bac1ea7019a8e65a0e6e19c298 100644 (file)
--- 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 <nfsc/libnfs-zdr.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/rquota/Makefile.am b/rquota/Makefile.am
index eb93504e2640ab0a39cbc86d6f498e83d35eeaee..ad2db5148db2ab0e2a81738e2d865be634fd79c8 100644 (file)
--- 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 0cb42fa4f0f0b6512fedca06e9c72ebe54b3c5a7..4690da6b035dd879f475734dbeea147178c23f32 100644 (file)
--- 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 <nfsc/libnfs-zdr.h>
 
 #ifdef __cplusplus
 extern "C" {