- updated for 0.7.6

Changed files:
    libmatroska-makefile.patch -> 1.6

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index 69d7ddfe3326353e76898c3a6aa3866bb29bbc64..e881fa17661a7458cf8be7f711a742a9546224a0 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,5 +1,5 @@
---- libmatroska-0.7.5/make/linux/Makefile.orig 2005-02-06 19:12:08.000000000 +0100
-+++ libmatroska-0.7.5/make/linux/Makefile      2005-02-27 20:16:53.467608880 +0100
+--- libmatroska-0.7.6/make/linux/Makefile.orig 2005-04-16 13:29:02.000000000 +0200
++++ libmatroska-0.7.6/make/linux/Makefile      2005-04-24 01:13:24.741389560 +0200
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -19,7 +19,7 @@
  EXTENSION=.cpp
  
  ifeq (yes,$(DEBUG))
-@@ -52,10 +53,10 @@
+@@ -52,12 +53,10 @@
  # Librarires
  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  LIBS=
@@ -28,67 +28,88 @@
  
  # Names
 -LIBRARY=libmatroska.a
+-LIBRARY_SO=libmatroska.so
+-LIBRARY_SO_VER=libmatroska.so.0
 +LIBRARY=libmatroska.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -63,8 +64,8 @@
+@@ -65,10 +64,8 @@
  # header files; replace .cxx extension with .h
  headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
  
 -# object files; replace .cxx extension with .o
 -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+-
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
 +# object files; replace .cxx extension with .lo
 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  
  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
                -Wshadow
-@@ -77,12 +78,11 @@
- lib library: $(LIBRARY)
+@@ -76,30 +73,18 @@
+ LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
+ 
+-all: staticlib sharedlib
+-
+-staticlib: $(LIBRARY)
+-
+-sharedlib: $(LIBRARY_SO)
++all: $(LIBRARY)
+ 
+ lib:
+       @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
+       @false
  
  # Build rules
 -%.o: %$(EXTENSION)
 -      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-+%.lo: %$(EXTENSION)
-+      $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+-
+ %.lo: %$(EXTENSION)
+-      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) $@ $(objects)
 -      $(RANLIB) $@
+-
+-$(LIBRARY_SO): $(objects_so)
+-      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+-      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
 +      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
  
  clean:        cleantest
-       rm -f $(objects)
-@@ -108,33 +108,33 @@
+       rm -f $(objects) $(objects_so)
+@@ -127,43 +112,38 @@
  test: test6 test9
  
- test6:        test6.o $(LIBRARY)
+ test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
 -      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  
  test6.o: $(MUX_SRC_DIR)test6.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
- test8:        test8.o $(LIBRARY)
+ test8:        test8.o $(LIBRARY) $(LIBRARY_SO)
 -      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  
  test8.o: $(MUX_SRC_DIR)test8.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
- test9:        test9.o $(LIBRARY)
+ test9:        test9.o $(LIBRARY) $(LIBRARY_SO)
 -      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  
  test9.o: $(TAG_SRC_DIR)test9.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
- install: $(LIBRARY)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+-install: install_staticlib install_sharedlib install_headers
++install: install_lib install_headers
+ 
+ install_headers:
 -      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
 +      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
        for i in $(INCLUDE_DIR)/*.h; do \
 -              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
@@ -101,4 +122,17 @@
 +              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
        done
  
+-install_staticlib: $(LIBRARY)
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+-      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+-
+-install_sharedlib: $(LIBRARY_SO)
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+-      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
+-      ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
++install_lib: $(LIBRARY)
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+ 
  ifneq ($(wildcard .depend),)
+ include .depend