libmatroska-makefile.patch

   1 --- libmatroska-1.3.0/make/linux/Makefile.orig  2011-09-26 17:14:10.104527029 +0200
   2 +++ libmatroska-1.3.0/make/linux/Makefile       2011-09-26 17:15:20.211196043 +0200
   3 @@ -29,12 +29,13 @@
   4  INSTALL_OPTS = -m 644
   5  INSTALL_OPTS_LIB = -m 644
   6  INSTALL_DIR_OPTS = -m 755
   7 +LIBTOOL = libtool
   8
   9  CWD=$(shell pwd)
  10
  11  # Options
  12 -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
  13 -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
  14 +LIBEBML_INCLUDE_DIR=
  15 +LIBEBML_LIB_DIR=
  16  EXTENSION=.cpp
  17
  18  ifeq (yes,$(DEBUG))
  19 @@ -49,12 +50,10 @@
  20  # Librarires
  21  INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
  22  LIBS=
  23 -MUX_LIBS=-lmatroska -lebml $(LIBICONV)
  24 +MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
  25
  26  # Names
  27 -LIBRARY=libmatroska.a
  28 -LIBRARY_SO=libmatroska.so
  29 -LIBRARY_SO_VER=libmatroska.so.6
  30 +LIBRARY=libmatroska.la
  31
  32  # source-files
  33  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
  34 @@ -62,10 +61,8 @@
  35  # header files; replace .cxx extension with .h
  36  headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
  37
  38 -# object files; replace .cxx extension with .o
  39 -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
  40 -
  41 -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  42 +# object files; replace .cxx extension with .lo
  43 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  44
  45  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
  46                 -Wshadow
  47 @@ -76,32 +73,19 @@
  48  ifeq (Darwin,$(shell uname -s))
  49  all: staticlib
  50  else
  51 -all: staticlib sharedlib
  52 +all: $(LIBRARY)
  53  endif
  54
  55 -staticlib: $(LIBRARY)
  56 -
  57 -sharedlib: $(LIBRARY_SO)
  58 -
  59  lib:
  60         @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
  61         @false
  62
  63  # Build rules
  64 -%.o: %$(EXTENSION)
  65 -       $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  66 -
  67  %.lo: %$(EXTENSION)
  68 -       $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
  69 +       $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  70
  71  $(LIBRARY): $(objects)
  72 -       $(AR) rcvu $@ $(objects)
  73 -       $(RANLIB) $@
  74 -
  75 -$(LIBRARY_SO): $(objects_so)
  76 -       $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
  77 -       rm -f $(LIBRARY_SO)
  78 -       ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
  79 +       $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 6:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
  80
  81  clean: cleantest
  82         rm -f $(objects) $(objects_so)
  83 @@ -129,19 +113,19 @@
  84  test: test6 test9
  85
  86  test6: test6.o $(LIBRARY) $(LIBRARY_SO)
  87 -       $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  88 +       $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  89
  90  test6.o: $(MUX_SRC_DIR)test6.cpp
  91         $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  92
  93  test8: test8.o $(LIBRARY) $(LIBRARY_SO)
  94 -       $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  95 +       $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
  96
  97  test8.o: $(MUX_SRC_DIR)test8.cpp
  98         $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  99
 100  test9: test9.o $(LIBRARY) $(LIBRARY_SO)
 101 -       $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
 102 +       $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
 103
 104  test9.o: $(TAG_SRC_DIR)test9.cpp
 105         $(CXX) -c $(COMPILEFLAGS) -o $@ $<
 106 @@ -149,27 +133,22 @@
 107  ifeq (Darwin,$(shell uname -s))
 108  install: install_staticlib install_headers
 109  else
 110 -install: install_staticlib install_sharedlib install_headers
 111 +install: install_lib install_headers
 112  endif
 113
 114  install_headers:
 115 -       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
 116 +       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
 117         for i in $(INCLUDE_DIR)/*.h; do \
 118 -               $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
 119 +               $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
 120         done
 121 -       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
 122 +       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
 123         for i in $(INCLUDE_DIR)/c/*.h; do \
 124 -               $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
 125 +               $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
 126         done
 127
 128 -install_staticlib: $(LIBRARY)
 129 -       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 130 -       $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
 131 -
 132 -install_sharedlib: $(LIBRARY_SO)
 133 -       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 134 -       $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
 135 -       ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
 136 +install_lib: $(LIBRARY)
 137 +       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
 138 +       $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
 139
 140  ifneq ($(wildcard .depend),)
 141  include .depend