]>
Commit | Line | Data |
---|---|---|
140185c2 JB |
1 | --- libmatroska-1.4.1/make/linux/Makefile.orig 2013-09-19 20:45:17.662069195 +0200 |
2 | +++ libmatroska-1.4.1/make/linux/Makefile 2013-09-19 20:51:55.232052511 +0200 | |
e4805536 | 3 | @@ -29,12 +29,13 @@ |
b57b5cf5 JB |
4 | INSTALL_OPTS = -m 644 |
5 | INSTALL_OPTS_LIB = -m 644 | |
6 | INSTALL_DIR_OPTS = -m 755 | |
7 | +LIBTOOL = libtool | |
8 | ||
a2b44dd0 | 9 | CWD=$(shell pwd) |
10 | ||
11 | # Options | |
298a82c1 | 12 | -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml |
a2b44dd0 | 13 | -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux |
b33caf87 JB |
14 | +LIBEBML_INCLUDE_DIR= |
15 | +LIBEBML_LIB_DIR= | |
a2b44dd0 | 16 | EXTENSION=.cpp |
17 | ||
298a82c1 | 18 | ifeq (yes,$(DEBUG)) |
140185c2 JB |
19 | @@ -59,12 +60,10 @@ |
20 | # Libraries | |
298a82c1 | 21 | INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR) |
b57b5cf5 JB |
22 | LIBS= |
23 | -MUX_LIBS=-lmatroska -lebml $(LIBICONV) | |
24 | +MUX_LIBS=libmatroska.la -lebml $(LIBICONV) | |
a2b44dd0 | 25 | |
26 | # Names | |
27 | -LIBRARY=libmatroska.a | |
eb78eecf | 28 | -LIBRARY_SO=libmatroska.so |
92b664b9 | 29 | -LIBRARY_SO_VER=libmatroska.so.6 |
b57b5cf5 | 30 | +LIBRARY=libmatroska.la |
a2b44dd0 | 31 | |
32 | # source-files | |
33 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
140185c2 | 34 | @@ -72,39 +71,24 @@ |
b33caf87 JB |
35 | # header files; replace .cxx extension with .h |
36 | headers:=$(patsubst %$(EXTENSION),%.h,$(sources)) | |
b57b5cf5 JB |
37 | |
38 | -# object files; replace .cxx extension with .o | |
39 | -objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) | |
eb78eecf JB |
40 | - |
41 | -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
b57b5cf5 JB |
42 | +# object files; replace .cxx extension with .lo |
43 | +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
a2b44dd0 | 44 | |
140185c2 JB |
45 | WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -D_GNU_SOURCE -Wshadow |
46 | COMPILEFLAGS=$(DEBUGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(WARNINGFLAGS) $(INCLUDE) | |
47 | LINKFLAGS=-L. -L$(LIBEBML_LIB_DIR) $(LDFLAGS) | |
48 | DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) | |
127ac958 | 49 | |
140185c2 JB |
50 | -all: $(targets_$(link)) |
51 | - | |
eb78eecf JB |
52 | -staticlib: $(LIBRARY) |
53 | - | |
54 | -sharedlib: $(LIBRARY_SO) | |
140185c2 JB |
55 | +all: $(LIBRARY) |
56 | ||
eb78eecf JB |
57 | lib: |
58 | @echo "Use the 'staticlib', 'sharedlib' or 'all' targets." | |
59 | @false | |
a2b44dd0 | 60 | |
b57b5cf5 JB |
61 | # Build rules |
62 | -%.o: %$(EXTENSION) | |
a2e87a09 | 63 | - $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
eb78eecf JB |
64 | - |
65 | %.lo: %$(EXTENSION) | |
66 | - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< | |
140185c2 | 67 | + $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< |
a2b44dd0 | 68 | |
69 | $(LIBRARY): $(objects) | |
88b07041 | 70 | - $(AR) rcvu $@ $(objects) |
a2b44dd0 | 71 | - $(RANLIB) $@ |
eb78eecf JB |
72 | - |
73 | -$(LIBRARY_SO): $(objects_so) | |
74 | - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml | |
6b3c9be1 | 75 | - rm -f $(LIBRARY_SO) |
eb78eecf | 76 | - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) |
140185c2 | 77 | + $(LIBTOOL) --mode=link --tag=CC $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) -version-info 6:0:0 |
a2b44dd0 | 78 | |
140185c2 | 79 | @@ -134,24 +120,24 @@ |
b33caf87 | 80 | test: test6 test9 |
b57b5cf5 | 81 | |
eb78eecf | 82 | test6: test6.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 83 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
7a27e1a8 | 84 | + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
85 | |
86 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
a2e87a09 | 87 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 | 88 | |
eb78eecf | 89 | test8: test8.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 90 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
7a27e1a8 | 91 | + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
92 | |
93 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
a2e87a09 | 94 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
a2b44dd0 | 95 | |
eb78eecf | 96 | test9: test9.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 97 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
7a27e1a8 | 98 | + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
298a82c1 | 99 | |
100 | test9.o: $(TAG_SRC_DIR)test9.cpp | |
a2e87a09 | 101 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
140185c2 JB |
102 | |
103 | -install: $(targets_$(link):%=install_%) install_headers | |
104 | +install: install_lib install_headers | |
eb78eecf JB |
105 | |
106 | install_headers: | |
140185c2 JB |
107 | $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) |
108 | @@ -163,14 +149,9 @@ | |
109 | $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ | |
b57b5cf5 JB |
110 | done |
111 | ||
eb78eecf | 112 | -install_staticlib: $(LIBRARY) |
140185c2 JB |
113 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) |
114 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(DESTDIR)$(libdir) | |
eb78eecf JB |
115 | - |
116 | -install_sharedlib: $(LIBRARY_SO) | |
eb78eecf | 117 | +install_lib: $(LIBRARY) |
140185c2 JB |
118 | $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) |
119 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(DESTDIR)$(libdir) | |
120 | - ln -fs $(LIBRARY_SO_VER) $(DESTDIR)$(libdir)/$(LIBRARY_SO) | |
eb78eecf JB |
121 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) |
122 | ||
b33caf87 | 123 | ifneq ($(wildcard .depend),) |
eb78eecf | 124 | include .depend |