- converted to UTF-8

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

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
index 7ed3b84b077ca3d61b9fdd96bc287d85969f8d6e..6da19af46d1be53baefd5afe7cca7f4d1996d512 100644 (file)
--- a/libebml-makefile.patch
+++ b/libebml-makefile.patch
@@ -1,6 +1,6 @@
---- libebml/make/linux/Makefile.orig   2003-07-17 11:47:07.000000000 +0200
-+++ libebml/make/linux/Makefile        2003-09-02 15:18:20.727607600 +0200
-@@ -25,6 +25,7 @@
+--- libebml-0.7.7/make/linux/Makefile.orig     2006-03-30 21:05:11.000000000 +0200
++++ libebml-0.7.7/make/linux/Makefile  2006-04-23 18:35:31.025168000 +0200
+@@ -28,6 +28,7 @@
  INSTALL_OPTS = -m 644
  INSTALL_OPTS_LIB = -m 644
  INSTALL_DIR_OPTS = -m 755
@@ -8,54 +8,62 @@
  
  # Options
  EXTENSION=.cpp
-@@ -45,7 +46,7 @@
+@@ -50,9 +51,7 @@
  LIBS=
  
  # Names
 -LIBRARY=libebml.a
+-LIBRARY_SO=libebml.so
+-LIBRARY_SO_VER=libebml.so.0
 +LIBRARY=libebml.la
  
  # source-files
  sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))
-@@ -56,8 +57,8 @@
- # files holding dependency information; replace .cxx extension with .dep
- dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))
+@@ -60,9 +59,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))
  
- DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}
- 
-@@ -66,14 +67,12 @@
- lib library: $(LIBRARY)
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+@@ -83,20 +81,11 @@
+       @false
  
  # Build rules
 -%.o: %$(EXTENSION)
--      $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
-+%.lo: %$(EXTENSION)
-+      $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<
+-      $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+-
+ %.lo: %$(EXTENSION)
+-      $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
++      $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $<
  
  $(LIBRARY): $(objects)
 -      $(AR) $@ $(objects)
 -      $(RANLIB) $@
--#     $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
--#     ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
+-
+-$(LIBRARY_SO): $(objects_so)
+-      $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
+-      rm -f $(LIBRARY_SO)
+-      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
 +      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
-+
  
  clean:
-       rm -f $(objects)
-@@ -86,15 +85,15 @@
-       $(DEPEND) $(DEPENDFLAGS) $(sources)
+       rm -f $(objects) $(objects_so)
+@@ -121,27 +110,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: $(LIBRARY)
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)
+ 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) ; \
@@ -68,4 +76,17 @@
 +              $(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 -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO)
++install_lib: $(LIBRARY)
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)
++      $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
+ 
+ 
+ ifneq ($(wildcard .depend),)