- updated to 1.4.1

[packages/libmatroska.git] / libmatroska-makefile.patch

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index 540d6bd135a762ffc75b418c2c0591d2e51783ad..a8bafda4342381e3a8821273bf54aa8bb6e6fdb7 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,5 +1,5 @@
---- libmatroska-1.3.0/make/linux/Makefile.orig 2011-09-26 17:14:10.104527029 +0200
-+++ libmatroska-1.3.0/make/linux/Makefile      2011-09-26 17:15:20.211196043 +0200
+--- libmatroska-1.4.1/make/linux/Makefile.orig 2013-09-19 20:45:17.662069195 +0200
++++ libmatroska-1.4.1/make/linux/Makefile      2013-09-19 20:51:55.232052511 +0200
 @@ -29,12 +29,13 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
@@ -16,8 +16,8 @@
  EXTENSION=.cpp
  
  ifeq (yes,$(DEBUG))
-@@ -49,12 +50,10 @@
- # Librarires
+@@ -59,12 +60,10 @@
+ # Libraries
  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  LIBS=
 -MUX_LIBS=-lmatroska -lebml $(LIBICONV)
@@ -31,7 +31,7 @@
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -62,10 +61,8 @@
+@@ -72,39 +71,24 @@
  # header files; replace .cxx extension with .h
  headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
  
@@ -42,20 +42,18 @@
 +# 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
-@@ -76,32 +73,19 @@
- ifeq (Darwin,$(shell uname -s))
- all: staticlib
- else
--all: staticlib sharedlib
-+all: $(LIBRARY)
- endif
+ WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -D_GNU_SOURCE -Wshadow
+ COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
+ LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
+ DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
  
+-all: $(targets_$(link))
+-
 -staticlib: $(LIBRARY)
 -
 -sharedlib: $(LIBRARY_SO)
--
++all: $(LIBRARY)
+ 
  lib:
        @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
        @false
@@ -66,7 +64,7 @@
 -
  %.lo: %$(EXTENSION)
 -      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
++      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) rcvu $@ $(objects)
@@ -76,11 +74,9 @@
 -      $(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 --tag=CC $(LD) $(LDFLAGS) -version-info 6:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
++      $(LIBTOOL) --mode=link --tag=CC $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) -version-info 6:0:0
  
- clean:        cleantest
-       rm -f $(objects) $(objects_so)
-@@ -129,19 +113,19 @@
+@@ -134,24 +120,24 @@
  test: test6 test9
  
  test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
@@ -103,38 +99,25 @@
  
  test9.o: $(TAG_SRC_DIR)test9.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-@@ -149,27 +133,22 @@
- ifeq (Darwin,$(shell uname -s))
- install: install_staticlib install_headers
- else
--install: install_staticlib install_sharedlib install_headers
-+install: install_lib install_headers
- endif
+ 
+-install: $(targets_$(link):%=install_%) install_headers 
++install: install_lib install_headers 
  
  install_headers:
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
-       for i in $(INCLUDE_DIR)/*.h; do \
--              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
-+              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
-       done
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
-       for i in $(INCLUDE_DIR)/c/*.h; do \
--              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
-+              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
+       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
+@@ -163,14 +149,9 @@
+               $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
        done
  
 -install_staticlib: $(LIBRARY)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+-      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
 -
 -install_sharedlib: $(LIBRARY_SO)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--      ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
 +install_lib: $(LIBRARY)
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+-      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
+-      ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
 +      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
  
  ifneq ($(wildcard .depend),)