---- libmatroska-0.7.4/make/linux/Makefile.orig 2004-07-19 18:43:44.000000000 +0200
-+++ libmatroska-0.7.4/make/linux/Makefile 2004-11-07 14:15:22.241711016 +0100
-@@ -30,12 +30,14 @@
+--- libmatroska-0.8.1/make/linux/Makefile.orig 2006-06-02 16:32:52.000000000 +0200
++++ libmatroska-0.8.1/make/linux/Makefile 2007-02-17 21:06:58.961639212 +0100
+@@ -28,6 +28,7 @@
INSTALL_OPTS = -m 644
INSTALL_OPTS_LIB = -m 644
INSTALL_DIR_OPTS = -m 755
+LIBTOOL = libtool
-+
-+LIBEBML_INCLUDE_DIR=
-+LIBEBML_LIB_DIR=
+ ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw))
+ $(error Please use the Makefile in ../mingw32)
+@@ -36,8 +37,8 @@
CWD=$(shell pwd)
# Options
-LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml
-LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux
++LIBEBML_INCLUDE_DIR=
++LIBEBML_LIB_DIR=
EXTENSION=.cpp
ifeq (yes,$(DEBUG))
-@@ -50,10 +52,10 @@
+@@ -52,12 +53,10 @@
# Librarires
INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR)
LIBS=
# Names
-LIBRARY=libmatroska.a
+-LIBRARY_SO=libmatroska.so
+-LIBRARY_SO_VER=libmatroska.so.0
+LIBRARY=libmatroska.la
# source-files
sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -64,8 +66,8 @@
- # files holding dependency information; replace .cxx extension with .dep
- dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
+@@ -65,10 +64,8 @@
+ # header files; replace .cxx extension with .h
+ headers:=$(patsubst %$(EXTENSION),%.h,$(sources))
-# object files; replace .cxx extension with .o
-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+-
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
+# object files; replace .cxx extension with .lo
+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
-Wshadow
-@@ -78,12 +80,11 @@
- lib library: $(LIBRARY)
+@@ -79,32 +76,19 @@
+ ifeq (Darwin,$(shell uname -s))
+ all: staticlib
+ else
+-all: staticlib sharedlib
++all: $(LIBRARY)
+ endif
+
+-staticlib: $(LIBRARY)
+-
+-sharedlib: $(LIBRARY_SO)
+-
+ lib:
+ @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
+ @false
# Build rules
-%.o: %$(EXTENSION)
- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
-+%.lo: %$(EXTENSION)
-+ $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+-
+ %.lo: %$(EXTENSION)
+- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++ $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
$(LIBRARY): $(objects)
- $(AR) $@ $(objects)
- $(RANLIB) $@
+-
+-$(LIBRARY_SO): $(objects_so)
+- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml
+- rm -f $(LIBRARY_SO)
+- ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
+ $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
clean: cleantest
- rm -f $(objects)
-@@ -101,33 +102,33 @@
- test: test6 test8 test9
+ rm -f $(objects) $(objects_so)
+@@ -132,19 +116,19 @@
+ test: test6 test9
- test6: test6.o $(LIBRARY)
+ test6: test6.o $(LIBRARY) $(LIBRARY_SO)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test6.o: $(MUX_SRC_DIR)test6.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
- test8: test8.o $(LIBRARY)
+ test8: test8.o $(LIBRARY) $(LIBRARY_SO)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test8.o: $(MUX_SRC_DIR)test8.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
- test9: test9.o $(LIBRARY)
+ test9: test9.o $(LIBRARY) $(LIBRARY_SO)
- $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
-+ $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++ $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS)
test9.o: $(TAG_SRC_DIR)test9.cpp
$(CXX) -c $(COMPILEFLAGS) -o $@ $<
-
- install: $(LIBRARY)
-- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
-- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+@@ -152,27 +136,22 @@
+ ifeq (Darwin,$(shell uname -s))
+ install: install_staticlib install_headers
+ else
+-install: install_staticlib install_sharedlib install_headers
++install: install_lib install_headers
+ endif
+
+ install_headers:
- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
-+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
-+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)
for i in $(INCLUDE_DIR)/*.h; do \
- $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+ $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
done
- # DO NOT DELETE
+-install_staticlib: $(LIBRARY)
+- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+-
+-install_sharedlib: $(LIBRARY_SO)
+- $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+- $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
+- ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
++install_lib: $(LIBRARY)
++ $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
+
+ ifneq ($(wildcard .depend),)
+ include .depend
projects / packages / libmatroska.git / blobdiff