]>
Commit | Line | Data |
---|---|---|
a2b44dd0 | 1 | --- libmatroska-0.4.4/make/linux/Makefile.dakh 2003-06-13 20:53:15.000000000 +0200 |
2 | +++ libmatroska-0.4.4/make/linux/Makefile 2003-06-29 19:08:02.000000000 +0200 | |
3 | @@ -29,8 +29,8 @@ | |
4 | CWD=$(shell pwd) | |
5 | ||
6 | # Options | |
7 | -LIBEBML_INCLUDE_DIR=$(CWD)/../../../libebml/src | |
8 | -LIBEBML_LIB_DIR=$(CWD)/../../../libebml/make/linux | |
9 | +LIBEBML_INCLUDE_DIR= | |
10 | +LIBEBML_LIB_DIR= | |
11 | EXTENSION=.cpp | |
12 | ||
13 | SYSTEM := $(shell uname -s) | |
14 | @@ -54,7 +54,7 @@ | |
15 | MUX_LIBS=-lmatroska -lebml $(LIBICONV) | |
16 | ||
17 | # Names | |
18 | -LIBRARY=libmatroska.a | |
19 | +LIBRARY=libmatroska | |
20 | ||
21 | # source-files | |
22 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION)) | |
23 | @@ -70,7 +70,7 @@ | |
24 | ||
25 | DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE} | |
26 | ||
27 | -all: $(LIBRARY) test | |
28 | +all: $(LIBRARY) | |
29 | ||
30 | lib library: $(LIBRARY) | |
31 | ||
32 | @@ -79,10 +79,10 @@ | |
33 | $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $< | |
34 | ||
35 | $(LIBRARY): $(objects) | |
36 | - $(AR) $@ $(objects) | |
37 | - $(RANLIB) $@ | |
38 | -# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) | |
39 | -# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS} | |
40 | + $(AR) $@.a $(objects) | |
41 | + $(RANLIB) $@.a | |
42 | + $(LD) $(LDFLAGS) -o $@.so $^ $(LIBS) | |
43 | + | |
44 | ||
45 | clean: cleantest | |
46 | rm -f $(objects) | |
47 | @@ -113,7 +113,8 @@ | |
48 | ||
49 | install: $(LIBRARY) | |
50 | $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) | |
51 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir) | |
52 | + $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY).a $(libdir) | |
53 | + $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY).so $(libdir) | |
54 | $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir) | |
55 | for i in $(SRC_DIR)/*.h; do \ | |
56 | $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \ |