---- libmatroska-0.4.4/make/linux/Makefile.orig 2003-06-13 20:53:15.000000000 +0200
-+++ libmatroska-0.4.4/make/linux/Makefile 2003-07-08 22:25:50.000000000 +0200
-@@ -25,12 +25,13 @@
+--- libmatroska/make/linux/Makefile.djurban 2003-07-17 11:48:18.000000000 +0200
++++ libmatroska/make/linux/Makefile 2003-09-02 15:39:10.181661712 +0200
+@@ -25,12 +25,14 @@
INSTALL_OPTS = -m 644
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
+LIBTOOL = libtool
++
++LIBEBML_INCLUDE_DIR=
++LIBEBML_LIB_DIR=
CWD=$(shell pwd)
# Options
--LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml/src
+-LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
-LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
-+LIBEBML_INCLUDE_DIR=
-+LIBEBML_LIB_DIR=
EXTENSION=.cpp
- SYSTEM := $(shell uname -s)
-@@ -51,10 +52,10 @@
+ ifeq (yes,$(DEBUG))
+@@ -47,10 +49,10 @@
# Librarires
- INCLUDE=-I${SRC_DIR} -I$(LIBEBML_INCLUDE_DIR)
+ INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
LIBS=
-MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -65,24 +66,22 @@
+@@ -61,24 +63,22 @@
# files holding dependency information; replace .cxx extension with .dep
dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
clean: cleantest
rm -f $(objects)
-@@ -100,27 +99,27 @@
- test: test6 test8
+@@ -96,33 +96,33 @@
+ test: test6 test8 test9
test6: test6.o $(LIBRARY)
- $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
test6.o: $(MUX_SRC_DIR)test6.cpp
$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
test8.o: $(MUX_SRC_DIR)test8.cpp
$(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+ test9: test9.o $(LIBRARY)
+- $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+
+ test9.o: $(TAG_SRC_DIR)test9.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+
install: $(LIBRARY)
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
- for i in $(SRC_DIR)/*.h; do \
+ for i in $(INCLUDE_DIR)/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \
done
-- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/api/c
-+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/api/c
- for i in $(SRC_DIR)/api/c/*.h; do \
-- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/api/c ; \
-+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/api/c ; \
+- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
+ for i in $(INCLUDE_DIR)/c/*.h; do \
+- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
++ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
done
# DO NOT DELETE