Update autotool files for 1.0-rc1 release.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/Makefile.am b/Makefile.am
index 1ad82bf8d9e0ff36e26d0eaae2be6c7d297d1632..ae0cc92976c200a99d4d91f77a20812d1a5d1f9b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,19 @@
-# $Id$
 INCLUDES = -I$(srcdir)/include
 
-AM_CFLAGS = -g -Wall -D_GNU_SOURCE
-
-ibcmlibdir = $(libdir)
+lib_LTLIBRARIES = src/libibcm.la
 
-ibcmlib_LTLIBRARIES = src/libibcm.la
+AM_CFLAGS = -g -Wall -D_GNU_SOURCE
 
-src_ibcm_la_CFLAGS = -g -Wall -D_GNU_SOURCE
+src_libibcm_la_CFLAGS = $(AM_CFLAGS)
 
-if HAVE_LD_VERSION_SCRIPT
-    ibcm_version_script = -Wl,--version-script=$(srcdir)/src/libibcm.map
-else
-    ibcm_version_script =
-endif
+libibcm_version_script = @LIBIBCM_VERSION_SCRIPT@
 
 src_libibcm_la_SOURCES = src/cm.c
-src_libibcm_la_LDFLAGS = -avoid-version $(ucm_version_script)
+src_libibcm_la_LDFLAGS = -version-info 1 -export-dynamic \
+                        $(libibcm_version_script)
+src_libibcm_la_DEPENDENCIES = $(srcdir)/src/libibcm.map
 
+# Sample program requires use if librdmacm.
 #bin_PROGRAMS = examples/ucmpost
 #examples_ucmpost_SOURCES = examples/cmpost.c
 #examples_ucmpost_LDADD = $(top_builddir)/src/libibcm.la 
@@ -27,10 +23,8 @@ libibcmincludedir = $(includedir)/infiniband
 libibcminclude_HEADERS = include/infiniband/cm_abi.h \
                         include/infiniband/cm.h
 
-EXTRA_DIST = include/infiniband/cm_abi.h \
-            include/infiniband/cm.h \
-            src/libibcm.map \
-            libibcm.spec.in
+EXTRA_DIST = include/infiniband/cm_abi.h include/infiniband/cm.h \
+            src/libibcm.map libibcm.spec.in
 
 dist-hook: libibcm.spec
        cp libibcm.spec $(distdir)

diff --git a/configure.in b/configure.in
index 425405cce5e4605a9b74174377ff1b4246f1a89a..e6bc8cfae37d4d8dd0d1f5f0d1a49eabe628a174 100644 (file)
--- 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(libibcm, 0.9.0, openib-general@openib.org)
+AC_INIT(libibcm, 1.0-rc1, openib-general@openib.org)
 AC_CONFIG_SRCDIR([src/cm.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libibcm, 0.9.0)
-AC_DISABLE_STATIC
+AM_INIT_AUTOMAKE(libibcm, 1.0-rc1)
+
 AM_PROG_LIBTOOL
 
 AC_ARG_ENABLE(libcheck, [  --disable-libcheck      do not test for presence of ib libraries],
@@ -25,25 +25,22 @@ AC_CHECK_SIZEOF(long)
 dnl Checks for libraries
 if test "$disable_libcheck" != "yes"
 then
-AC_CHECK_LIB(sysfs, sysfs_open_class, [],
-    AC_MSG_ERROR([sysfs_open_class() not found.  libibcm requires libsysfs.]))
 AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],
     AC_MSG_ERROR([ibv_get_device_list() not found.  libibcm requires libibverbs.]))
+#Need librdmacm for cmpost test program.
 #AC_CHECK_LIB(rdmacm, rdma_create_id, [],
 #    AC_MSG_ERROR([rdma_create_id() not found.  ucmpost requires librdmacm.]))
 fi
 
 dnl Checks for header files.
+AC_HEADER_STDC
 if test "$disable_libcheck" != "yes"
 then
-AC_CHECK_HEADER(sysfs/libsysfs.h, [],
-    AC_MSG_ERROR([<sysfs/libsysfs.h> not found.  libibcm requires libsysfs.]))
 AC_CHECK_HEADER(infiniband/verbs.h, [],
     AC_MSG_ERROR([<infiniband/verbs.h> not found.  Is libibverbs installed?]))
 AC_CHECK_HEADER(infiniband/marshall.h, [],
     AC_MSG_ERROR([<infiniband/marshall.h> 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/libibcm.spec.in b/libibcm.spec.in
index 4784b87453117efe3df17e806f1ff3248279364b..5a42a3b6d491b9ba1672d964ade5fbc1b7bca5ca 100644 (file)
--- a/libibcm.spec.in
+++ b/libibcm.spec.in
@@ -1,56 +1,53 @@
-# $Id: $
-
 %define ver @VERSION@
-%define RELEASE 1
-%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
 
-Summary: Userspace InfiniBand Connection Manager.
 Name: libibcm
-Version: %ver
-Release: %rel%{?dist}
-License: GPL/BSD
+Version: 1.0
+Release: -rc1%{?dist}
+Summary: Userspace InfiniBand Communication Manager.
+
 Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
-Url: http://openib.org/
-BuildRequires: libibat-devel
+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, libibcm provides a userspace
-InfiniBand Connection Managment API.
+libibcm provides a userspace InfiniBand Communication Managment library.
 
 %package devel
 Summary: Development files for the libibcm library
 Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release} libibat-devel
+Requires: %{name} = %{version}-%{release} %{_includedir}/infiniband/verbs.h
 
 %description devel
 Development files for the libibcm 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 libibcm.so libibcm.so.%{ver}
-ln -s libibcm.so.%{ver} libibcm.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_libdir}/libibcm*.so.*
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS COPYING ChangeLog README
 
 %files devel
-%defattr(-,root,root)
-%{_libdir}/libibcm.so
-%{_includedir}/infiniband/*.h
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so
+%{_libdir}/*.a
+%{_includedir}/*

diff --git a/src/libibcm.map b/src/libibcm.map
index 4c8ba105194a2c9e1a214ca943f79146e3974812..3d83e481a6bb75a5876f458b20e0d4f767b396da 100644 (file)
--- a/src/libibcm.map
+++ b/src/libibcm.map
@@ -1,4 +1,4 @@
-IBCM_4.0 {
+IBCM_1.0 {
        global:
                ib_cm_open_device;
                ib_cm_close_device;