1 --- libmatroska-0.4.4/make/linux/Makefile.orig 2003-06-13 20:53:15.000000000 +0200
2 +++ libmatroska-0.4.4/make/linux/Makefile 2003-07-08 22:25:50.000000000 +0200
5 INSTALL_OPTS_LIB = -m 644
6 INSTALL_DIR_OPTS = -m 755
12 -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml/src
13 -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
18 SYSTEM := $(shell uname -s)
21 INCLUDE=-I${SRC_DIR} -I$(LIBEBML_INCLUDE_DIR)
23 -MUX_LIBS=-lmatroska -lebml $(LIBICONV)
24 +MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
27 -LIBRARY=libmatroska.a
28 +LIBRARY=libmatroska.la
31 sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
33 # files holding dependency information; replace .cxx extension with .dep
34 dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
36 -# object files; replace .cxx extension with .o
37 -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
38 +# object files; replace .cxx extension with .lo
39 +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
41 DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}
46 lib library: $(LIBRARY)
50 - $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
52 + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
54 $(LIBRARY): $(objects)
57 -# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
58 -# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
59 + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
67 test6: test6.o $(LIBRARY)
68 - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
69 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
71 test6.o: $(MUX_SRC_DIR)test6.cpp
72 $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
74 test8: test8.o $(LIBRARY)
75 - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
76 + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
78 test8.o: $(MUX_SRC_DIR)test8.cpp
79 $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
82 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
83 - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
84 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
85 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
86 + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
87 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
88 for i in $(SRC_DIR)/*.h; do \
89 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
90 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
92 - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/api/c
93 + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/api/c
94 for i in $(SRC_DIR)/api/c/*.h; do \
95 - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/api/c ; \
96 + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/api/c ; \