]>
Commit | Line | Data |
---|---|---|
4616b5fc | 1 | --- libebml/make/linux/Makefile.orig 2003-07-17 11:47:07.000000000 +0200 |
2 | +++ libebml/make/linux/Makefile 2003-09-02 15:18:20.727607600 +0200 | |
1e89c424 | 3 | @@ -25,6 +25,7 @@ |
faff9e67 JB |
4 | INSTALL_OPTS = -m 644\r |
5 | INSTALL_OPTS_LIB = -m 644\r | |
6 | INSTALL_DIR_OPTS = -m 755\r | |
7 | +LIBTOOL = libtool\r | |
8 | \r | |
9 | # Options\r | |
10 | EXTENSION=.cpp\r | |
4616b5fc | 11 | @@ -45,7 +46,7 @@ |
faff9e67 JB |
12 | LIBS=\r |
13 | \r | |
14 | # Names\r | |
15 | -LIBRARY=libebml.a\r | |
16 | +LIBRARY=libebml.la\r | |
17 | \r | |
18 | # source-files\r | |
19 | sources:=$(wildcard ${SRC_DIR}*$(EXTENSION))\r | |
4616b5fc | 20 | @@ -56,8 +57,8 @@ |
faff9e67 JB |
21 | # files holding dependency information; replace .cxx extension with .dep\r |
22 | dependencies:=$(patsubst %$(EXTENSION),%.dep,$(sources))\r | |
23 | \r | |
24 | -# object files; replace .cxx extension with .o\r | |
25 | -objects:=$(patsubst %$(EXTENSION),%.o,$(sources))\r | |
26 | +# object files; replace .cxx extension with .lo\r | |
27 | +objects:=$(patsubst %$(EXTENSION),%.lo,$(sources))\r | |
28 | \r | |
29 | DEPENDFLAGS = ${CXXFLAGS} ${INCLUDE}\r | |
30 | \r | |
4616b5fc | 31 | @@ -66,14 +67,12 @@ |
faff9e67 JB |
32 | lib library: $(LIBRARY)\r |
33 | \r | |
34 | # Build rules\r | |
35 | -%.o: %$(EXTENSION)\r | |
36 | - $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<\r | |
37 | +%.lo: %$(EXTENSION)\r | |
38 | + $(LIBTOOL) --mode=compile $(CXX) -c $(CXXFLAGS) $(INCLUDE) -o $@ $<\r | |
39 | \r | |
40 | $(LIBRARY): $(objects)\r | |
41 | - $(AR) $@ $(objects)\r | |
42 | - $(RANLIB) $@\r | |
43 | -# $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)\r | |
44 | -# ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}\r | |
45 | + $(LIBTOOL) --mode=link $(LD) $(LDFLAGS) -o $@ $^ $(LIBS) -rpath $(libdir)\r | |
46 | +\r | |
47 | \r | |
48 | clean:\r | |
49 | rm -f $(objects)\r | |
4616b5fc | 50 | @@ -86,15 +85,15 @@ |
faff9e67 JB |
51 | $(DEPEND) $(DEPENDFLAGS) $(sources)\r |
52 | \r | |
53 | install: $(LIBRARY)\r | |
54 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir)\r | |
55 | - $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY) $(libdir)\r | |
56 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)\r | |
57 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(libdir)\r | |
58 | + $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)\r | |
59 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)\r | |
60 | for i in $(INCLUDE_DIR)/*.h; do \\r | |
61 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir) ; \\r | |
62 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir) ; \\r | |
63 | done\r | |
64 | - $(INSTALL) $(INSTALL_DIR_OPTS) -d $(includedir)/c\r | |
65 | + $(INSTALL) $(INSTALL_DIR_OPTS) -d $(DESTDIR)$(includedir)/c\r | |
66 | for i in $(INCLUDE_DIR)/c/*.h; do \\r | |
67 | - $(INSTALL) $(INSTALL_OPTS) $$i $(includedir)/c ; \\r | |
68 | + $(INSTALL) $(INSTALL_OPTS) $$i $(DESTDIR)$(includedir)/c ; \\r | |
69 | done\r | |
70 | \r | |
71 | # DO NOT DELETE\r |