[SCM] opencore-amr packaging branch, master, updated. upstream/0.1.2-10-g7bf1e45

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a413c25dccf913092cdd98d11de8e462055bb34c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 18 02:52:03 2009 -0400

    Rename library and change include directory. Set version to start at 0.1.0.
    
    Library will be named libopencore-amr*b. Include direcotry is opencore-amr*b.

diff --git a/amrnb/Makefile b/amrnb/Makefile
index f674150..d713d91 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -43,8 +43,8 @@ COMMON_OBJS := $(patsubst %,$(COMMON_SRC_DIR)/%, $(COMMON_OBJS))
 OBJS = wrapper.o $(DEC_OBJS) $(ENC_OBJS) $(COMMON_OBJS)
 
 #Versioning
-MAJOR = 4
-MINOR = 0
+MAJOR = 0
+MINOR = 1
 REVISION = 0
 
 ifeq ($(shell uname), Darwin)
@@ -53,11 +53,11 @@ ifeq ($(shell uname), Darwin)
 else
     SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
     SHLIB_FLAGS = -shared
-    SONAME = libamrnb.so.$(MAJOR)
+    SONAME = libopencore-amrnb.so.$(MAJOR)
 endif
-SHLIB = libamrnb.$(SHLIB_EXT)
+SHLIB = libopencore-amrnb.$(SHLIB_EXT)
 
-all: libamrnb.a $(SHLIB)
+all: libopencore-amrnb.a $(SHLIB)
 
 $(SHLIB): $(OBJS)
 ifeq ($(shell uname), Darwin)
@@ -66,21 +66,21 @@ else
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
 endif
 
-libamrnb.a: $(OBJS)
+libopencore-amrnb.a: $(OBJS)
 	ar rcs $@ $+
 
-install: libamrnb.a $(SHLIB)
+install: libopencore-amrnb.a $(SHLIB)
 	install -d $(DESTDIR)$(PREFIX)/lib
-	install libamrnb.a $(DESTDIR)$(PREFIX)/lib
+	install libopencore-amrnb.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
+	ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrnb.so
 endif
-	install -d $(DESTDIR)$(PREFIX)/include/amrnb
-	install interf_dec.h $(DESTDIR)$(PREFIX)/include/amrnb
-	install interf_enc.h $(DESTDIR)$(PREFIX)/include/amrnb
+	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrnb
+	install interf_dec.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
+	install interf_enc.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
 
 clean:
-	rm -f $(SHLIB) libamrnb.a *.o $(OBJS)
+	rm -f $(SHLIB) libopencore-amrnb.a *.o $(OBJS)
 
diff --git a/amrwb/Makefile b/amrwb/Makefile
index e57728c..45c763e 100644
--- a/amrwb/Makefile
+++ b/amrwb/Makefile
@@ -29,8 +29,8 @@ DEC_OBJS := $(patsubst %,$(DEC_SRC_DIR)/%, $(DEC_OBJS))
 OBJS = wrapper.o $(DEC_OBJS)
 
 #Versioning
-MAJOR = 4
-MINOR = 0
+MAJOR = 0
+MINOR = 1
 REVISION = 0
 
 ifeq ($(shell uname), Darwin)
@@ -39,11 +39,11 @@ ifeq ($(shell uname), Darwin)
 else
     SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
     SHLIB_FLAGS = -shared
-    SONAME = libamrwb.so.$(MAJOR)
+    SONAME = libopencore-amrwb.so.$(MAJOR)
 endif
-SHLIB = libamrwb.$(SHLIB_EXT)
+SHLIB = libopencore-amrwb.$(SHLIB_EXT)
 
-all: libamrwb.a $(SHLIB)
+all: libopencore-amrwb.a $(SHLIB)
 
 $(SHLIB): $(OBJS)
 ifeq ($(shell uname), Darwin)
@@ -52,21 +52,21 @@ else
 	$(CXX) $(SHLIB_FLAGS) -o $@ $+ -Wl,-soname,$(SONAME) $(LDFLAGS)
 endif
 
-libamrwb.a: $(OBJS)
+libopencore-amrwb.a: $(OBJS)
 	ar rcs $@ $+
 
-install: libamrwb.a $(SHLIB)
+install: libopencore-amrwb.a $(SHLIB)
 	install -d $(DESTDIR)$(PREFIX)/lib
-	install libamrwb.a $(DESTDIR)$(PREFIX)/lib
+	install libopencore-amrwb.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/libamrwb.so
+	ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/libopencore-amrwb.so
 endif
-	install -d $(DESTDIR)$(PREFIX)/include/amrwb
-	install dec_if.h $(DESTDIR)$(PREFIX)/include/amrwb
-	install if_rom.h $(DESTDIR)$(PREFIX)/include/amrwb
+	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrwb
+	install dec_if.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb
+	install if_rom.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb
 
 clean:
-	rm -f $(SHLIB) libamrwb.a *.o $(OBJS)
+	rm -f $(SHLIB) libopencore-amrwb.a *.o $(OBJS)
 

-- 
opencore-amr packaging