1 --- libmatroska-0.7.6/make/linux/Makefile.orig 2005-04-16 13:29:02.000000000 +0200
2 +++ libmatroska-0.7.6/make/linux/Makefile 2005-04-24 01:13:24.741389560 +0200
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 LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
52 DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
54 -all: staticlib sharedlib
56 -staticlib: $(LIBRARY)
58 -sharedlib: $(LIBRARY_SO)
62 @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
67 - $(CXX) -c $(COMPILEFLAGS) -o $@ $<
70 - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
71 + $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
73 $(LIBRARY): $(objects)
77 -$(LIBRARY_SO): $(objects_so)
78 - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
79 - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
80 + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
83 rm -f $(objects) $(objects_so)
87 test6: test6.o $(LIBRARY) $(LIBRARY_SO)
88 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
89 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
91 test6.o: $(MUX_SRC_DIR)test6.cpp
92 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
94 test8: test8.o $(LIBRARY) $(LIBRARY_SO)
95 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
96 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
98 test8.o: $(MUX_SRC_DIR)test8.cpp
99 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
101 test9: test9.o $(LIBRARY) $(LIBRARY_SO)
102 - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
103 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
105 test9.o: $(TAG_SRC_DIR)test9.cpp
106 $(CXX) -c $(COMPILEFLAGS) -o $@ $<
108 -install: install_staticlib install_sharedlib install_headers
109 +install: install_lib install_headers
112 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
113 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
114 for i in $(INCLUDE_DIR)/*.h; do \
115 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
116 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
118 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
119 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
120 for i in $(INCLUDE_DIR)/c/*.h; do \
121 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
122 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
125 -install_staticlib: $(LIBRARY)
126 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
127 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
129 -install_sharedlib: $(LIBRARY_SO)
130 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
131 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
132 - ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
133 +install_lib: $(LIBRARY)
134 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
135 + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
137 ifneq ($(wildcard .depend),)