--- libebml.orig/make/linux/Makefile 2011-08-03 13:39:21.000000000 +0300
+++ libebml/make/linux/Makefile 2011-08-03 13:39:57.000000000 +0300
@@ -59,7 +59,7 @@
- \r
- # object files; replace .cxx extension with .o\r
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
--objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r
-+objects_so:=$(objects)\r
- \r
- WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow\r
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)\r
+
+ # object files; replace .cxx extension with .o
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+-objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources))
++objects_so:=$(objects)
+
+ WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
@@ -81,9 +81,6 @@
- \r
- # Build rules\r
- %.o: %$(EXTENSION)\r
-- $(CXX) -c $(COMPILEFLAGS) -o $@ $<\r
--\r
--%.lo: %$(EXTENSION)\r
- $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<\r
- \r
- $(LIBRARY): $(objects)\r
+
+ # Build rules
+ %.o: %$(EXTENSION)
+- $(CXX) -c $(COMPILEFLAGS) -o $@ $<
+-
+-%.lo: %$(EXTENSION)
+ $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
+
+ $(LIBRARY): $(objects)
--- libebml-1.3.0/make/linux/Makefile.orig 2013-07-04 19:08:40.474927603 +0200
+++ libebml-1.3.0/make/linux/Makefile 2013-07-04 19:09:09.568664476 +0200
@@ -61,7 +61,7 @@
- objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r
- objects_so:=$(objects)\r
- \r
--WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow\r
-+WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow\r
- COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)\r
- DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)\r
- \r
+ objects:=$(patsubst %$(EXTENSION),%.o,$(sources))
+ objects_so:=$(objects)
+
+-WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
++WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -fno-gnu-keywords -Wshadow
+ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
+ DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE)
+
***************
*** 83,88 ****
--- 83,90 ----
- #else /* Not _WIN32 */\r
- #if defined(__sun)\r
- #define HAVE_MEMALIGN\r
-+ #elif defined(__FreeBSD__)\r
-+ #define HAVE_POSIX_MEMALIGN\r
- /* Linux x86_64 and OSX always align allocations to 16 bytes */\r
- #elif !defined(__amd64__) && !defined(__APPLE__) \r
- #define HAVE_MEMALIGN\r
+ #else /* Not _WIN32 */
+ #if defined(__sun)
+ #define HAVE_MEMALIGN
++ #elif defined(__FreeBSD__)
++ #define HAVE_POSIX_MEMALIGN
+ /* Linux x86_64 and OSX always align allocations to 16 bytes */
+ #elif !defined(__amd64__) && !defined(__APPLE__)
+ #define HAVE_MEMALIGN