Lines 1-11
Link Here
|
1 |
--- Makefile.in.orig Wed Jun 15 12:21:14 2005 |
1 |
--- Makefile.in.orig Fri May 4 23:46:57 2007 |
2 |
+++ Makefile.in Wed Jun 15 12:23:48 2005 |
2 |
+++ Makefile.in Sun Oct 21 03:00:51 2007 |
3 |
@@ -5,8 +5,10 @@ |
3 |
@@ -5,8 +5,10 @@ |
4 |
prefix = @prefix@ |
4 |
prefix = @prefix@ |
5 |
exec_prefix = @exec_prefix@ |
5 |
exec_prefix = @exec_prefix@ |
6 |
VPATH = @srcdir@ |
6 |
VPATH = @srcdir@ |
7 |
-LIBTOOL = ./libtool |
7 |
-LIBTOOL = ./libtool |
8 |
+LIBTOOL? = ./libtool |
8 |
+LIBTOOL = @LIBTOOL@ |
9 |
INSTALL = @INSTALL@ |
9 |
INSTALL = @INSTALL@ |
10 |
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
10 |
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
11 |
+INSTALL_DATA = @INSTALL_DATA@ |
11 |
+INSTALL_DATA = @INSTALL_DATA@ |
Lines 30-35
Link Here
|
30 |
CXXFLAGS = @CXXFLAGS@ $(DEFS) |
30 |
CXXFLAGS = @CXXFLAGS@ $(DEFS) |
31 |
CFLAGS = @CFLAGS@ $(DEFS) |
31 |
CFLAGS = @CFLAGS@ $(DEFS) |
32 |
LD = $(CXX) |
32 |
LD = $(CXX) |
|
|
33 |
@@ -70,7 +72,7 @@ |
34 |
|
35 |
$(GB_LIB): $(OBJS) |
36 |
# Coment this for AIX/xlC 5.0 |
37 |
- $(LIBTOOL) --mode=link $(CXX) -o $@ $(OBJS) $(LDFLAGS) @LTHREADSLIB@ -rpath $(libdir) -version-info $(VERSION) |
38 |
+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(OBJS) $(LDFLAGS) -rpath $(libdir) -version-info $(VERSION) |
39 |
# Uncoment this for AIX/xlC 5.0 |
40 |
# mkdir .libs |
41 |
# xlC_r -qmkshrobj=-10 -o .libs/gigabase.so $(OBJS) |
42 |
@@ -80,7 +82,7 @@ |
43 |
|
44 |
$(CLI_LIB): $(CLI_OBJS) |
45 |
# Coment this for AIX/xlC 5.0 |
46 |
- $(LIBTOOL) --mode=link $(CXX) -o $@ $(CLI_OBJS) $(LDFLAGS) @LTHREADSLIB@ -rpath $(libdir) -version-info $(VERSION) |
47 |
+ $(LIBTOOL) --mode=link $(CXX) -o $@ $(CLI_OBJS) $(LDFLAGS) -rpath $(libdir) -version-info $(VERSION) |
48 |
# Uncoment this for AIX/xlC 5.0 |
49 |
# xlC_r -qmkshrobj=-10 -o .libs/cli.so $(CLI_OBJS) |
50 |
# ar rv .libs/libcli_r.a .libs/cli.so |
33 |
@@ -146,14 +148,14 @@ |
51 |
@@ -146,14 +148,14 @@ |
34 |
|
52 |
|
35 |
install: subsql $(GB_LIB) $(CLI_LIB) |
53 |
install: subsql $(GB_LIB) $(CLI_LIB) |