]>
Commit | Line | Data |
---|---|---|
d25a61e4 JB |
1 | --- libmatroska-1.3.0/make/linux/Makefile.orig 2011-09-26 17:14:10.104527029 +0200 |
2 | +++ libmatroska-1.3.0/make/linux/Makefile 2011-09-26 17:15:20.211196043 +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)) |
e4805536 | 19 | @@ -49,12 +50,10 @@ |
b57b5cf5 | 20 | # Librarires |
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 |
d25a61e4 | 29 | -LIBRARY_SO_VER=libmatroska.so.5 |
b57b5cf5 | 30 | +LIBRARY=libmatroska.la |
a2b44dd0 | 31 | |
32 | # source-files | |
33 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
e4805536 | 34 | @@ -62,10 +61,8 @@ |
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 | |
a2e87a09 MC |
45 | WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ |
46 | -Wshadow | |
e4805536 | 47 | @@ -76,32 +73,19 @@ |
127ac958 JB |
48 | ifeq (Darwin,$(shell uname -s)) |
49 | all: staticlib | |
50 | else | |
eb78eecf | 51 | -all: staticlib sharedlib |
127ac958 JB |
52 | +all: $(LIBRARY) |
53 | endif | |
54 | ||
eb78eecf JB |
55 | -staticlib: $(LIBRARY) |
56 | - | |
57 | -sharedlib: $(LIBRARY_SO) | |
127ac958 | 58 | - |
eb78eecf JB |
59 | lib: |
60 | @echo "Use the 'staticlib', 'sharedlib' or 'all' targets." | |
61 | @false | |
a2b44dd0 | 62 | |
b57b5cf5 JB |
63 | # Build rules |
64 | -%.o: %$(EXTENSION) | |
a2e87a09 | 65 | - $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
eb78eecf JB |
66 | - |
67 | %.lo: %$(EXTENSION) | |
68 | - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< | |
7a27e1a8 | 69 | + $(LIBTOOL) --mode=compile --tag=CC $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
a2b44dd0 | 70 | |
71 | $(LIBRARY): $(objects) | |
88b07041 | 72 | - $(AR) rcvu $@ $(objects) |
a2b44dd0 | 73 | - $(RANLIB) $@ |
eb78eecf JB |
74 | - |
75 | -$(LIBRARY_SO): $(objects_so) | |
76 | - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml | |
6b3c9be1 | 77 | - rm -f $(LIBRARY_SO) |
eb78eecf | 78 | - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) |
d25a61e4 | 79 | + $(LIBTOOL) --mode=link --tag=CC $(LD) $(LDFLAGS) -version-info 5:0:0 -o $@ $^ $(LIBS) -lebml -rpath $(libdir) |
a2b44dd0 | 80 | |
81 | clean: cleantest | |
eb78eecf | 82 | rm -f $(objects) $(objects_so) |
e4805536 | 83 | @@ -129,19 +113,19 @@ |
b33caf87 | 84 | test: test6 test9 |
b57b5cf5 | 85 | |
eb78eecf | 86 | test6: test6.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 87 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
7a27e1a8 | 88 | + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
89 | |
90 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
a2e87a09 | 91 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 | 92 | |
eb78eecf | 93 | test8: test8.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 94 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
7a27e1a8 | 95 | + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
96 | |
97 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
a2e87a09 | 98 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
a2b44dd0 | 99 | |
eb78eecf | 100 | test9: test9.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 101 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
7a27e1a8 | 102 | + $(LIBTOOL) --mode=link --tag=CC $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
298a82c1 | 103 | |
104 | test9.o: $(TAG_SRC_DIR)test9.cpp | |
a2e87a09 | 105 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
e4805536 | 106 | @@ -149,27 +133,22 @@ |
127ac958 JB |
107 | ifeq (Darwin,$(shell uname -s)) |
108 | install: install_staticlib install_headers | |
109 | else | |
eb78eecf JB |
110 | -install: install_staticlib install_sharedlib install_headers |
111 | +install: install_lib install_headers | |
127ac958 | 112 | endif |
eb78eecf JB |
113 | |
114 | install_headers: | |
b57b5cf5 | 115 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) |
b57b5cf5 | 116 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) |
298a82c1 | 117 | for i in $(INCLUDE_DIR)/*.h; do \ |
b57b5cf5 JB |
118 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |
119 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ | |
120 | done | |
298a82c1 | 121 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c |
122 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c | |
123 | for i in $(INCLUDE_DIR)/c/*.h; do \ | |
124 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ | |
125 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ | |
b57b5cf5 JB |
126 | done |
127 | ||
eb78eecf JB |
128 | -install_staticlib: $(LIBRARY) |
129 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) | |
130 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) | |
131 | - | |
132 | -install_sharedlib: $(LIBRARY_SO) | |
133 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) | |
134 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) | |
6b3c9be1 | 135 | - ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) |
eb78eecf JB |
136 | +install_lib: $(LIBRARY) |
137 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) | |
138 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) | |
139 | ||
b33caf87 | 140 | ifneq ($(wildcard .depend),) |
eb78eecf | 141 | include .depend |