[SCM] Algorithms for models in fundamental astronomy branch, debian, updated. a594eaf6d4cc4612180e9abbc35a9507c8c57223
Ole Streicher
debian at liska.ath.cx
Fri Feb 24 09:54:35 UTC 2012
The following commit has been merged in the debian branch:
commit a594eaf6d4cc4612180e9abbc35a9507c8c57223
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Feb 24 10:53:45 2012 +0100
Remove SHLIB_SONAME makefile variable
diff --git a/debian/patches/create_shared_lib.patch b/debian/patches/create_shared_lib.patch
index 76965db..0ef3272 100644
--- a/debian/patches/create_shared_lib.patch
+++ b/debian/patches/create_shared_lib.patch
@@ -11,14 +11,13 @@ Description: Create a shared library
CFLAGX = -pedantic -Wall -W -O
#----YOU SHOULDN'T HAVE TO MODIFY ANYTHING BELOW THIS LINE---------
-@@ -80,6 +80,12 @@ INSTALL_DIRS = $(SOFA_LIB_DIR) $(SOFA_INC_DIR)
+@@ -80,6 +80,11 @@ INSTALL_DIRS = $(SOFA_LIB_DIR) $(SOFA_INC_DIR)
SOFA_LIB_NAME = libsofa_c.a
SOFA_LIB = $(SOFA_LIB_DIR)$(SOFA_LIB_NAME)
+# Name the SOFA/C library in its source and target locations.
+
-+SOFA_SHLIB_NAME = libsofa_c.so.0.0
-+SOFA_SHLIB_SONAME = libsofa_c.so.0
++SOFA_SHLIB_NAME = libsofa_c.so
+SOFA_SHLIB = $(SOFA_LIB_DIR)$(SOFA_SHLIB_NAME)
+
# Name the SOFA/C testbed in its source and target locations.
@@ -31,14 +30,14 @@ Description: Create a shared library
-install $(SOFA_LIB) : $(INSTALL_DIRS) $(SOFA_LIB_NAME) $(SOFA_INC)
+install $(SOFA_LIB) : $(INSTALL_DIRS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME) $(SOFA_INC)
cp $(SOFA_LIB_NAME) $(SOFA_LIB_DIR)
-+ cp $(SOFA_SHLIB_NAME) $(SOFA_LIB_DIR)
-+ ln -s $(SOFA_SHLIB_NAME) $(SOFA_LIB_DIR)/$(SOFA_SHLIB_SONAME)
-+ ln -s $(SOFA_SHLIB_SONAME) $(SOFA_LIB_DIR)/libsofa_c.so
++ cp $(SOFA_SHLIB_NAME).0.0 $(SOFA_LIB_DIR)
++ ln -s $(SOFA_SHLIB_NAME).0.0 $(SOFA_SHLIB).0
++ ln -s $(SOFA_SHLIB_NAME).0 $(SOFA_SHLIB)
# Deinstall the library and header files.
deinstall:
- rm -f $(SOFA_LIB) $(SOFA_INC)
-+ rm -f $(SOFA_LIB) $(SOFA_SHLIB) $(SOFA_INC)
++ rm -f $(SOFA_LIB) $(SOFA_SHLIB)* $(SOFA_INC)
# Test the build.
check: $(SOFA_TEST_NAME) $(SOFA_INC_NAMES) $(SOFA_LIB_NAME)
@@ -58,7 +57,7 @@ Description: Create a shared library
# Clean up and deinstall.
distclean:
- rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_INC) $(SOFA_LIB)
-+ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME) $(SOFA_INC) $(SOFA_LIB)
++ rm -f $(SOFA_OBS) $(SOFA_LIB_NAME) $(SOFA_SHLIB_NAME)* $(SOFA_INC) $(SOFA_LIB) $(SOFA_SHLIB)*
# Create the installation directories if not already present.
$(INSTALL_DIRS):
@@ -67,7 +66,7 @@ Description: Create a shared library
ar ru $(SOFA_LIB_NAME) $?
+$(SOFA_SHLIB_NAME): $(SOFA_OBS)
-+ gcc -shared -Wl,-soname,$(SOFA_SHLIB_SONAME) -o $(SOFA_SHLIB_NAME) $? -lm
++ gcc -shared -Wl,-soname,$(SOFA_SHLIB_NAME).0 -o $(SOFA_SHLIB_NAME).0.0 $? -lm
+
# Install the header files.
$(SOFA_INC) : $(INSTALL_DIRS) $(SOFA_INC_NAMES)
--
Algorithms for models in fundamental astronomy
More information about the debian-science-commits
mailing list