Fix OFED v2 package to build against and target /dat2/include directory. Signed-off by: Arlin Davis <[EMAIL PROTECTED]>
diff --git a/Makefile.am b/Makefile.am index c4cb1bf..60b3db6 100755 --- a/Makefile.am +++ b/Makefile.am @@ -183,17 +183,17 @@ dapl_udapl_libdaplofa_la_LDFLAGS = -version-info 2:0:0 $(daplofa_version_script) libdatincludedir = $(includedir)/dat2 -libdatinclude_HEADERS = dat/include/dat/dat.h \ - dat/include/dat/dat_error.h \ - dat/include/dat/dat_platform_specific.h \ - dat/include/dat/dat_redirection.h \ - dat/include/dat/dat_registry.h \ - dat/include/dat/dat_vendor_specific.h \ - dat/include/dat/udat_config.h \ - dat/include/dat/udat.h \ - dat/include/dat/udat_redirection.h \ - dat/include/dat/udat_vendor_specific.h \ - dat/include/dat/dat_ib_extensions.h +libdatinclude_HEADERS = dat/include/dat2/dat.h \ + dat/include/dat2/dat_error.h \ + dat/include/dat2/dat_platform_specific.h \ + dat/include/dat2/dat_redirection.h \ + dat/include/dat2/dat_registry.h \ + dat/include/dat2/dat_vendor_specific.h \ + dat/include/dat2/udat_config.h \ + dat/include/dat2/udat.h \ + dat/include/dat2/udat_redirection.h \ + dat/include/dat2/udat_vendor_specific.h \ + dat/include/dat2/dat_ib_extensions.h man_MANS = man/dtest.1 man/dapltest.1 @@ -203,16 +203,16 @@ EXTRA_DIST = dat/common/dat_dictionary.h \ dat/common/dat_sr.h \ dat/udat/udat_sr_parser.h \ dat/udat/linux/dat_osd.h \ - dat/include/dat/dat.h \ - dat/include/dat/dat_error.h \ - dat/include/dat/dat_platform_specific.h \ - dat/include/dat/dat_redirection.h \ - dat/include/dat/dat_registry.h \ - dat/include/dat/dat_vendor_specific.h \ - dat/include/dat/udat_config.h \ - dat/include/dat/udat.h \ - dat/include/dat/udat_redirection.h \ - dat/include/dat/udat_vendor_specific.h \ + dat/include/dat2/dat.h \ + dat/include/dat2/dat_error.h \ + dat/include/dat2/dat_platform_specific.h \ + dat/include/dat2/dat_redirection.h \ + dat/include/dat2/dat_registry.h \ + dat/include/dat2/dat_vendor_specific.h \ + dat/include/dat2/udat_config.h \ + dat/include/dat2/udat.h \ + dat/include/dat2/udat_redirection.h \ + dat/include/dat2/udat_vendor_specific.h \ dapl/common/dapl_adapter_util.h \ dapl/common/dapl_cno_util.h \ dapl/common/dapl_cookie.h \ diff --git a/dapl/ibal/dapl_ibal_dto.h b/dapl/ibal/dapl_ibal_dto.h index be5686f..283fd91 100644 --- a/dapl/ibal/dapl_ibal_dto.h +++ b/dapl/ibal/dapl_ibal_dto.h @@ -52,7 +52,7 @@ #include "dapl_ibal_util.h" #ifdef DAT_EXTENSIONS -#include <dat/dat_ib_extensions.h> +#include <dat2/dat_ib_extensions.h> #endif extern DAT_RETURN diff --git a/dapl/include/dapl.h b/dapl/include/dapl.h index 49a3f49..42db81e 100755 --- a/dapl/include/dapl.h +++ b/dapl/include/dapl.h @@ -45,11 +45,11 @@ #define _DAPL_H_ #if defined(__KERNEL__) -#include <dat/kdat.h> +#include <dat2/kdat.h> #else -#include <dat/udat.h> +#include <dat2/udat.h> #endif /* defined(__KERNEL__) */ -#include <dat/dat_registry.h> +#include <dat2/dat_registry.h> #include "dapl_osd.h" #include "dapl_debug.h" diff --git a/dapl/openib_cma/dapl_ib_dto.h b/dapl/openib_cma/dapl_ib_dto.h index 09cef14..cea989b 100644 --- a/dapl/openib_cma/dapl_ib_dto.h +++ b/dapl/openib_cma/dapl_ib_dto.h @@ -51,7 +51,7 @@ #include "dapl_ib_util.h" #ifdef DAT_EXTENSIONS -#include <dat/dat_ib_extensions.h> +#include <dat2/dat_ib_extensions.h> #endif #define DEFAULT_DS_ENTRIES 8 diff --git a/dapl/udapl/dapl_init.c b/dapl/udapl/dapl_init.c index 94a4619..ce92f9f 100644 --- a/dapl/udapl/dapl_init.c +++ b/dapl/udapl/dapl_init.c @@ -37,7 +37,7 @@ **********************************************************************/ #include "dapl.h" -#include <dat/dat_registry.h> /* Provider API function prototypes */ +#include <dat2/dat_registry.h> /* Provider API function prototypes */ #include "dapl_hca_util.h" #include "dapl_init.h" #include "dapl_provider.h" diff --git a/dapl/udapl/linux/dapl_osd.h b/dapl/udapl/linux/dapl_osd.h index e932ae0..caf971f 100644 --- a/dapl/udapl/linux/dapl_osd.h +++ b/dapl/udapl/linux/dapl_osd.h @@ -54,7 +54,7 @@ #endif -#include <dat/udat.h> +#include <dat2/udat.h> #include <assert.h> #include <errno.h> #include <pthread.h> diff --git a/dat/common/dat_api.c b/dat/common/dat_api.c index a381f05..cb4105d 100755 --- a/dat/common/dat_api.c +++ b/dat/common/dat_api.c @@ -47,9 +47,10 @@ * $Id: dat_api.c 1326 2005-05-20 22:25:31Z jlentini $ **********************************************************************/ +#include <dat2/udat.h> +#include <dat2/dat_registry.h> #include "dat_osd.h" #include "dat_init.h" -#include <dat/dat_registry.h> /* * structure to deal with IA handles diff --git a/dat/common/dat_dr.c b/dat/common/dat_dr.c index 640d808..6d79829 100644 --- a/dat/common/dat_dr.c +++ b/dat/common/dat_dr.c @@ -37,9 +37,8 @@ * $Id: dat_dr.c,v 1.17 2005/03/24 05:58:27 jlentini Exp $ **********************************************************************/ - +#include <dat2/dat_platform_specific.h> #include "dat_dr.h" - #include "dat_dictionary.h" diff --git a/dat/common/dat_dr.h b/dat/common/dat_dr.h index 752042e..3012252 100644 --- a/dat/common/dat_dr.h +++ b/dat/common/dat_dr.h @@ -42,7 +42,7 @@ #include "dat_osd.h" -#include <dat/dat_registry.h> /* Provider API function prototypes */ +#include <dat2/dat_registry.h> /* Provider API function prototypes */ /********************************************************************* diff --git a/dat/common/dat_init.c b/dat/common/dat_init.c index 20b3746..56dd11d 100644 --- a/dat/common/dat_init.c +++ b/dat/common/dat_init.c @@ -38,8 +38,8 @@ * $Id: dat_init.c,v 1.18 2005/03/24 05:58:27 jlentini Exp $ **********************************************************************/ +#include <dat2/dat_platform_specific.h> #include "dat_init.h" - #include "dat_dr.h" #include "dat_osd.h" diff --git a/dat/common/dat_sr.h b/dat/common/dat_sr.h index efdc898..86be8a0 100644 --- a/dat/common/dat_sr.h +++ b/dat/common/dat_sr.h @@ -41,8 +41,8 @@ #define _DAT_SR_H_ -#include <dat/udat.h> -#include <dat/dat_registry.h> +#include <dat2/udat.h> +#include <dat2/dat_registry.h> #include "dat_osd.h" diff --git a/dat/common/dat_strerror.c b/dat/common/dat_strerror.c index 885a261..d14b60f 100644 --- a/dat/common/dat_strerror.c +++ b/dat/common/dat_strerror.c @@ -38,9 +38,9 @@ **********************************************************************/ #ifdef __KDAPL__ -#include <dat/kdat.h> +#include <dat2/kdat.h> #else /*__UDAPL__*/ -#include <dat/udat.h> +#include <dat2/udat.h> #endif /* __UDAPL__ */ /********************************************************************* diff --git a/dat/include/dat2/dat.h b/dat/include/dat2/dat.h index ed0ac1e..d4e4cea 100755 --- a/dat/include/dat2/dat.h +++ b/dat/include/dat2/dat.h @@ -56,7 +56,7 @@ #ifndef _DAT_H_ #define _DAT_H_ -#include <dat/dat_error.h> +#include <dat2/dat_error.h> #ifdef __cplusplus extern "C" diff --git a/dat/include/dat2/dat_platform_specific.h b/dat/include/dat2/dat_platform_specific.h index a058301..b46097e 100644 --- a/dat/include/dat2/dat_platform_specific.h +++ b/dat/include/dat2/dat_platform_specific.h @@ -90,7 +90,7 @@ * #include <stdio.h> * #include <sys/socket.h> * #include <netinet/in.h> - * #include <dat/udat.h> + * #include <dat2/udat.h> * * struct sockaddr_in6 addr; * DAT_IA_ADDRESS_PTR ia_addr; diff --git a/dat/include/dat2/dat_registry.h b/dat/include/dat2/dat_registry.h index 80c3801..2c0edcb 100644 --- a/dat/include/dat2/dat_registry.h +++ b/dat/include/dat2/dat_registry.h @@ -65,9 +65,9 @@ extern "C" #endif #if defined(_UDAT_H_) -#include <dat/udat_redirection.h> +#include <dat2/udat_redirection.h> #elif defined(_KDAT_H_) -#include <dat/kdat_redirection.h> +#include <dat2/kdat_redirection.h> #else #error Must include udat.h or kdat.h #endif diff --git a/dat/include/dat2/kdat.h b/dat/include/dat2/kdat.h index 848a22e..704c1cb 100644 --- a/dat/include/dat2/kdat.h +++ b/dat/include/dat2/kdat.h @@ -57,9 +57,9 @@ #ifndef _KDAT_H_ #define _KDAT_H_ -#include <dat/kdat_config.h> +#include <dat2/kdat_config.h> -#include <dat/dat_platform_specific.h> +#include <dat2/dat_platform_specific.h> #if 1 #define EXPORT_SYMBOL_NOVERS(sym) EXPORT_SYMBOL(sym) @@ -109,7 +109,7 @@ typedef enum dat_evd_param_mask typedef DAT_UINT64 DAT_PROVIDER_ATTR_MASK; -#include <dat/dat.h> +#include <dat2/dat.h> typedef DAT_CONTEXT DAT_LMR_COOKIE; @@ -313,7 +313,7 @@ struct dat_ia_attr /* General Provider attributes. kdat specific. */ -#include <dat/kdat_vendor_specific.h> +#include <dat2/kdat_vendor_specific.h> /* Provider should support merging of all event stream types. Provider * attribute specify support for merging different event stream types. diff --git a/dat/include/dat2/kdat_redirection.h b/dat/include/dat2/kdat_redirection.h index 038acb3..d7e5628 100644 --- a/dat/include/dat2/kdat_redirection.h +++ b/dat/include/dat2/kdat_redirection.h @@ -220,7 +220,7 @@ typedef DAT_RETURN (*DAT_IA_RESERVED_LMR_FUNC) ( OUT DAT_LMR_HANDLE *, /* lmr_handle */ OUT DAT_LMR_CONTEXT * ); /* lmr_context */ -#include <dat/dat_redirection.h> +#include <dat2/dat_redirection.h> struct dat_provider { diff --git a/dat/include/dat2/kdat_vendor_specific.h b/dat/include/dat2/kdat_vendor_specific.h index fe8e873..3a89d19 100644 --- a/dat/include/dat2/kdat_vendor_specific.h +++ b/dat/include/dat2/kdat_vendor_specific.h @@ -50,7 +50,7 @@ #ifndef _KDAT_VENDOR_SPECIFIC_H_ #define _KDAT_VENDOR_SPECIFIC_H_ -#include <dat/dat_vendor_specific.h> +#include <dat2/dat_vendor_specific.h> /* Vendor-specific extensions */ diff --git a/dat/include/dat2/udat.h b/dat/include/dat2/udat.h index a9bb2ac..4ea491e 100755 --- a/dat/include/dat2/udat.h +++ b/dat/include/dat2/udat.h @@ -56,9 +56,8 @@ #ifndef _UDAT_H_ #define _UDAT_H_ -#include <dat/udat_config.h> - -#include <dat/dat_platform_specific.h> +#include <dat2/udat_config.h> +#include <dat2/dat_platform_specific.h> #ifdef __cplusplus extern "C" @@ -139,7 +138,7 @@ enum dat_lmr_param_mask DAT_LMR_FIELD_ALL = 0x7FF }; -#include <dat/dat.h> +#include <dat2/dat.h> typedef DAT_HANDLE DAT_CNO_HANDLE; @@ -323,7 +322,7 @@ typedef enum dat_pz_support DAT_PZ_SHAREABLE } DAT_PZ_SUPPORT; -#include <dat/udat_vendor_specific.h> +#include <dat2/udat_vendor_specific.h> /* Provider should support merging of all event stream types. Provider * attribute specify support for merging different event stream types. diff --git a/dat/include/dat2/udat_redirection.h b/dat/include/dat2/udat_redirection.h index d73f9bd..f180417 100755 --- a/dat/include/dat2/udat_redirection.h +++ b/dat/include/dat2/udat_redirection.h @@ -237,7 +237,7 @@ typedef DAT_RETURN (DAT_API *DAT_EVD_CLEAR_UNWAITABLE_FUNC) ( IN DAT_EVD_HANDLE); /* evd_handle */ -#include <dat/dat_redirection.h> +#include <dat2/dat_redirection.h> struct dat_provider { diff --git a/dat/include/dat2/udat_vendor_specific.h b/dat/include/dat2/udat_vendor_specific.h index 2a8bd94..dd955f8 100644 --- a/dat/include/dat2/udat_vendor_specific.h +++ b/dat/include/dat2/udat_vendor_specific.h @@ -50,7 +50,7 @@ #ifndef _UDAT_VENDOR_SPECIFIC_H_ #define _UDAT_VENDOR_SPECIFIC_H_ -#include <dat/dat_vendor_specific.h> +#include <dat2/dat_vendor_specific.h> /* Vendor-specific extensions */ diff --git a/dat/udat/udat.c b/dat/udat/udat.c index 2bf5678..bb1c580 100755 --- a/dat/udat/udat.c +++ b/dat/udat/udat.c @@ -37,8 +37,8 @@ * $Id: udat.c,v 1.22 2005/03/24 05:58:35 jlentini Exp $ **********************************************************************/ -#include <dat/udat.h> -#include <dat/dat_registry.h> /* Provider API function prototypes */ +#include <dat2/udat.h> +#include <dat2/dat_registry.h> /* Provider API function prototypes */ #include "dat_dr.h" #include "dat_init.h" diff --git a/dat/udat/udat_api.c b/dat/udat/udat_api.c index 9a9ea4b..a77d42b 100644 --- a/dat/udat/udat_api.c +++ b/dat/udat/udat_api.c @@ -46,8 +46,9 @@ * $Id: udat_api.c 1301 2005-03-24 05:58:55Z jlentini $ **********************************************************************/ +#include <dat2/udat.h> +#include <dat2/dat_registry.h> #include "dat_osd.h" -#include <dat/dat_registry.h> #include "dat_init.h" #define UDAT_IS_BAD_HANDLE(h) ( NULL == (p) ) diff --git a/dat/udat/udat_sr_parser.c b/dat/udat/udat_sr_parser.c index 84b5b9d..5761e3b 100644 --- a/dat/udat/udat_sr_parser.c +++ b/dat/udat/udat_sr_parser.c @@ -37,7 +37,7 @@ * $Id: udat_sr_parser.c,v 1.6 2005/03/24 05:58:36 jlentini Exp $ **********************************************************************/ - +#include <dat2/udat.h> #include "udat_sr_parser.h" #include "dat_sr.h" diff --git a/test/dapltest/Makefile.am b/test/dapltest/Makefile.am index 18660c8..bf3fc2b 100755 --- a/test/dapltest/Makefile.am +++ b/test/dapltest/Makefile.am @@ -8,7 +8,7 @@ dapltest_CFLAGS = $(XFLAGS) INCLUDES = -I include \ -I mdep/linux \ - -I $(srcdir)/../../dat/include + -I $(srcdir)/../../dat2/include bin_PROGRAMS = dapltest diff --git a/test/dapltest/include/dapl_proto.h b/test/dapltest/include/dapl_proto.h index 98785eb..9de42e2 100644 --- a/test/dapltest/include/dapl_proto.h +++ b/test/dapltest/include/dapl_proto.h @@ -32,9 +32,9 @@ #define __DAPL_PROTO_H__ #ifdef __KERNEL__ -#include <dat/kdat.h> +#include <dat2/kdat.h> #else -#include <dat/udat.h> +#include <dat2/udat.h> #include <ctype.h> #include <stdlib.h> diff --git a/test/dapltest/mdep/linux/dapl_mdep_kernel.h b/test/dapltest/mdep/linux/dapl_mdep_kernel.h index 13a4d39..c0734e9 100644 --- a/test/dapltest/mdep/linux/dapl_mdep_kernel.h +++ b/test/dapltest/mdep/linux/dapl_mdep_kernel.h @@ -40,7 +40,7 @@ # include <asm/atomic.h> # include <linux/delay.h> # include <linux/wait.h> -# include <dat/kdat.h> +# include <dat2/kdat.h> # include "kdapl_ioctl.h" #ifndef UPCALL_FROM_IRQ #include <linux/interrupt.h> /* for spin_lock_bh */ diff --git a/test/dtest/Makefile.am b/test/dtest/Makefile.am index aabd026..f4b86ea 100755 --- a/test/dtest/Makefile.am +++ b/test/dtest/Makefile.am @@ -9,6 +9,6 @@ dtestx_CFLAGS = -DDAT_EXTENSIONS dtestx_LDADD = $(srcdir)/../../dat/udat/libdat2.la endif -INCLUDES = -I $(srcdir)/../../dat/include +INCLUDES = -I $(srcdir)/../../dat2/include dtest_LDADD = $(srcdir)/../../dat/udat/libdat2.la diff --git a/test/dtest/dtest.c b/test/dtest/dtest.c index 314dcdf..57b5790 100755 --- a/test/dtest/dtest.c +++ b/test/dtest/dtest.c @@ -115,7 +115,7 @@ #define MAX_PROCS 1000 /* Header files needed for DAT/uDAPL */ -#include "dat/udat.h" +#include "dat2/udat.h" /* definitions */ #define SERVER_CONN_QUAL 45248 diff --git a/test/dtest/dtestx.c b/test/dtest/dtestx.c index 568b09a..58fa85f 100755 --- a/test/dtest/dtestx.c +++ b/test/dtest/dtestx.c @@ -59,8 +59,8 @@ #endif -#include "dat/udat.h" -#include "dat/dat_ib_extensions.h" +#include "dat2/udat.h" +#include "dat2/dat_ib_extensions.h" int disconnect_ep(void); _______________________________________________ ewg mailing list ewg@lists.openfabrics.org http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg