1 --- libmatroska/make/linux/Makefile.djurban 2003-07-17 11:48:18.000000000 +0200
2 +++ libmatroska/make/linux/Makefile 2003-09-02 15:39:10.181661712 +0200
5 INSTALL_OPTS_LIB = -m 644
6 INSTALL_DIR_OPTS = -m 755
15 -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
16 -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
22 INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
24 -MUX_LIBS=-lmatroska -lebml $(LIBICONV)
25 +MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
28 -LIBRARY=libmatroska.a
29 +LIBRARY=libmatroska.la
32 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
34 # files holding dependency information; replace .cxx extension with .dep
35 dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
37 -# object files; replace .cxx extension with .o
38 -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
39 +# object files; replace .cxx extension with .lo
40 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
42 DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
47 lib library: $(LIBRARY)
51 - $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
53 + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
55 $(LIBRARY): $(objects)
58 -# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
59 -# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
60 + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
66 test: test6 test8 test9
68 test6: test6.o $(LIBRARY)
69 - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
70 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
72 test6.o: $(MUX_SRC_DIR)test6.cpp
73 $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
75 test8: test8.o $(LIBRARY)
76 - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
77 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
79 test8.o: $(MUX_SRC_DIR)test8.cpp
80 $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
82 test9: test9.o $(LIBRARY)
83 - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
84 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
86 test9.o: $(TAG_SRC_DIR)test9.cpp
87 $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
90 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
91 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
92 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
93 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
94 + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
95 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
96 for i in $(INCLUDE_DIR)/*.h; do \
97 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
98 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
100 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
101 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
102 for i in $(INCLUDE_DIR)/c/*.h; do \
103 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
104 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \