blob: f051f7a46bb23769a6d9fe9296e993739b4d2a88 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:18 agc Exp $
--- client/Makefile.in.orig Tue Jun 30 08:14:37 1998
+++ client/Makefile.in Fri Jul 17 12:20:34 1998
@@ -42,8 +42,8 @@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = $(LIBTOOL) --mode=install @INSTALL_PROGRAM@
+INSTALL_DATA = $(LIBTOOL) --mode=install @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
@@ -115,21 +115,21 @@
mystrings_charset = @mystrings_charset@
perl_dirs = @perl_dirs@
readline_dir = @readline_dir@
-readline_link = @readline_link@
+readline_link = ../readline/libreadline.a
server_scripts = @server_scripts@
sql_server_dirs = @sql_server_dirs@
INCLUDES = -I$(srcdir)/../include -I../include \
-I$(srcdir)/.. -I$(top_srcdir) -I..
LIBS = @CLIENT_LIBS@
-LDADD = -L. -lmysqlclient
-pkglib_LIBRARIES = libmysqlclient.a
-LIBFILES = libmysqlclient.a @shlib@
+LDADD = libmysqlclient.la
+pkglib_LIBRARIES = libmysqlclient.la
+LIBFILES = libmysqlclient.la
bin_PROGRAMS = mysql mysqladmin mysqlshow mysqldump mysqlimport
noinst_PROGRAMS = insert_test select_test
noinst_HEADERS = sql_string.h completion_hash.h
mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc
-mysql_LDADD = @readline_link@ @TERMCAP_LIB@ $(LDADD)
+mysql_LDADD = $(readline_link) @TERMCAP_LIB@ $(LDADD)
mysql_DEPENDENCIES= $(LIBRARIES)
mysqladmin_DEPENDENCIES= $(LIBRARIES)
mysqlshow_DEPENDENCIES= $(LIBRARIES)
@@ -218,10 +218,10 @@
select_test_LDFLAGS =
CXXFLAGS = @CXXFLAGS@
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
-CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
HEADERS = $(noinst_HEADERS)
DIST_COMMON = Makefile.am Makefile.in
@@ -265,12 +265,6 @@
else :; fi; \
done
@$(POST_INSTALL)
- @list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(RANLIB) $(pkglibdir)/$$p"; \
- $(RANLIB) $(pkglibdir)/$$p; \
- else :; fi; \
- done
uninstall-pkglibLIBRARIES:
$(NORMAL_UNINSTALL)
@@ -291,10 +285,9 @@
maintainer-clean-compile:
-libmysqlclient.a: $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_DEPENDENCIES)
- rm -f libmysqlclient.a
- $(AR) cru libmysqlclient.a $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_LIBADD)
- $(RANLIB) libmysqlclient.a
+libmysqlclient.la: $(libmysqlclient_a_OBJECTS) $(libmysqlclient_a_DEPENDENCIES)
+ $(LIBTOOL) --mode=link $(CC) -o libmysqlclient.la $(libmysqlclient_a_OBJECTS:.o=.lo) $(libmysqlclient_a_LIBADD:.o=.lo) \
+ -rpath $(prefix)/lib -version-info 321:33
mostlyclean-binPROGRAMS:
|
