]>
Commit | Line | Data |
---|---|---|
127ac958 JB |
1 | --- libmatroska-0.7.7/make/linux/Makefile.orig 2005-04-19 09:00:00.000000000 +0200 |
2 | +++ libmatroska-0.7.7/make/linux/Makefile 2005-06-12 21:27:18.499321560 +0200 | |
b33caf87 | 3 | @@ -28,6 +28,7 @@ |
b57b5cf5 JB |
4 | INSTALL_OPTS = -m 644 |
5 | INSTALL_OPTS_LIB = -m 644 | |
6 | INSTALL_DIR_OPTS = -m 755 | |
7 | +LIBTOOL = libtool | |
8 | ||
b33caf87 JB |
9 | ifneq (,$(shell $(CXX) -v 2>&1 | tail -n 1 | grep -i mingw)) |
10 | $(error Please use the Makefile in ../mingw32) | |
11 | @@ -36,8 +37,8 @@ | |
a2b44dd0 | 12 | CWD=$(shell pwd) |
13 | ||
14 | # Options | |
298a82c1 | 15 | -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml |
a2b44dd0 | 16 | -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux |
b33caf87 JB |
17 | +LIBEBML_INCLUDE_DIR= |
18 | +LIBEBML_LIB_DIR= | |
a2b44dd0 | 19 | EXTENSION=.cpp |
20 | ||
298a82c1 | 21 | ifeq (yes,$(DEBUG)) |
eb78eecf | 22 | @@ -52,12 +53,10 @@ |
b57b5cf5 | 23 | # Librarires |
298a82c1 | 24 | INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR) |
b57b5cf5 JB |
25 | LIBS= |
26 | -MUX_LIBS=-lmatroska -lebml $(LIBICONV) | |
27 | +MUX_LIBS=libmatroska.la -lebml $(LIBICONV) | |
a2b44dd0 | 28 | |
29 | # Names | |
30 | -LIBRARY=libmatroska.a | |
eb78eecf JB |
31 | -LIBRARY_SO=libmatroska.so |
32 | -LIBRARY_SO_VER=libmatroska.so.0 | |
b57b5cf5 | 33 | +LIBRARY=libmatroska.la |
a2b44dd0 | 34 | |
35 | # source-files | |
36 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
eb78eecf | 37 | @@ -65,10 +64,8 @@ |
b33caf87 JB |
38 | # header files; replace .cxx extension with .h |
39 | headers:=$(patsubst %$(EXTENSION),%.h,$(sources)) | |
b57b5cf5 JB |
40 | |
41 | -# object files; replace .cxx extension with .o | |
42 | -objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) | |
eb78eecf JB |
43 | - |
44 | -objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
b57b5cf5 JB |
45 | +# object files; replace .cxx extension with .lo |
46 | +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
a2b44dd0 | 47 | |
a2e87a09 MC |
48 | WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ |
49 | -Wshadow | |
127ac958 JB |
50 | @@ -79,31 +76,19 @@ |
51 | ifeq (Darwin,$(shell uname -s)) | |
52 | all: staticlib | |
53 | else | |
eb78eecf | 54 | -all: staticlib sharedlib |
127ac958 JB |
55 | +all: $(LIBRARY) |
56 | endif | |
57 | ||
eb78eecf JB |
58 | -staticlib: $(LIBRARY) |
59 | - | |
60 | -sharedlib: $(LIBRARY_SO) | |
127ac958 | 61 | - |
eb78eecf JB |
62 | lib: |
63 | @echo "Use the 'staticlib', 'sharedlib' or 'all' targets." | |
64 | @false | |
a2b44dd0 | 65 | |
b57b5cf5 JB |
66 | # Build rules |
67 | -%.o: %$(EXTENSION) | |
a2e87a09 | 68 | - $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
eb78eecf JB |
69 | - |
70 | %.lo: %$(EXTENSION) | |
71 | - $(CXX) -c $(COMPILEFLAGS) -fPIC -o $@ $< | |
72 | + $(LIBTOOL) --mode=compile $(CXX) -c $(COMPILEFLAGS) -o $@ $< | |
a2b44dd0 | 73 | |
74 | $(LIBRARY): $(objects) | |
75 | - $(AR) $@ $(objects) | |
76 | - $(RANLIB) $@ | |
eb78eecf JB |
77 | - |
78 | -$(LIBRARY_SO): $(objects_so) | |
79 | - $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) -lebml | |
80 | - ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) | |
b57b5cf5 | 81 | + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) |
a2b44dd0 | 82 | |
83 | clean: cleantest | |
eb78eecf | 84 | rm -f $(objects) $(objects_so) |
127ac958 | 85 | @@ -131,19 +116,19 @@ |
b33caf87 | 86 | test: test6 test9 |
b57b5cf5 | 87 | |
eb78eecf | 88 | test6: test6.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 89 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
eb78eecf | 90 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
91 | |
92 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
a2e87a09 | 93 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 | 94 | |
eb78eecf | 95 | test8: test8.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 96 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
eb78eecf | 97 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
98 | |
99 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
a2e87a09 | 100 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
a2b44dd0 | 101 | |
eb78eecf | 102 | test9: test9.o $(LIBRARY) $(LIBRARY_SO) |
a2e87a09 | 103 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
eb78eecf | 104 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
298a82c1 | 105 | |
106 | test9.o: $(TAG_SRC_DIR)test9.cpp | |
a2e87a09 | 107 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
127ac958 JB |
108 | @@ -151,27 +136,22 @@ |
109 | ifeq (Darwin,$(shell uname -s)) | |
110 | install: install_staticlib install_headers | |
111 | else | |
eb78eecf JB |
112 | -install: install_staticlib install_sharedlib install_headers |
113 | +install: install_lib install_headers | |
127ac958 | 114 | endif |
eb78eecf JB |
115 | |
116 | install_headers: | |
b57b5cf5 | 117 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) |
b57b5cf5 | 118 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) |
298a82c1 | 119 | for i in $(INCLUDE_DIR)/*.h; do \ |
b57b5cf5 JB |
120 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |
121 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ | |
122 | done | |
298a82c1 | 123 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c |
124 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c | |
125 | for i in $(INCLUDE_DIR)/c/*.h; do \ | |
126 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ | |
127 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ | |
b57b5cf5 JB |
128 | done |
129 | ||
eb78eecf JB |
130 | -install_staticlib: $(LIBRARY) |
131 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) | |
132 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) | |
133 | - | |
134 | -install_sharedlib: $(LIBRARY_SO) | |
135 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) | |
136 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) | |
137 | - ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) | |
138 | +install_lib: $(LIBRARY) | |
139 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) | |
140 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) | |
141 | ||
b33caf87 | 142 | ifneq ($(wildcard .depend),) |
eb78eecf | 143 | include .depend |