[SCM] opencore-amr packaging branch, master, updated. debian/0.1-14-g96ae78e

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Fri May 15 06:14:19 UTC 2009


The following commit has been merged in the master branch:
commit 51036008c129df5ae371bf80d2590a78130b9829
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri May 15 02:12:23 2009 -0400

    Creating versioning scheme for libamrnb shared library.
    
    We set a soname for the shared library and also provide the symbolic links.

diff --git a/amrnb/Makefile b/amrnb/Makefile
index be2f8a6..f674150 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -42,19 +42,29 @@ COMMON_OBJS := $(patsubst %,$(COMMON_SRC_DIR)/%, $(COMMON_OBJS))
 
 OBJS = wrapper.o $(DEC_OBJS) $(ENC_OBJS) $(COMMON_OBJS)
 
+#Versioning
+MAJOR = 4
+MINOR = 0
+REVISION = 0
+
 ifeq ($(shell uname), Darwin)
     SHLIB_EXT = dylib
     SHLIB_FLAGS = -dynamiclib
 else
-    SHLIB_EXT = so
+    SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
     SHLIB_FLAGS = -shared
+    SONAME = libamrnb.so.$(MAJOR)
 endif
 SHLIB = libamrnb.$(SHLIB_EXT)
 
 all: libamrnb.a $(SHLIB)
 
 $(SHLIB): $(OBJS)
+ifeq ($(shell uname), Darwin)
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ $(LDFLAGS)
+else
+	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
+endif
 
 libamrnb.a: $(OBJS)
 	ar rcs $@ $+
@@ -63,6 +73,10 @@ install: libamrnb.a $(SHLIB)
 	install -d $(DESTDIR)$(PREFIX)/lib
 	install libamrnb.a $(DESTDIR)$(PREFIX)/lib
 	install $(SHLIB) $(DESTDIR)$(PREFIX)/lib
+ifneq ($(shell uname), Darwin)
+	ln -s $(SHLIB) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
+	ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libamrnb.so
+endif
 	install -d $(DESTDIR)$(PREFIX)/include/amrnb
 	install interf_dec.h $(DESTDIR)$(PREFIX)/include/amrnb
 	install interf_enc.h $(DESTDIR)$(PREFIX)/include/amrnb
diff --git a/debian/libopencore-amr-nb-dev.install b/debian/libopencore-amr-nb-dev.install
index 529743b..93a78e7 100644
--- a/debian/libopencore-amr-nb-dev.install
+++ b/debian/libopencore-amr-nb-dev.install
@@ -1,2 +1,3 @@
 usr/include/amrnb/*
 usr/lib/libamrnb.a
+usr/lib/libamrnb.so
diff --git a/debian/libopencore-amr-nb.install b/debian/libopencore-amr-nb.install
index c3fc9ba..0a157e6 100644
--- a/debian/libopencore-amr-nb.install
+++ b/debian/libopencore-amr-nb.install
@@ -1 +1 @@
-usr/lib/libamrnb.so
+usr/lib/libamrnb.so.*

-- 
opencore-amr packaging



More information about the pkg-multimedia-commits mailing list