From 3c89efa58717a5663af1347c8d1127157c8c5b67 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 23 Feb 2007 13:16:02 -0800 Subject: [PATCH] Update autotools info for 1.0-rc1 release. Signed-off-by: Sean Hefty --- Makefile.am | 25 ++++++++------------ configure.in | 8 +++---- librdmacm.spec.in | 59 ++++++++++++++++++++++------------------------- 3 files changed, 40 insertions(+), 52 deletions(-) diff --git a/Makefile.am b/Makefile.am index d4caf796..57dc0b37 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,22 +1,17 @@ -# $Id: Makefile.am 3373 2005-09-12 16:34:20Z roland $ INCLUDES = -I$(srcdir)/include -AM_CFLAGS = -g -Wall -D_GNU_SOURCE - -rdmacmlibdir = $(libdir) +lib_LTLIBRARIES = src/librdmacm.la -rdmacmlib_LTLIBRARIES = src/librdmacm.la +AM_CFLAGS = -g -Wall -D_GNU_SOURCE -src_rdmacm_la_CFLAGS = -g -Wall -D_GNU_SOURCE +src_librdmacm_la_CFLAGS = $(AM_CFLAGS) -if HAVE_LD_VERSION_SCRIPT - rdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map -else - rdmacm_version_script = -endif +librdmacm_version_script = @LIBRDMACM_VERSION_SCRIPT@ src_librdmacm_la_SOURCES = src/cma.c -src_librdmacm_la_LDFLAGS = -avoid-version $(rdmacm_version_script) +src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \ + $(librdmacm_version_script) +src_librdmacm_la_DEPENDENCIES = $(srcdir)/src/librdmacm.map bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey examples_ucmatose_SOURCES = examples/cmatose.c @@ -33,10 +28,8 @@ librdmacmincludedir = $(includedir)/rdma librdmacminclude_HEADERS = include/rdma/rdma_cma_abi.h \ include/rdma/rdma_cma.h -EXTRA_DIST = include/rdma/rdma_cma_abi.h \ - include/rdma/rdma_cma.h \ - src/librdmacm.map \ - librdmacm.spec.in +EXTRA_DIST = include/rdma/rdma_cma_abi.h include/rdma/rdma_cma.h \ + src/librdmacm.map librdmacm.spec.in dist-hook: librdmacm.spec cp librdmacm.spec $(distdir) diff --git a/configure.in b/configure.in index 4417feae..ca6807ab 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,12 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(librdmacm, 0.9.0, openib-general@openib.org) +AC_INIT(librdmacm, 1.0-rc1, openib-general@openib.org) AC_CONFIG_SRCDIR([src/cma.c]) AC_CONFIG_AUX_DIR(config) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(librdmacm, 0.9.0) -AC_DISABLE_STATIC +AM_INIT_AUTOMAKE(librdmacm, 1.0-rc1) + AM_PROG_LIBTOOL AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presence of ib libraries], @@ -30,12 +30,12 @@ AC_CHECK_LIB(ibverbs, ibv_get_device_list, [], fi dnl Checks for header files. +AC_HEADER_STDC if test "$disable_libcheck" != "yes" then AC_CHECK_HEADER(infiniband/verbs.h, [], AC_MSG_ERROR([ not found. Is libibverbs installed?])) fi -AC_HEADER_STDC AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script, if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then diff --git a/librdmacm.spec.in b/librdmacm.spec.in index d28f18a6..dc0fae46 100644 --- a/librdmacm.spec.in +++ b/librdmacm.spec.in @@ -1,70 +1,65 @@ -# $Id: $ - %define ver @VERSION@ -%define RELEASE 1 -%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} -Summary: Userspace RDMA Connection Manager. Name: librdmacm -Version: %ver -Release: %rel%{?dist} -License: GPL/BSD +Version: 1.0 +Release: -rc1%{?dist} +Summary: Userspace RDMA Connection Manager. + Group: System Environment/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: http://openib.org/downloads/%{name}-%{version}.tar.gz -Url: http://openib.org/ +License: GPL/BSD +Url: http://www.openfabrics.org/ +Source: http://www.openfabrics.org/downloads/%{name}-%{version}-%{release}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Along with the OpenIB kernel drivers, librdmacm provides a userspace -RDMA Connection Managment API. +librdmacm provides a userspace RDMA Communication Managment API. %package devel Summary: Development files for the librdmacm library Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %{_includedir}/infiniband/verbs.h %description devel Development files for the librdmacm library. %package utils -Summary: Utilities for the librdmacm library -Group: System Environment/Base +Summary: Examples for the librdmacm library +Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} %description utils -Utilities for the librdmacm library. +Example test programs for the librdmacm library. %prep -%setup -q +%setup -q -n %{name}-%{ver} %build %configure -make +make %{?_smp_mflags} %install -make DESTDIR=${RPM_BUILD_ROOT} install +rm -rf $RPM_BUILD_ROOT +%makeinstall # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -cd $RPM_BUILD_ROOT%{_libdir} -mv librdmacm.so librdmacm.so.%{ver} -ln -s librdmacm.so.%{ver} librdmacm.so %clean rm -rf $RPM_BUILD_ROOT +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + %files -%defattr(-,root,root) +%defattr(-,root,root,-) %{_libdir}/librdmacm*.so.* -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING ChangeLog README %files devel %defattr(-,root,root) -%{_libdir}/librdmacm.so -%{_includedir}/rdma/*.h +%{_libdir}/lib*.so +%{_libdir}/*.a +%{_includedir}/* %files utils -%defattr(-,root,root) -%{_bindir}/rping -%{_bindir}/ucmatose -%{_bindir}/udaddy -%{_bindir}/mckey +%defattr(-,root,root,-) +%{_bindir}/* -- 2.41.0