← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libmysql/Makefile.am

First stab at back porting libtool convenience lib patch from telco-6.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmysql/Makefile.am
27
27
pkglib_LTLIBRARIES = libmysqlclient.la
28
28
libmysqlclient_la_SOURCES = libmysql.c password.c get_password.c errmsg.c
29
29
libmysqlclient_la_LIBADD = ${sql_cmn_objects} ${vio_objects} ${sqlobjects} \
30
 
                           ${top_builddir}/mysys/libmysyslt.la \
 
30
                           ${top_builddir}/mysys/libmysys.la \
31
31
                           ${top_builddir}/strings/libmystringslt.la \
32
 
                           ${top_builddir}/dbug/libdbuglt.la
 
32
                           ${top_builddir}/dbug/libdbug.la
33
33
libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ @LD_VERSION_SCRIPT@ 
34
34
 
35
35
DEFS =                  -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
72
72
               $(mysysheaders) $(vioheaders) \
73
73
               net.c
74
74
 
 
75
noinst_PROGRAMS = conf_to_src
 
76
conf_to_src_SOURCES = conf_to_src.c
 
77
conf_to_src_LDADD=
 
78
#force static linking of conf_to_src - essential when linking against
 
79
#custom installation of libc
 
80
conf_to_src_LDFLAGS=
 
81
 
 
82
 
75
83
link_sources:
76
84
          set -x; \
77
85
          ds=`echo $(dbugobjects) | sed "s;\.lo;.c;g"`; \