]> git.pld-linux.org Git - packages/libmatroska.git/commitdiff
- updated for 0.7.7
authorJakub Bogusz <qboosh@pld-linux.org>
Sun, 12 Jun 2005 19:24:01 +0000 (19:24 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    libmatroska-makefile.patch -> 1.7

libmatroska-makefile.patch

index e881fa17661a7458cf8be7f711a742a9546224a0..e607b9dfaefd78364c83779e44e4037dffeef559 100644 (file)
@@ -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.7.7/make/linux/Makefile.orig 2005-04-19 09:00:00.000000000 +0200
++++ libmatroska-0.7.7/make/linux/Makefile      2005-06-12 21:27:18.499321560 +0200
 @@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  
  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,31 +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
@@ -81,7 +82,7 @@
  
  clean:        cleantest
        rm -f $(objects) $(objects_so)
-@@ -127,43 +112,38 @@
+@@ -131,19 +116,19 @@
  test: test6 test9
  
  test6:        test6.o $(LIBRARY) $(LIBRARY_SO)
  
  test9.o: $(TAG_SRC_DIR)test9.cpp
        $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+@@ -151,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)
This page took 0.078587 seconds and 4 git commands to generate.