]>
Commit | Line | Data |
---|---|---|
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 @@ | |
4 | INSTALL_OPTS = -m 644 | |
5 | INSTALL_OPTS_LIB = -m 644 | |
6 | INSTALL_DIR_OPTS = -m 755 | |
7 | +LIBTOOL = libtool | |
8 | ||
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 @@ | |
12 | CWD=$(shell pwd) | |
13 | ||
14 | # Options | |
15 | -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml | |
16 | -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux | |
17 | +LIBEBML_INCLUDE_DIR= | |
18 | +LIBEBML_LIB_DIR= | |
19 | EXTENSION=.cpp | |
20 | ||
21 | ifeq (yes,$(DEBUG)) | |
22 | @@ -52,10 +53,10 @@ | |
23 | # Librarires | |
24 | INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR) | |
25 | LIBS= | |
26 | -MUX_LIBS=-lmatroska -lebml $(LIBICONV) | |
27 | +MUX_LIBS=libmatroska.la -lebml $(LIBICONV) | |
28 | ||
29 | # Names | |
30 | -LIBRARY=libmatroska.a | |
31 | +LIBRARY=libmatroska.la | |
32 | ||
33 | # source-files | |
34 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
35 | @@ -63,8 +64,8 @@ | |
36 | # header files; replace .cxx extension with .h | |
37 | headers:=$(patsubst %$(EXTENSION),%.h,$(sources)) | |
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)) | |
43 | ||
44 | WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ | |
45 | -Wshadow | |
46 | @@ -77,12 +78,11 @@ | |
47 | lib library: $(LIBRARY) | |
48 | ||
49 | # Build rules | |
50 | -%.o: %$(EXTENSION) | |
51 | - $(CXX) -c $(COMPILEFLAGS) -o $@ $< | |
52 | +%.lo: %$(EXTENSION) | |
53 | + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
54 | ||
55 | $(LIBRARY): $(objects) | |
56 | - $(AR) $@ $(objects) | |
57 | - $(RANLIB) $@ | |
58 | + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) | |
59 | ||
60 | clean: cleantest | |
61 | rm -f $(objects) | |
62 | @@ -108,33 +108,33 @@ | |
63 | test: test6 test9 | |
64 | ||
65 | test6: test6.o $(LIBRARY) | |
66 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) | |
67 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
68 | ||
69 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
70 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< | |
71 | ||
72 | test8: test8.o $(LIBRARY) | |
73 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) | |
74 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
75 | ||
76 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
77 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< | |
78 | ||
79 | test9: test9.o $(LIBRARY) | |
80 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) | |
81 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
82 | ||
83 | test9.o: $(TAG_SRC_DIR)test9.cpp | |
84 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< | |
85 | ||
86 | install: $(LIBRARY) | |
87 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) | |
88 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) | |
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) | |
93 | for i in $(INCLUDE_DIR)/*.h; do \ | |
94 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ | |
95 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ | |
96 | done | |
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 ; \ | |
102 | done | |
103 | ||
104 | ifneq ($(wildcard .depend),) |