- better makefile patch (use libtool, it takes care of using fPIC etc.)

[packages/libmatroska.git] / libmatroska-makefile.patch

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index 713195b19eb064b2a211db051657c98e067b952a..c8658ccb3306811b441254bd9bfe1578f51efe2f 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,6 +1,11 @@
---- libmatroska-0.4.4/make/linux/Makefile.dakh 2003-06-13 20:53:15.000000000 +0200
-+++ libmatroska-0.4.4/make/linux/Makefile      2003-06-29 19:08:02.000000000 +0200
-@@ -29,8 +29,8 @@
+--- 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 @@
+ INSTALL_OPTS = -m 644
+ INSTALL_OPTS_LIB = -m 644
+ INSTALL_DIR_OPTS = -m 755
++LIBTOOL = libtool
+ 
  CWD=$(shell pwd)
  
  # Options
@@ -11,16 +16,27 @@
  EXTENSION=.cpp
  
  SYSTEM  := $(shell uname -s)
-@@ -54,7 +54,7 @@
- MUX_LIBS=-lmatroska -lebml $(LIBICONV)
+@@ -51,10 +52,10 @@
+ # Librarires
+ INCLUDE=-I${SRC_DIR} -I$(LIBEBML_INCLUDE_DIR)
+ LIBS=
+-MUX_LIBS=-lmatroska -lebml $(LIBICONV)
++MUX_LIBS=libmatroska.la -lebml $(LIBICONV)
  
  # Names
 -LIBRARY=libmatroska.a
-+LIBRARY=libmatroska
++LIBRARY=libmatroska.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -70,7 +70,7 @@
+@@ -65,24 +66,22 @@
+ # files holding dependency information; replace .cxx extension with .dep
+ dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
+ 
+-# object files; replace .cxx extension with .o
+-objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
++# object files; replace .cxx extension with .lo
++objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))
  
  DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
  
@@ -29,28 +45,55 @@
  
  lib library: $(LIBRARY)
  
-@@ -79,10 +79,10 @@
-       $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+ # Build rules
+-%.o: %$(EXTENSION)
+-      $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
++%.lo: %$(EXTENSION)
++      $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) $@ $(objects)
 -      $(RANLIB) $@
 -#     $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
 -#     ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
-+      $(AR) $@.a $(objects)
-+      $(RANLIB) $@.a
-+      $(LD) $(LDFLAGS) -o $@.so $^ $(LIBS)
++      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir)
 +
  
  clean:        cleantest
        rm -f $(objects)
-@@ -113,7 +113,8 @@
+@@ -100,27 +99,27 @@
+ test: test6 test8
+ 
+ test6:        test6.o $(LIBRARY)
+-      $(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:        test8.o $(LIBRARY)
+-      $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
++      $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)
+ 
+ test8.o: $(MUX_SRC_DIR)test8.cpp
+       $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
  
  install: $(LIBRARY)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 -      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
-+      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY).a $(libdir)
-+      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY).so $(libdir)
-       $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
+-      $(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 $(SRC_DIR)/*.h; do \
-               $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \
+-              $(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 ; \
+       done
+ 
+ # DO NOT DELETE