]>
Commit | Line | Data |
---|---|---|
b33caf87 JB |
1 | --- libmatroska-0.7.5/make/linux/Makefile.orig 2005-02-06 19:12:08.000000000 +0100 |
2 | +++ libmatroska-0.7.5/make/linux/Makefile 2005-02-27 20:16:53.467608880 +0100 | |
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)) |
b33caf87 | 22 | @@ -52,10 +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 | |
b57b5cf5 | 31 | +LIBRARY=libmatroska.la |
a2b44dd0 | 32 | |
33 | # source-files | |
34 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
b33caf87 JB |
35 | @@ -63,8 +64,8 @@ |
36 | # header files; replace .cxx extension with .h | |
37 | headers:=$(patsubst %$(EXTENSION),%.h,$(sources)) | |
b57b5cf5 JB |
38 | |
39 | -# object files; replace .cxx extension with .o | |
40 | -objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) | |
41 | +# object files; replace .cxx extension with .lo | |
42 | +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
a2b44dd0 | 43 | |
a2e87a09 MC |
44 | WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ |
45 | -Wshadow | |
b33caf87 | 46 | @@ -77,12 +78,11 @@ |
a2b44dd0 | 47 | lib library: $(LIBRARY) |
48 | ||
b57b5cf5 JB |
49 | # Build rules |
50 | -%.o: %$(EXTENSION) | |
a2e87a09 | 51 | - $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 JB |
52 | +%.lo: %$(EXTENSION) |
53 | + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
a2b44dd0 | 54 | |
55 | $(LIBRARY): $(objects) | |
56 | - $(AR) $@ $(objects) | |
57 | - $(RANLIB) $@ | |
b57b5cf5 | 58 | + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) |
a2b44dd0 | 59 | |
60 | clean: cleantest | |
61 | rm -f $(objects) | |
b33caf87 JB |
62 | @@ -108,33 +108,33 @@ |
63 | test: test6 test9 | |
b57b5cf5 JB |
64 | |
65 | test6: test6.o $(LIBRARY) | |
a2e87a09 MC |
66 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
67 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
b57b5cf5 JB |
68 | |
69 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
a2e87a09 | 70 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 JB |
71 | |
72 | test8: test8.o $(LIBRARY) | |
a2e87a09 | 73 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
74 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) |
75 | ||
76 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
a2e87a09 | 77 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
a2b44dd0 | 78 | |
298a82c1 | 79 | test9: test9.o $(LIBRARY) |
a2e87a09 | 80 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
298a82c1 | 81 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) |
82 | ||
83 | test9.o: $(TAG_SRC_DIR)test9.cpp | |
a2e87a09 | 84 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
298a82c1 | 85 | |
a2b44dd0 | 86 | install: $(LIBRARY) |
b57b5cf5 | 87 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) |
a2b44dd0 | 88 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) |
b57b5cf5 JB |
89 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) |
90 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) | |
91 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) | |
92 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) | |
298a82c1 | 93 | for i in $(INCLUDE_DIR)/*.h; do \ |
b57b5cf5 JB |
94 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |
95 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ | |
96 | done | |
298a82c1 | 97 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c |
98 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c | |
99 | for i in $(INCLUDE_DIR)/c/*.h; do \ | |
100 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ | |
101 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ | |
b57b5cf5 JB |
102 | done |
103 | ||
b33caf87 | 104 | ifneq ($(wildcard .depend),) |