---- libmatroska-0.8.1/make/linux/Makefile.orig 2006-06-02 16:32:52.000000000 +0200
-+++ libmatroska-0.8.1/make/linux/Makefile 2007-02-17 21:06:58.961639212 +0100
-@@ -28,6 +28,7 @@
+--- libmatroska-1.2.0/make/linux/Makefile.orig 2011-06-30 19:44:13.460706988 +0200
++++ libmatroska-1.2.0/make/linux/Makefile 2011-06-30 19:50:32.134053000 +0200
+@@ -29,12 +29,13 @@
INSTALL_OPTS = -m 644
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
+LIBTOOL = libtool
- ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
- $(error Please use the Makefile in ../mingw32)
-@@ -36,8 +37,8 @@
CWD=$(shell pwd)
# Options
EXTENSION=.cpp
ifeq (yes,$(DEBUG))
-@@ -52,12 +53,10 @@
+@@ -49,12 +50,10 @@
# Librarires
INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
LIBS=
# Names
-LIBRARY=libmatroska.a
-LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.0
+-LIBRARY_SO_VER=libmatroska.so.4
+LIBRARY=libmatroska.la
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -65,10 +64,8 @@
+@@ -62,10 +61,8 @@
# header files; replace .cxx extension with .h
headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-Wshadow
-@@ -79,32 +76,19 @@
+@@ -76,32 +73,19 @@
ifeq (Darwin,$(shell uname -s))
all: staticlib
else
-
%.lo: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
++ $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
$(LIBRARY): $(objects)
-- $(AR) $@ $(objects)
+- $(AR) rcvu $@ $(objects)
- $(RANLIB) $@
-
-$(LIBRARY_SO): $(objects_so)
- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
- rm -f $(LIBRARY_SO)
- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
-+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
++ $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 4:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
clean: cleantest
rm -f $(objects) $(objects_so)
-@@ -132,19 +116,19 @@
+@@ -129,19 +113,19 @@
test: test6 test9
test6: test6.o $(LIBRARY) $(LIBRARY_SO)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test6.o: $(MUX_SRC_DIR)test6.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
test8: test8.o $(LIBRARY) $(LIBRARY_SO)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test8.o: $(MUX_SRC_DIR)test8.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
test9: test9.o $(LIBRARY) $(LIBRARY_SO)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test9.o: $(TAG_SRC_DIR)test9.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
-@@ -152,27 +136,22 @@
+@@ -149,27 +133,22 @@
ifeq (Darwin,$(shell uname -s))
install: install_staticlib install_headers
else