[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 424d6c44fc079c42783d3cc37f2f717c33721e8d
Author: LRN <lrn1986 at gmail.com>
Date:   Thu Jul 30 03:17:18 2009 +0400

    Makefile fixes for MinGW/MSys

diff --git a/amrnb/Makefile b/amrnb/Makefile
index 2ebf8c9..7f61016 100644
--- a/amrnb/Makefile
+++ b/amrnb/Makefile
@@ -3,6 +3,7 @@
 OC_BASE = ../opencore
 AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
 LIBDIR=lib
+BINDIR=bin
 
 # To compile as C instead of C++, define BUILD_AS_C
 ifneq (, $(BUILD_AS_C))
@@ -60,9 +61,15 @@ ifeq ($(shell uname), Darwin)
     SHLIB_EXT = dylib
     SHLIB_FLAGS = -dynamiclib
 else
-    SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
-    SHLIB_FLAGS = -shared
-    SONAME = libopencore-amrnb.so.$(MAJOR)
+    ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT)
+        SHLIB_EXT = $(MAJOR).$(MINOR).$(REVISION).dll
+        SHLIB_FLAGS = -shared
+        SONAME = libopencore-amrnb-$(MAJOR).dll
+    else
+        SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
+        SHLIB_FLAGS = -shared
+        SONAME = libopencore-amrnb.so.$(MAJOR)
+    endif
 endif
 SHLIB = libopencore-amrnb.$(SHLIB_EXT)
 
@@ -87,11 +94,21 @@ libopencore-amrnb.a: $(OBJS)
 install: libopencore-amrnb.a $(SHLIB)
 	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
 	install -m 644 libopencore-amrnb.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT)
+	install -d $(DESTDIR)$(PREFIX)/$(BINDIR)
+	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)
+else
 	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+endif
 ifneq ($(shell uname), Darwin)
+ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT)
+	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME)
+	ln -sf $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/libopencore-amrnb.dll
+else
 	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME)
 	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrnb.so
 endif
+endif
 	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrnb
 	install -m 644 interf_dec.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
 	install -m 644 interf_enc.h $(DESTDIR)$(PREFIX)/include/opencore-amrnb
diff --git a/amrwb/Makefile b/amrwb/Makefile
index cd593bb..f949850 100644
--- a/amrwb/Makefile
+++ b/amrwb/Makefile
@@ -3,6 +3,7 @@
 OC_BASE = ../opencore
 AMR_BASE = $(OC_BASE)/codecs_v2/audio/gsm_amr
 LIBDIR=lib
+BINDIR=bin
 
 # To compile as C instead of C++, define BUILD_AS_C
 ifneq (, $(BUILD_AS_C))
@@ -40,9 +41,15 @@ ifeq ($(shell uname), Darwin)
     SHLIB_EXT = dylib
     SHLIB_FLAGS = -dynamiclib
 else
-    SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
-    SHLIB_FLAGS = -shared
-    SONAME = libopencore-amrwb.so.$(MAJOR)
+    ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT)
+        SHLIB_EXT = $(MAJOR).$(MINOR).$(REVISION).dll
+        SHLIB_FLAGS = -shared
+        SONAME = libopencore-amrwb-$(MAJOR).dll
+    else
+        SHLIB_EXT = so.$(MAJOR).$(MINOR).$(REVISION)
+        SHLIB_FLAGS = -shared
+        SONAME = libopencore-amrwb.so.$(MAJOR)
+    endif
 endif
 SHLIB = libopencore-amrwb.$(SHLIB_EXT)
 
@@ -67,11 +74,21 @@ libopencore-amrwb.a: $(OBJS)
 install: libopencore-amrwb.a $(SHLIB)
 	install -d $(DESTDIR)$(PREFIX)/$(LIBDIR)
 	install -m 644 libopencore-amrwb.a $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT)
+	install -d $(DESTDIR)$(PREFIX)/$(BINDIR)
+	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)
+else
 	install $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+endif
 ifneq ($(shell uname), Darwin)
+ifeq ($(shell uname | sed -e 's/\(MINGW32_NT\)\(.*\)/\1/'), MINGW32_NT)
+	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME)
+	ln -sf $(DESTDIR)$(PREFIX)/$(BINDIR)/$(SONAME) $(DESTDIR)$(PREFIX)/$(BINDIR)/libopencore-amrwb.dll
+else
 	ln -sf $(SHLIB) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(SONAME)
 	ln -sf $(SONAME) $(DESTDIR)$(PREFIX)/$(LIBDIR)/libopencore-amrwb.so
 endif
+endif
 	install -d $(DESTDIR)$(PREFIX)/include/opencore-amrwb
 	install -m 644 dec_if.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb
 	install -m 644 if_rom.h $(DESTDIR)$(PREFIX)/include/opencore-amrwb

-- 
opencore-amr packaging