]>
Commit | Line | Data |
---|---|---|
2a79f7eb JB |
1 | --- dime-0.9.1/build/makefile.orig 1999-02-17 16:05:33.000000000 +0100 |
2 | +++ dime-0.9.1/build/makefile 2011-11-15 20:57:49.877780630 +0100 | |
3 | @@ -8,7 +8,7 @@ | |
4 | #**************************************************************** | |
5 | ||
6 | CC = g++ | |
7 | - LD = ar cqs | |
8 | + LD = $(CC) | |
9 | ||
10 | INCLUDE = -I../include | |
11 | OPT = -O2 | |
12 | @@ -17,7 +17,9 @@ | |
13 | WARN = | |
14 | CFLAGS = $(OPT) $(DEBUG) $(DEFINES) $(WARN) $(INCLUDE) -c | |
15 | ||
16 | - COMPILE = $(CC) $(CFLAGS) $^ -o $@ | |
17 | + COMPILE = libtool --mode=compile --tag=CXX $(CC) $(CFLAGS) $^ -o $(@:.o=.lo) | |
18 | + LIBDIR = /usr/lib | |
19 | + LINK = libtool --mode=link --tag=CXX $(LD) $(LDFLAGS) -rpath $(LIBDIR) -o | |
20 | ||
21 | TARGETS = libdime.a | |
22 | ||
23 | @@ -79,6 +81,8 @@ | |
24 | objs/UCSTable.o \ | |
25 | objs/LayerTable.o | |
26 | ||
27 | +LTOBJECTS=$(OBJECTS:%.o=%.lo) | |
28 | + | |
29 | #*************************************************************************** | |
30 | ||
31 | all:: $(TARGETS) | |
32 | @@ -89,8 +93,8 @@ | |
33 | objs: | |
34 | @mkdir $@ | |
35 | ||
36 | -libdime.a: objs $(OBJECTS) | |
37 | - $(LD) $@ $(OBJECTS) | |
38 | +libdime.la: objs $(OBJECTS) | |
39 | + $(LINK) $@ $(LTOBJECTS) | |
40 | ||
41 | #*************************************************************************** | |
42 |