[emos] 24/37: WIP: shlib wasn't installed properly

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository emos.

commit 2881af0f0af23b0572cd97489f2fdfa365620f9c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue May 26 04:14:07 2015 +0100

    WIP: shlib wasn't installed properly
---
 debian/build-shlib          | 23 -----------------------
 debian/libemos0d.install.in |  2 --
 debian/rules                |  7 ++++++-
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/build-shlib b/debian/build-shlib
deleted file mode 100644
index 527d477..0000000
--- a/debian/build-shlib
+++ /dev/null
@@ -1,23 +0,0 @@
-# Makefile to build the shared library.
-# Assumes R64 is passed on cmdline
-# This should be merged into upstream.
-
-SONAME=libemos$(R64).so.0d
-# SHLIBFLAGS= -Wl,-O1 -Wl,--version-script,emos.1.0.0.ver -Wl,-soname,$(SONAME)
-SHLIBFLAGS= -Wl,-O1 -Wl,-soname,$(SONAME) 
-LIBS= -lgrib_api -lgfortran  -lm
-
-# Hardening. -fPIE not working.
-# LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS:=-Wl,-z,relro -Wl,-z,now
-
-ALL_OBJS=bufrdc/*.o crexdc/*.o fft/*.o gribex/*.o interpolation/*.o pbio/*.o grib_api_merging/*.o
-DUP_OBJS:=interpolation/fft99.o interpolation/qpassm.o interpolation/set99.o interpolation/rpassm.o
-OBJS=$(filter-out $(DUP_OBJS), $(wildcard $(ALL_OBJS)))
-
-
-# Compile into the shlib all but certain duplicated object files
-build: 
-	$(CC) -shared  -o debian/$(SONAME) $(LDFLAGS) $(SHLIBFLAGS) $(OBJS) -Wl,--as-needed $(LIBS)
-
-.PHONY: clean build
diff --git a/debian/libemos0d.install.in b/debian/libemos0d.install.in
deleted file mode 100644
index e00bbff..0000000
--- a/debian/libemos0d.install.in
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-*/lib/libemos.so	/usr/lib/@ARCH@/libemos.so.0d
-obj-*/lib/libemosR64.so	/usr/lib/@ARCH@/libemosR64.so.0d
diff --git a/debian/rules b/debian/rules
index d12922a..259c068 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,8 @@ export DH_VERBOSE=1
 
 DESTDIR:=$(shell pwd)/debian/tmp
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-AUTOGENERATED:= libemos-dev.install libemos0d.install libemos-dev.links
+SHLIB_DIR:= debian/libemos0d/usr/lib/${DEB_HOST_MULTIARCH}
+AUTOGENERATED:= libemos-dev.install libemos-dev.links
 
 override_dh_auto_clean:
 	find bufrtables -type l -delete
@@ -30,4 +31,8 @@ override_dh_auto_install:
 		done
 	cd obj-* && cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR} -P cmake_install.cmake
 	cd ${DESTDIR}/share/libemos/tables/bufrtables && sh -x ./links.sh
+	# Need to rename file, 
+	mkdir -p ${SHLIB_DIR}
+	cp obj-*/lib/libemos.so		${SHLIB_DIR}/libemos.so.0d
+	cp obj-*/lib/libemosR64.so	${SHLIB_DIR}/libemosR64.so.0d
 	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/emos.git