1 --- libmatroska-1.2.0/make/linux/Makefile.orig 2011-06-30 19:44:13.460706988 +0200
2 +++ libmatroska-1.2.0/make/linux/Makefile 2011-06-30 19:50:32.134053000 +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.4
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 -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
48 ifeq (Darwin,$(shell uname -s))
51 -all: staticlib sharedlib
55 -staticlib: $(LIBRARY)
57 -sharedlib: $(LIBRARY_SO)
60 @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
65 - $(CXX) -c $(COMPILEFLAGS) -o $@ $<
68 - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
69 + $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
71 $(LIBRARY): $(objects)
72 - $(AR) rcvu $@ $(objects)
75 -$(LIBRARY_SO): $(objects_so)
76 - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
78 - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
79 + $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 4:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
82 rm -f $(objects) $(objects_so)
86 test6: test6.o $(LIBRARY) $(LIBRARY_SO)
87 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
88 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
90 test6.o: $(MUX_SRC_DIR)test6.cpp
91 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
93 test8: test8.o $(LIBRARY) $(LIBRARY_SO)
94 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
95 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
97 test8.o: $(MUX_SRC_DIR)test8.cpp
98 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
100 test9: test9.o $(LIBRARY) $(LIBRARY_SO)
101 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
102 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
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
110 -install: install_staticlib install_sharedlib install_headers
111 +install: install_lib 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) ; \
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 ; \
128 -install_staticlib: $(LIBRARY)
129 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
130 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
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)
140 ifneq ($(wildcard .depend),)