]>
Commit | Line | Data |
---|---|---|
5e030e2c JR |
1 | diff -urNad opal-2.1.3/opal_inc.mak.in /tmp/dpep.vc5Q70/opal-2.1.3/opal_inc.mak.in |
2 | --- opal-2.1.3/opal_inc.mak.in 2006-01-31 09:10:37.000000000 +0100 | |
3 | +++ /tmp/dpep.vc5Q70/opal-2.1.3/opal_inc.mak.in 2006-02-06 21:22:59.966232274 +0100 | |
4 | @@ -103,11 +103,11 @@ | |
5 | endif | |
6 | ||
7 | ||
8 | -OPAL_BASE = opal_$(PLATFORM_TYPE)_$(OPAL_SUFFIX) | |
9 | -OPAL_FILE = lib$(OPAL_BASE)$(LIB_TYPE).$(LIB_SUFFIX) | |
10 | +OPAL_BASE = opal | |
11 | +OPAL_FILE = lib$(OPAL_BASE).$(LIB_SUFFIX) | |
12 | ||
13 | LDFLAGS += -L$(OPAL_LIBDIR) | |
14 | -LDLIBS := -l$(OPAL_BASE)$(LIB_TYPE) $(LDLIBS) | |
15 | +LDLIBS := -l$(OPAL_BASE) $(LDLIBS) | |
16 | ||
17 | STDCCFLAGS += -I$(OPAL_INCDIR) | |
18 | ||
290c69ce JR |
19 | --- opal-2.2.1/Makefile.in~ 2006-02-01 23:45:40.000000000 +0100 |
20 | +++ opal-2.2.1/Makefile.in 2006-05-18 18:45:26.569385000 +0200 | |
21 | @@ -697,7 +697,7 @@ | |
22 | ifneq ($(P_SHAREDLIB),1) | |
23 | STATIC_LIB_FILE = $(LIBDIR)/$(OPAL_FILE) | |
24 | else | |
25 | - STATIC_LIB_FILE = $(LIBDIR)/$(subst .$(LIB_SUFFIX),_s.$(STATICLIBEXT),$(OPAL_FILE)) | |
c072fb2c | 26 | + STATIC_LIB_FILE = $(LIBDIR)/$(subst .$(LIB_SUFFIX),.$(STATICLIBEXT),$(OPAL_FILE)) |
290c69ce JR |
27 | endif |
28 | ||
29 | $(LIBDIR)/$(OPAL_FILE) : $(TARGETLIB) |