- updated for 0.8.1

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

diff --git a/libmatroska-makefile.patch b/libmatroska-makefile.patch
index e881fa17661a7458cf8be7f711a742a9546224a0..ce71ef6cfb24c91bc7331568a4023c4340ebd25a 100644 (file)
--- a/libmatroska-makefile.patch
+++ b/libmatroska-makefile.patch
@@ -1,5 +1,5 @@
---- libmatroska-0.7.6/make/linux/Makefile.orig 2005-04-16 13:29:02.000000000 +0200
-+++ libmatroska-0.7.6/make/linux/Makefile      2005-04-24 01:13:24.741389560 +0200
+--- 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
@@ -47,17 +47,18 @@
  
  WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \
                -Wshadow
-@@ -76,30 +73,18 @@
- LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS)
- DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
- 
+@@ -79,32 +76,19 @@
+ ifeq (Darwin,$(shell uname -s))
+ all: staticlib
+ else
 -all: staticlib sharedlib
--
++all: $(LIBRARY)
+ endif
+ 
 -staticlib: $(LIBRARY)
 -
 -sharedlib: $(LIBRARY_SO)
-+all: $(LIBRARY)
- 
+-
  lib:
        @echo "Use the 'staticlib', 'sharedlib' or 'all' targets."
        @false
@@ -76,12 +77,13 @@
 -
 -$(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) $(objects_so)
-@@ -127,43 +112,38 @@
+@@ -132,19 +116,19 @@
  test: test6 test9
  
  test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
@@ -104,9 +106,13 @@
  
  test9.o: $(TAG_SRC_DIR)test9.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
- 
+@@ -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)
@@ -129,7 +135,7 @@
 -install_sharedlib: $(LIBRARY_SO)
 -      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
 -      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir)
--      ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
+-      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)