- adjusted to 0.7.4 (by Karol Krenski <charles(at)os.pl>)

Changed files:
    libmatroska-makefile.patch -> 1.4

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index 8cece1685042bcb8d4dc586b76d6f88669fb5a0e..970f54ca2388c0bdd9a9f61006b0d3acfb70b697 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,6 +1,6 @@
---- libmatroska/make/linux/Makefile.djurban    2003-07-17 11:48:18.000000000 +0200
-+++ libmatroska/make/linux/Makefile    2003-09-02 15:39:10.181661712 +0200
-@@ -25,12 +25,14 @@
+--- libmatroska-0.7.4/make/linux/Makefile.orig 2004-07-19 18:43:44.000000000 +0200
++++ libmatroska-0.7.4/make/linux/Makefile      2004-11-07 14:15:22.241711016 +0100
+@@ -30,12 +30,14 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
@@ -17,7 +17,7 @@
  EXTENSION=.cpp
  
  ifeq (yes,$(DEBUG))
-@@ -47,10 +49,10 @@
+@@ -50,10 +52,10 @@
  # Librarires
  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  LIBS=
@@ -30,7 +30,7 @@
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -61,24 +63,22 @@
+@@ -64,8 +66,8 @@
  # files holding dependency information; replace .cxx extension with .dep
  dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
  
@@ -39,52 +39,47 @@
 +# object files; replace .cxx extension with .lo
 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  
- DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
- 
--all: $(LIBRARY) test
-+all: $(LIBRARY)
- 
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
+               -Wshadow
+@@ -78,12 +80,11 @@
  lib library: $(LIBRARY)
  
  # Build rules
 -%.o: %$(EXTENSION)
--      $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+-      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
 +%.lo: %$(EXTENSION)
 +      $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) $@ $(objects)
 -      $(RANLIB) $@
--#     $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
--#     ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
 +      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
-+
  
  clean:        cleantest
        rm -f $(objects)
-@@ -96,33 +96,33 @@
+@@ -101,33 +102,33 @@
  test: test6 test8 test9
  
  test6:        test6.o $(LIBRARY)
--      $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
-+      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)    
+-      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
  
  test6.o: $(MUX_SRC_DIR)test6.cpp
-       $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  test8:        test8.o $(LIBRARY)
--      $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+-      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
 +      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
  
  test8.o: $(MUX_SRC_DIR)test8.cpp
-       $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  test9:        test9.o $(LIBRARY)
--      $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+-      $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
 +      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
  
  test9.o: $(TAG_SRC_DIR)test9.cpp
-       $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  install: $(LIBRARY)
 -      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)