1 --- libmatroska-1.4.1/make/linux/Makefile.orig 2013-09-19 20:45:17.662069195 +0200
2 +++ libmatroska-1.4.1/make/linux/Makefile 2013-09-19 20:51:55.232052511 +0200
5 INSTALL_OPTS_LIB = -m 644
6 INSTALL_DIR_OPTS = -m 755
12 -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
13 -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
21 INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
23 -MUX_LIBS=-lmatroska -lebml $(LIBICONV)
24 +MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
27 -LIBRARY=libmatroska.a
28 -LIBRARY_SO=libmatroska.so
29 -LIBRARY_SO_VER=libmatroska.so.6
30 +LIBRARY=libmatroska.la
33 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
35 # header files; replace .cxx extension with .h
36 headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
38 -# object files; replace .cxx extension with .o
39 -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
41 -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
42 +# object files; replace .cxx extension with .lo
43 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
45 WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -D_GNU_SOURCE -Wshadow
46 COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE)
47 LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
48 DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
50 -all: $(targets_$(link))
52 -staticlib: $(LIBRARY)
54 -sharedlib: $(LIBRARY_SO)
58 @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
63 - $(CXX) -c $(COMPILEFLAGS) -o $@ $<
66 - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
67 + $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
69 $(LIBRARY): $(objects)
70 - $(AR) rcvu $@ $(objects)
73 -$(LIBRARY_SO): $(objects_so)
74 - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
76 - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
77 + $(LIBTOOL) --mode=link --tag=CC $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) -version-info 6:0:0
82 test6: test6.o $(LIBRARY) $(LIBRARY_SO)
83 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
84 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
86 test6.o: $(MUX_SRC_DIR)test6.cpp
87 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
89 test8: test8.o $(LIBRARY) $(LIBRARY_SO)
90 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
91 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
93 test8.o: $(MUX_SRC_DIR)test8.cpp
94 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
96 test9: test9.o $(LIBRARY) $(LIBRARY_SO)
97 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
98 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
100 test9.o: $(TAG_SRC_DIR)test9.cpp
101 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
103 -install: $(targets_$(link):%=install_%) install_headers
104 +install: install_lib install_headers
107 $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
109 $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
112 -install_staticlib: $(LIBRARY)
113 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
114 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
116 -install_sharedlib: $(LIBRARY_SO)
117 +install_lib: $(LIBRARY)
118 $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
119 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)
120 - ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO)
121 + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
123 ifneq ($(wildcard .depend),)