Mercurial Mercurial > upstream > spec-files-extra / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/libebml-01-makefile.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2951 862c106ddd4c
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2951
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     1
 
--- libebml-1.0.0/make/linux/Makefile.orig	Fri Jun  4 04:44:54 2010
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     2
 
+++ libebml-1.0.0/make/linux/Makefile	Sat Oct  9 16:26:15 2010
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     3
 
@@ -64,6 +64,9 @@
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     4
 
 WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     5
 
 COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     6
 
 DEPENDFLAGS  = $(CXXFLAGS) $(INCLUDE)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     7
 
+LOFLAGS=-fPIC
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     8
 
+ARFLAGS=rcvu
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
     9
 
+LIBSOFLAGS=-Wl,-soname,
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    10
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    11
 
 ifeq (Darwin,$(shell uname -s))
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    12
 
 all: staticlib
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    13
 
@@ -84,14 +87,14 @@
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    14
 
 	$(CXX) -c $(COMPILEFLAGS) -o $@ $<
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    15
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    16
 
 %.lo: %$(EXTENSION)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    17
 
-	$(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $<
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    18
 
+	$(CXX) -c $(COMPILEFLAGS) $(LOFLAGS) -o $@ $<
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    19
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    20
 
 $(LIBRARY): $(objects)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    21
 
-	$(AR) rcvu $@ $(objects)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    22
 
+	$(AR) $(ARFLAGS) $@ $(objects)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    23
 
 	$(RANLIB) $@
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    24
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    25
 
 $(LIBRARY_SO): $(objects_so)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    26
 
-	$(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    27
 
+	$(CXX) -shared $(LIBSOFLAGS)$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    28
 
 	rm -f $(LIBRARY_SO)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    29
 
 	ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO)
862c106ddd4c 2010-10-10 Alex Viskovatoff <[email protected]>
viskov
parents: 338
diff changeset 
    30
upstream/spec-files-extra