1 --- libmatroska-0.8.1/make/linux/Makefile.orig 2006-06-02 16:32:52.000000000 +0200
2 +++ libmatroska-0.8.1/make/linux/Makefile 2007-02-17 21:06:58.961639212 +0100
5 INSTALL_OPTS_LIB = -m 644
6 INSTALL_DIR_OPTS = -m 755
9 ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
10 $(error Please use the Makefile in ../mingw32)
15 -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
16 -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
24 INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
26 -MUX_LIBS=-lmatroska -lebml $(LIBICONV)
27 +MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
30 -LIBRARY=libmatroska.a
31 -LIBRARY_SO=libmatroska.so
32 -LIBRARY_SO_VER=libmatroska.so.0
33 +LIBRARY=libmatroska.la
36 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
38 # header files; replace .cxx extension with .h
39 headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
41 -# object files; replace .cxx extension with .o
42 -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
44 -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
45 +# object files; replace .cxx extension with .lo
46 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
48 WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
51 ifeq (Darwin,$(shell uname -s))
54 -all: staticlib sharedlib
58 -staticlib: $(LIBRARY)
60 -sharedlib: $(LIBRARY_SO)
63 @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
68 - $(CXX) -c $(COMPILEFLAGS) -o $@ $<
71 - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
72 + $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $<
74 $(LIBRARY): $(objects)
78 -$(LIBRARY_SO): $(objects_so)
79 - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
81 - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
82 + $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
85 rm -f $(objects) $(objects_so)
89 test6: test6.o $(LIBRARY) $(LIBRARY_SO)
90 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
91 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
93 test6.o: $(MUX_SRC_DIR)test6.cpp
94 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
96 test8: test8.o $(LIBRARY) $(LIBRARY_SO)
97 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
98 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
100 test8.o: $(MUX_SRC_DIR)test8.cpp
101 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
103 test9: test9.o $(LIBRARY) $(LIBRARY_SO)
104 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
105 + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
107 test9.o: $(TAG_SRC_DIR)test9.cpp
108 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
109 @@ -152,27 +136,22 @@
110 ifeq (Darwin,$(shell uname -s))
111 install: install_staticlib install_headers
113 -install: install_staticlib install_sharedlib install_headers
114 +install: install_lib install_headers
118 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
119 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
120 for i in $(INCLUDE_DIR)/*.h; do \
121 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
122 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
124 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
125 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
126 for i in $(INCLUDE_DIR)/c/*.h; do \
127 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
128 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
131 -install_staticlib: $(LIBRARY)
132 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
133 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
135 -install_sharedlib: $(LIBRARY_SO)
136 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
137 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
138 - ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
139 +install_lib: $(LIBRARY)
140 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
141 + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
143 ifneq ($(wildcard .depend),)