Permalink
Browse files

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.
  • Loading branch information...
1 parent f9bb21a commit e803ae576042a8c9d6f61e1e1ec58f26bf56aaa2 @sahlberg committed Nov 29, 2012
View
@@ -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 \
View
@@ -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
@@ -23,6 +23,7 @@
#define _LIBNFS_RAW_H_
#include <stdint.h>
+#include <nfsc/libnfs-zdr.h>
struct rpc_data {
int size;
File renamed without changes.
File renamed without changes.
View
@@ -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 \
View
@@ -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
View
@@ -6,8 +6,7 @@
#ifndef _MOUNT_H_RPCGEN
#define _MOUNT_H_RPCGEN
-
-
+#include <nfsc/libnfs-zdr.h>
#ifdef __cplusplus
extern "C" {
View
@@ -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
View
@@ -6,8 +6,7 @@
#ifndef _NFS_H_RPCGEN
#define _NFS_H_RPCGEN
-
-
+#include <nfsc/libnfs-zdr.h>
#ifdef __cplusplus
extern "C" {
View
@@ -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
View
@@ -6,8 +6,7 @@
#ifndef _NLM_H_RPCGEN
#define _NLM_H_RPCGEN
-
-
+#include <nfsc/libnfs-zdr.h>
#ifdef __cplusplus
extern "C" {
View
@@ -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
@@ -6,8 +6,7 @@
#ifndef _PORTMAP_H_RPCGEN
#define _PORTMAP_H_RPCGEN
-
-
+#include <nfsc/libnfs-zdr.h>
#ifdef __cplusplus
extern "C" {
View
@@ -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
@@ -6,8 +6,7 @@
#ifndef _RQUOTA_H_RPCGEN
#define _RQUOTA_H_RPCGEN
-
-
+#include <nfsc/libnfs-zdr.h>
#ifdef __cplusplus
extern "C" {

0 comments on commit e803ae5

Please sign in to comment.