From 3ca22dcfdddb36c9620aa9b8914d9597d78a5fe5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 8 Jan 2016 22:41:17 +0100 Subject: [PATCH] Win32: Add win32_compat.h include --- examples/Makefile.am | 1 + include/Makefile.am | 3 ++- lib/Makefile.am | 4 +++- mount/Makefile.am | 3 ++- nfs/Makefile.am | 3 ++- nlm/Makefile.am | 3 ++- nsm/Makefile.am | 3 ++- portmap/Makefile.am | 3 ++- rquota/Makefile.am | 3 ++- utils/Makefile.am | 1 + 10 files changed, 19 insertions(+), 8 deletions(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index a1fa042..8421d72 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -3,6 +3,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$(abs_top_srcdir)/include/win32 \ -I$(abs_top_srcdir)/mount \ -I$(abs_top_srcdir)/nfs \ -I$(abs_top_srcdir)/portmap \ diff --git a/include/Makefile.am b/include/Makefile.am index 98ab2cf..2ff921b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -8,7 +8,8 @@ dist_nfsc_HEADERS = \ ../nfs/libnfs-raw-nfs.h \ ../nlm/libnfs-raw-nlm.h \ ../nsm/libnfs-raw-nsm.h \ - ../rquota/libnfs-raw-rquota.h + ../rquota/libnfs-raw-rquota.h \ + ../win32/win32_compat.h dist_noinst_HEADERS = \ libnfs-private.h \ diff --git a/lib/Makefile.am b/lib/Makefile.am index c0499cc..632950b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -10,6 +10,7 @@ libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/nsm \ -I$(abs_top_srcdir)/portmap \ -I$(abs_top_srcdir)/rquota \ + -I$(abs_top_srcdir)/win32 \ "-D_U_=__attribute__((unused))" libnfs_la_SOURCES = \ @@ -18,7 +19,8 @@ libnfs_la_SOURCES = \ libnfs-sync.c \ libnfs-zdr.c \ pdu.c \ - socket.c + socket.c \ + ../win32/win32_compat.c SOCURRENT=9 SOREVISION=0 diff --git a/mount/Makefile.am b/mount/Makefile.am index 5a9c65e..9327f54 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -7,7 +7,8 @@ mount_GENERATED = $(mount_SOURCES_GENERATED) $(mount_HEADERS_GENERATED) CLEANFILES = $(mount_GENERATED) mount-stamp libmount_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/include/nfsc + -I$(abs_top_srcdir)/include/nfsc \ + -I$(abs_top_srcdir)/win32 libmount_la_SOURCES = \ $(mount_SOURCES_GENERATED) \ mount.c libnfs-raw-mount.c libnfs-raw-mount.h diff --git a/nfs/Makefile.am b/nfs/Makefile.am index de62dce..ef95d15 100644 --- a/nfs/Makefile.am +++ b/nfs/Makefile.am @@ -7,7 +7,8 @@ nfs_GENERATED = $(nfs_SOURCES_GENERATED) $(nfs_HEADERS_GENERATED) CLEANFILES = $(nfs_GENERATED) nfs-stamp libnfs_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/include/nfsc + -I$(abs_top_srcdir)/include/nfsc \ + -I$(abs_top_srcdir)/win32 libnfs_la_SOURCES = \ $(nfs_SOURCES_GENERATED) \ nfs.c nfsacl.c libnfs-raw-nfs.c libnfs-raw-nfs.h diff --git a/nlm/Makefile.am b/nlm/Makefile.am index dd91cb9..64bf776 100644 --- a/nlm/Makefile.am +++ b/nlm/Makefile.am @@ -7,7 +7,8 @@ nlm_GENERATED = $(nlm_SOURCES_GENERATED) $(nlm_HEADERS_GENERATED) CLEANFILES = $(nlm_GENERATED) nlm-stamp libnlm_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/include/nfsc + -I$(abs_top_srcdir)/include/nfsc \ + -I$(abs_top_srcdir)/win32 libnlm_la_SOURCES = \ $(nlm_SOURCES_GENERATED) \ nlm.c libnfs-raw-nlm.c libnfs-raw-nlm.h diff --git a/nsm/Makefile.am b/nsm/Makefile.am index 9e45099..360f5ea 100644 --- a/nsm/Makefile.am +++ b/nsm/Makefile.am @@ -7,7 +7,8 @@ nsm_GENERATED = $(nsm_SOURCES_GENERATED) $(nsm_HEADERS_GENERATED) CLEANFILES = $(nsm_GENERATED) nsm-stamp libnsm_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/include/nfsc + -I$(abs_top_srcdir)/include/nfsc \ + -I$(abs_top_srcdir)/win32 libnsm_la_SOURCES = \ $(nsm_SOURCES_GENERATED) \ nsm.c libnfs-raw-nsm.c libnfs-raw-nsm.h diff --git a/portmap/Makefile.am b/portmap/Makefile.am index 5fcccfa..9db108e 100644 --- a/portmap/Makefile.am +++ b/portmap/Makefile.am @@ -7,7 +7,8 @@ portmap_GENERATED = $(portmap_SOURCES_GENERATED) $(portmap_HEADERS_GENERATED) CLEANFILES = $(portmap_GENERATED) portmap-stamp libportmap_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/include/nfsc + -I$(abs_top_srcdir)/include/nfsc \ + -I$(abs_top_srcdir)/win32 libportmap_la_SOURCES = \ $(portmap_SOURCES_GENERATED) \ portmap.c libnfs-raw-portmap.c libnfs-raw-portmap.h diff --git a/rquota/Makefile.am b/rquota/Makefile.am index fae3e1a..3940e34 100644 --- a/rquota/Makefile.am +++ b/rquota/Makefile.am @@ -7,7 +7,8 @@ rquota_GENERATED = $(rquota_SOURCES_GENERATED) $(rquota_HEADERS_GENERATED) CLEANFILES = $(rquota_GENERATED) rquota-stamp librquota_la_CPPFLAGS = -I$(abs_top_srcdir)/include \ - -I$(abs_top_srcdir)/include/nfsc + -I$(abs_top_srcdir)/include/nfsc \ + -I$(abs_top_srcdir)/win32 librquota_la_SOURCES = \ $(rquota_SOURCES_GENERATED) \ rquota.c libnfs-raw-rquota.c libnfs-raw-rquota.h diff --git a/utils/Makefile.am b/utils/Makefile.am index 9148b6b..3aa483e 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ -I$(abs_top_srcdir)/include \ -I$(abs_top_srcdir)/include/nfsc \ -I$(abs_top_srcdir)/mount \ + -I$(abs_top_srcdir)/win32 \ "-D_U_=__attribute__((unused))" AM_LDFLAGS = ../lib/.libs/libnfs.la