Change the behavior of --enable-thread-safe-client. It now builds

both a non-threaded libmysqlclient and a threaded libmysqlclient_r.


Makefile.am:
  - build libmysqlclient_r in a separate directory
include/global.h:
  - build libmysqlclient_r in a separate directory
libmysql/Makefile.am:
  - build libmysqlclient_r in a separate directory

1 files changed, 9 insertions, 70 deletions

diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index 2e04b33a72a..c67aebc10c9 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -17,60 +17,15 @@
 
 # This file is public domain and comes with NO WARRANTY of any kind
 
-MYSQLDATAdir =			$(localstatedir)
-MYSQLSHAREdir =			$(pkgdatadir)
-MYSQLBASEdir=			$(prefix)
-INCLUDES =			-I$(srcdir)/../include -I../include \
-				-I$(srcdir)/.. -I$(top_srcdir) -I..
-LIBS =				@CLIENT_LIBS@
-LDADD =				@CLIENT_EXTRA_LDFLAGS@ libmysqlclient.la
-pkglib_LTLIBRARIES =		libmysqlclient.la
+target = libmysqlclient.la
+target_defs = -DUNDEF_THREADS_HACK
+LIBS   = @CLIENT_LIBS@
 
-noinst_PROGRAMS = conf_to_src
+include $(srcdir)/Makefile.shared
 
-# We need .lo, not .o files for everything.
-CHARSET_OBJS=@CHARSET_OBJS@
-LTCHARSET_OBJS= ${CHARSET_OBJS:.o=.lo}
-
-libmysqlclient_la_SOURCES = libmysql.c net.c violite.c password.c \
-			    get_password.c errmsg.c
-
-mystringsobjects =	strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \
-			strnlen.lo strfill.lo is_prefix.lo \
-			int2str.lo str2int.lo strinstr.lo strcont.lo \
-			strcend.lo \
-			bchange.lo bmove.lo bmove_upp.lo longlong2str.lo \
-			strtoull.lo strtoll.lo llstr.lo strto.lo \
-			ctype.lo $(LTCHARSET_OBJS)
-mystringsextra= 	strto.c ctype_autoconf.c
-dbugobjects =		dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo
-mysysheaders =		mysys_priv.h my_static.h
-mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
-			my_create.lo my_delete.lo my_tempnam.lo my_open.lo \
-			mf_casecnv.lo my_read.lo my_write.lo errors.lo \
-			my_error.lo my_getwd.lo my_div.lo \
-			mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo\
-			mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo \
-			mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo \
-			mf_loadpath.lo my_pthread.lo my_thr_init.lo \
-			thr_mutex.lo mulalloc.lo string.lo default.lo \
-			my_compress.lo array.lo my_once.lo list.lo my_net.lo \
-                        charset.lo
-# Not needed in the minimum library
-mysysobjects2 =		getopt.lo getopt1.lo getvar.lo my_lib.lo
-mysysobjects =		$(mysysobjects1) $(mysysobjects2)
-libmysqlclient_la_LIBADD = $(mysysobjects) $(mystringsobjects) $(dbugobjects)
-libmysqlclient_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
-CLEANFILES =		$(libmysqlclient_la_LIBADD) $(SHLIBOBJS) \
-			libmysqclient.la
-DEFS =			-DUNDEF_THREADS_HACK \
-			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-			-DDATADIR="\"$(MYSQLDATAdir)\"" \
-			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-
-# The automatic dependencies miss this
-bmove_upp.lo:		$(LTCHARSET_OBJS)
-ctype.c:		ctype_extra_sources.c
+libmysqlclient_la_SOURCES = $(target_sources)
+libmysqlclient_la_LIBADD = $(target_libadd)
+libmysqlclient_la_LDFLAGS = $(target_ldflags)
 
 # This is called from the toplevel makefile
 link_sources:
@@ -95,19 +50,6 @@ link_sources:
 	    @LN_CP_F@ $(srcdir)/../mysys/$$f $(srcdir)/$$f; \
 	  done;
 
-clean-local:
-	rm -f `echo $(mystringsobjects) | sed "s;\.lo;.c;g"` \
-	      `echo $(dbugobjects) | sed "s;\.lo;.c;g"` \
-	      `echo $(mysysobjects) | sed "s;\.lo;.c;g"` \
-	       $(mystringsextra) ctype_extra_sources.c \
-	       ../linked_client_sources
-
-ctype_extra_sources.c: conf_to_src
-	./conf_to_src $(top_srcdir) @CHARSETS_NEED_SOURCE@ > \
-	              $(srcdir)/ctype_extra_sources.c
-conf_to_src_SOURCES = conf_to_src.c
-conf_to_src_LDADD=
-
 # This part requires GNUmake
 #
 # This makes a distribution file with only the files needed to compile
@@ -128,10 +70,10 @@ lobjs = $(mysysobjects1) $(dbugobjects) $(mystringsobjects)
 do-lib-dist:
 	dir=libmysql-$(MYSQL_NO_DASH_VERSION); \
 	srcs1=`echo $(lobjs) | sed "s;\.lo;.c;g"`; \
-	srcs2=$(libmysqlclient_la_SOURCES); \
+	srcs2=$(target_sources); \
 	srcs="$$srcs1 $$srcs2"; \
 	objs1=`echo $(lobjs) | sed "s;\.lo;.o;g"`; \
-	objs2=`echo $(libmysqlclient_la_SOURCES) | sed "s;\.c;.o;g"`; \
+	objs2=`echo $(target_sources) | sed "s;\.c;.o;g"`; \
 	objs="$$objs1 $$objs2"; \
 	rm -rf $$dir; \
 	mkdir $$dir; \
@@ -147,6 +89,3 @@ do-lib-dist:
 	echo '	$$(AR) r $$@ $$?'  >>$$dir/Makefile; \
 	gtar cvzf $$dir.tar.gz $$dir; \
 	cd $$dir; gmake
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%