]>
Commit | Line | Data |
---|---|---|
b57b5cf5 JB |
1 | --- libmatroska-0.4.4/make/linux/Makefile.orig 2003-06-13 20:53:15.000000000 +0200 |
2 | +++ libmatroska-0.4.4/make/linux/Makefile 2003-07-08 22:25:50.000000000 +0200 | |
3 | @@ -25,12 +25,13 @@ | |
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 | |
12 | -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml/src | |
13 | -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux | |
14 | +LIBEBML_INCLUDE_DIR= | |
15 | +LIBEBML_LIB_DIR= | |
16 | EXTENSION=.cpp | |
17 | ||
18 | SYSTEM := $(shell uname -s) | |
b57b5cf5 JB |
19 | @@ -51,10 +52,10 @@ |
20 | # Librarires | |
21 | INCLUDE=-I${SRC_DIR} -I$(LIBEBML_INCLUDE_DIR) | |
22 | LIBS= | |
23 | -MUX_LIBS=-lmatroska -lebml $(LIBICONV) | |
24 | +MUX_LIBS=libmatroska.la -lebml $(LIBICONV) | |
a2b44dd0 | 25 | |
26 | # Names | |
27 | -LIBRARY=libmatroska.a | |
b57b5cf5 | 28 | +LIBRARY=libmatroska.la |
a2b44dd0 | 29 | |
30 | # source-files | |
31 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
b57b5cf5 JB |
32 | @@ -65,24 +66,22 @@ |
33 | # files holding dependency information; replace .cxx extension with .dep | |
34 | dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources)) | |
35 | ||
36 | -# object files; replace .cxx extension with .o | |
37 | -objects:=$(patsubst %$(EXTENSION),%.o,$(sources)) | |
38 | +# object files; replace .cxx extension with .lo | |
39 | +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources)) | |
a2b44dd0 | 40 | |
41 | DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE} | |
42 | ||
43 | -all: $(LIBRARY) test | |
44 | +all: $(LIBRARY) | |
45 | ||
46 | lib library: $(LIBRARY) | |
47 | ||
b57b5cf5 JB |
48 | # Build rules |
49 | -%.o: %$(EXTENSION) | |
50 | - $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
51 | +%.lo: %$(EXTENSION) | |
52 | + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
a2b44dd0 | 53 | |
54 | $(LIBRARY): $(objects) | |
55 | - $(AR) $@ $(objects) | |
56 | - $(RANLIB) $@ | |
57 | -# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) | |
58 | -# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} | |
b57b5cf5 | 59 | + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -lebml -rpath $(libdir) |
a2b44dd0 | 60 | + |
61 | ||
62 | clean: cleantest | |
63 | rm -f $(objects) | |
b57b5cf5 JB |
64 | @@ -100,27 +99,27 @@ |
65 | test: test6 test8 | |
66 | ||
67 | test6: test6.o $(LIBRARY) | |
68 | - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
69 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
70 | ||
71 | test6.o: $(MUX_SRC_DIR)test6.cpp | |
72 | $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
73 | ||
74 | test8: test8.o $(LIBRARY) | |
75 | - $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
76 | + $(LIBTOOL) --mode=link $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS) | |
77 | ||
78 | test8.o: $(MUX_SRC_DIR)test8.cpp | |
79 | $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
a2b44dd0 | 80 | |
81 | install: $(LIBRARY) | |
b57b5cf5 | 82 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) |
a2b44dd0 | 83 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) |
b57b5cf5 JB |
84 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) |
85 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir) | |
86 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir) | |
87 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir) | |
a2b44dd0 | 88 | for i in $(SRC_DIR)/*.h; do \ |
b57b5cf5 JB |
89 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |
90 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \ | |
91 | done | |
92 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/api/c | |
93 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/api/c | |
94 | for i in $(SRC_DIR)/api/c/*.h; do \ | |
95 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/api/c ; \ | |
96 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/api/c ; \ | |
97 | done | |
98 | ||
99 | # DO NOT DELETE |