- fix build with cc with spaces

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

diff --git a/libebml-makefile.patch b/libebml-makefile.patch
index 17253b996009ac352b919d3e218dd724db7ae3bc..e48c079b39cd06d77bc1d5969e59422a45d903d8 100644 (file)
--- a/libebml-makefile.patch
+++ b/libebml-makefile.patch
@@ -1,71 +1,92 @@
---- 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 @@
- INSTALL_OPTS = -m 644\r
- INSTALL_OPTS_LIB = -m 644\r
- INSTALL_DIR_OPTS = -m 755\r
-+LIBTOOL = libtool\r
- \r
- # Options\r
- EXTENSION=.cpp\r
-@@ -45,7 +46,7 @@
- LIBS=\r
- \r
- # Names\r
--LIBRARY=libebml.a\r
-+LIBRARY=libebml.la\r
- \r
- # source-files\r
- sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))\r
-@@ -56,8 +57,8 @@
- # files holding dependency information; replace .cxx extension with .dep\r
- dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))\r
- \r
--# object files; replace .cxx extension with .o\r
--objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
-+# object files; replace .cxx extension with .lo\r
-+objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r
- \r
- DEPENDFLAGS  = ${CXXFLAGS} ${INCLUDE}\r
- \r
-@@ -66,14 +67,12 @@
- lib library: $(LIBRARY)\r
- \r
- # Build rules\r
--%.o: %$(EXTENSION)\r
--      $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<\r
-+%.lo: %$(EXTENSION)\r
-+      $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<\r
- \r
- $(LIBRARY): $(objects)\r
--      $(AR) $@ $(objects)\r
--      $(RANLIB) $@\r
--#     $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)\r
--#     ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}\r
-+      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)\r
-+\r
- \r
- clean:\r
-       rm -f $(objects)\r
-@@ -86,15 +85,15 @@
-       $(DEPEND) $(DEPENDFLAGS) $(sources)\r
- \r
- install: $(LIBRARY)\r
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)\r
--      $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)\r
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)\r
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)\r
-+      $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)\r
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)\r
-       for i in $(INCLUDE_DIR)/*.h; do \\r
--              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \\r
-+              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \\r
-       done\r
--      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c\r
-+      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c\r
-       for i in $(INCLUDE_DIR)/c/*.h; do \\r
--              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \\r
-+              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \\r
-       done\r
- \r
- # DO NOT DELETE\r
+--- libebml-0.7.8/make/linux/Makefile.orig     2006-06-02 16:32:15.000000000 +0200
++++ libebml-0.7.8/make/linux/Makefile  2008-07-13 21:37:16.422034707 +0200
+@@ -28,6 +28,7 @@
+ INSTALL_OPTS = -m 644
+ INSTALL_OPTS_LIB = -m 644
+ INSTALL_DIR_OPTS = -m 755
++LIBTOOL = libtool
+ 
+ # Options
+ EXTENSION=.cpp
+@@ -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))
+@@ -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))
+ 
+ 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 $(COMPILEFLAGS) -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)
+-      rm -f $(LIBRARY_SO)
+-      ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
++      $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)
+ 
+ clean:
+       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_headers:
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)
++      $(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) ; \
+       done
+-      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c
++      $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c
+       for i in $(INCLUDE_DIR)/c/*.h; do \
+-              $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \
++              $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \
+       done
+ 
+-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) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir)
+ 
+ 
+ ifneq ($(wildcard .depend),)