- updated to 1.4.2

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

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
deleted file mode 100644 (file)
index a8bafda..0000000
--- a/libmatroska-makefile.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- 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
- INSTALL_DIR_OPTS = -m 755
-+LIBTOOL = libtool
- 
- CWD=$(shell pwd)
- 
- # Options
--LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
--LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
-+LIBEBML_INCLUDE_DIR=
-+LIBEBML_LIB_DIR=
- EXTENSION=.cpp
- 
- ifeq (yes,$(DEBUG))
-@@ -59,12 +60,10 @@
- # Libraries
- INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
- LIBS=
--MUX_LIBS=-lmatroska -lebml $(LIBICONV)
-+MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
- 
- # Names
--LIBRARY=libmatroska.a
--LIBRARY_SO=libmatroska.so
--LIBRARY_SO_VER=libmatroska.so.6
-+LIBRARY=libmatroska.la
- 
- # source-files
- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -72,39 +71,24 @@
- # 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 -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
- 
- # Build rules
--%.o: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
--
- %.lo: %$(EXTENSION)
--      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
-+      $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
- 
- $(LIBRARY): $(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 --tag=CC $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) -version-info 6:0:0
- 
-@@ -134,24 +120,24 @@
- test: test6 test9
- 
- test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
--      $(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 --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 --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
- 
- test9.o: $(TAG_SRC_DIR)test9.cpp
-       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
--install: $(targets_$(link):%=install_%) install_headers 
-+install: install_lib install_headers 
- 
- install_headers:
-       $(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 $(DESTDIR)$(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
--
--install_sharedlib: $(LIBRARY_SO)
-+install_lib: $(LIBRARY)
-       $(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),)
- include .depend