]>
Commit | Line | Data |
---|---|---|
a2e87a09 MC |
1 | --- libmatroska-0.7.4/make/linux/Makefile.orig 2004-07-19 18:43:44.000000000 +0200 |
2 | +++ libmatroska-0.7.4/make/linux/Makefile 2004-11-07 14:15:22.241711016 +0100 | |
3 | @@ -30,12 +30,14 @@ | |
b57b5cf5 JB |
4 | INSTALL_OPTS = -m 644 |
5 | INSTALL_OPTS_LIB = -m 644 | |
6 | INSTALL_DIR_OPTS = -m 755 | |
7 | +LIBTOOL = libtool | |
298a82c1 | 8 | + |
9 | +LIBEBML_INCLUDE_DIR= | |
10 | +LIBEBML_LIB_DIR= | |
b57b5cf5 | 11 | |
a2b44dd0 | 12 | CWD=$(shell pwd) |
13 | ||
14 | # Options | |
298a82c1 | 15 | -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml |
a2b44dd0 | 16 | -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux |
a2b44dd0 | 17 | EXTENSION=.cpp |
18 | ||
298a82c1 | 19 | ifeq (yes,$(DEBUG)) |
a2e87a09 | 20 | @@ -50,10 +52,10 @@ |
b57b5cf5 | 21 | # Librarires |
298a82c1 | 22 | INCLUDE=-I$(CWD)/../.. -I$(LIBEBML_INCLUDE_DIR) |
b57b5cf5 JB |
23 | LIBS= |
24 | -MUX_LIBS=-lmatroska -lebml $(LIBICONV) | |
25 | +MUX_LIBS=libmatroska.la -lebml $(LIBICONV) | |
a2b44dd0 | 26 | |
27 | # Names | |
28 | -LIBRARY=libmatroska.a | |
b57b5cf5 | 29 | +LIBRARY=libmatroska.la |
a2b44dd0 | 30 | |
31 | # source-files | |
32 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
a2e87a09 | 33 | @@ -64,8 +66,8 @@ |
b57b5cf5 JB |
34 | # files holding dependency information; replace .cxx extension with .dep |
35 | dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources)) | |
36 | ||
37 | -# object files; replace .cxx extension with .o | |
38 | -objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) | |
39 | +# object files; replace .cxx extension with .lo | |
40 | +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
a2b44dd0 | 41 | |
a2e87a09 MC |
42 | WARNINGFLAGS=-Wall -Wno-unknown-pragmas -ansi -fno-gnu-keywords -D_GNU_SOURCE \ |
43 | -Wshadow | |
44 | @@ -78,12 +80,11 @@ | |
a2b44dd0 | 45 | lib library: $(LIBRARY) |
46 | ||
b57b5cf5 JB |
47 | # Build rules |
48 | -%.o: %$(EXTENSION) | |
a2e87a09 | 49 | - $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 JB |
50 | +%.lo: %$(EXTENSION) |
51 | + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
a2b44dd0 | 52 | |
53 | $(LIBRARY): $(objects) | |
54 | - $(AR) $@ $(objects) | |
55 | - $(RANLIB) $@ | |
b57b5cf5 | 56 | + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) |
a2b44dd0 | 57 | |
58 | clean: cleantest | |
59 | rm -f $(objects) | |
a2e87a09 | 60 | @@ -101,33 +102,33 @@ |
298a82c1 | 61 | test: test6 test8 test9 |
b57b5cf5 JB |
62 | |
63 | test6: test6.o $(LIBRARY) | |
a2e87a09 MC |
64 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
65 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
b57b5cf5 JB |
66 | |
67 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
a2e87a09 | 68 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
b57b5cf5 JB |
69 | |
70 | test8: test8.o $(LIBRARY) | |
a2e87a09 | 71 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
b57b5cf5 JB |
72 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) |
73 | ||
74 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
a2e87a09 | 75 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
a2b44dd0 | 76 | |
298a82c1 | 77 | test9: test9.o $(LIBRARY) |
a2e87a09 | 78 | - $(LD) -o $@ $(LINKFLAGS) $< $(MUX_LIBS) |
298a82c1 | 79 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) |
80 | ||
81 | test9.o: $(TAG_SRC_DIR)test9.cpp | |
a2e87a09 | 82 | $(CXX) -c $(COMPILEFLAGS) -o $@ $< |
298a82c1 | 83 | |
a2b44dd0 | 84 | install: $(LIBRARY) |
b57b5cf5 | 85 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) |
a2b44dd0 | 86 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) |
b57b5cf5 JB |
87 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) |
88 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) | |
89 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) | |
90 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) | |
298a82c1 | 91 | for i in $(INCLUDE_DIR)/*.h; do \ |
b57b5cf5 JB |
92 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |
93 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ | |
94 | done | |
298a82c1 | 95 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c |
96 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c | |
97 | for i in $(INCLUDE_DIR)/c/*.h; do \ | |
98 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \ | |
99 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \ | |
b57b5cf5 JB |
100 | done |
101 | ||
102 | # DO NOT DELETE |