Attachment #245794 for bug #306315

View | Details | Raw Unified | Return to bug 306315
Collapse All | Expand All




mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
				@CLIENT_EXTRA_LDFLAGS@ \
				$(LIBMYSQLCLIENT_LA) \
				$(top_builddir)/mysys/libmysys.la

mysqlshow_SOURCES=		mysqlshow.c


mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
				@CLIENT_EXTRA_LDFLAGS@ \
				$(LIBMYSQLCLIENT_LA) \
				$(top_builddir)/mysys/libmysys.la

mysqltest_SOURCES=		mysqltest.cc
mysqltest_CXXFLAGS=		-DTHREAD -UMYSQL_CLIENT_NO_THREADS
mysqltest_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
				@CLIENT_EXTRA_LDFLAGS@ \
				$(LIBMYSQLCLIENT_LA) \
				$(top_builddir)/mysys/libmysys.la \
				$(top_builddir)/regex/libregex.la \
				$(CLIENT_THREAD_LIBS)

mysql_upgrade_SOURCES=          mysql_upgrade.c \





dnl This probably should be cleaned up more - for now the threaded
dnl client is just using plain-old libs.
sql_client_dirs="strings regex dbug mysys extra libmysql"

AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")


AC_SUBST(netware_dir)
AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")

AM_CONDITIONAL([NEED_THREADS], [test x"$with_server" != xno -o x"$THREAD_SAFE_CLIENT" != xno])
if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
then
  AC_DEFINE([THREAD], [1],
            [Define if you want to have threaded code. This may be undef on client code])
  # Avoid _PROGRAMS names
  THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
  AC_SUBST(THREAD_LOBJECTS)
fi
AM_CONDITIONAL(NEED_THREAD, test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no")

if test "$with_server" != "no"
then
  server_scripts="mysqld_safe mysql_install_db"
  sql_server_dirs="strings dbug mysys extra regex storage plugin"

  sql_server="vio sql"
fi




# MA 02111-1307, USA

INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
LDADD =                 ../mysys/libmysys.la ../strings/libmystrings.la
noinst_LTLIBRARIES =    libdbug.la
noinst_HEADERS =        dbug_long.h
libdbug_la_SOURCES =     dbug.c sanity.c
EXTRA_DIST =            CMakeLists.txt example1.c example2.c example3.c \
                        user.r monty.doc dbug_add_tags.pl \
                        my_main.c main.c factorial.c dbug_analyze.c \



# Must be linked with libs that are not compiled yet
EXTRA_PROGRAMS =        factorial dbug_analyze
factorial_SOURCES =     my_main.c factorial.c
dbug_analyze_SOURCES =  dbug_analyze.c

check-local:            user.t user.ps

user.t:         user.r $(NROFF_INC)
		-nroff -mm user.r > $@

Lines 15-22 Link Here

(-)../mysql-5.1.50/extra/Makefile.am (-2 / +2 lines)
15		15
16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \	16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
17	-I$(top_srcdir)/sql	17	-I$(top_srcdir)/sql
18	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \	18	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \
19	../dbug/libdbug.a ../strings/libmystrings.a \	19	../dbug/libdbug.la ../strings/libmystrings.la \
20	$(ZLIB_LIBS)	20	$(ZLIB_LIBS)
21	BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \	21	BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \
22	$(top_builddir)/include/sql_state.h \	22	$(top_builddir)/include/sql_state.h \

Lines 106-113 Link Here

(-)../mysql-5.1.50/libmysql/Makefile.am (-2 / +2 lines)
106	echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \	106	echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \
107	echo 'CFLAGS= -I. -DMYSQL_CLIENT_NO_THREADS' >>$$dir/Makefile; \	107	echo 'CFLAGS= -I. -DMYSQL_CLIENT_NO_THREADS' >>$$dir/Makefile; \
108	echo "obj=$$objs" >>$$dir/Makefile; \	108	echo "obj=$$objs" >>$$dir/Makefile; \
109	echo 'all: libmysql.a' >>$$dir/Makefile; \	109	echo 'all: libmysql.la' >>$$dir/Makefile; \
110	echo 'libmysql.a: $$(obj)' >>$$dir/Makefile; \	110	echo 'libmysql.la: $$(obj)' >>$$dir/Makefile; \
111	echo ' $$(AR) r $$@ $$?' >>$$dir/Makefile; \	111	echo ' $$(AR) r $$@ $$?' >>$$dir/Makefile; \
112	gtar cvzf $$dir.tar.gz $$dir; \	112	gtar cvzf $$dir.tar.gz $$dir; \
113	cd $$dir; gmake	113	cd $$dir; gmake




		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
		$(openssl_includes)
LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
                @NDB_SCI_LIBS@ $(top_builddir)/libmysql/libmysqlclient.la

mysqltest_embedded_LINK = $(CXXLINK)
nodist_mysqltest_embedded_SOURCES =	mysqltest.cc
mysqltest_embedded_LDADD =	$(LDADD) $(top_builddir)/regex/libregex.la \
				@MYSQLD_EXTRA_LDFLAGS@
mysqltest_embedded_LDFLAGS = -static

nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
                my_readline.h sql_string.h completion_hash.h


mysql_client_test_embedded_LINK = $(CXXLINK)
nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
mysql_client_test_embedded_LDFLAGS = -static

# Don't update the files from bitkeeper
%::SCCS/s.%




			$(openssl_includes) @ZLIB_INCLUDES@ \
			@condition_dependent_plugin_includes@

noinst_LTLIBRARIES =	libmysqld_int.la
pkglib_LTLIBRARIES =	libmysqld.la
SUBDIRS =		. examples
libmysqld_sources=	libmysqld.c lib_sql.cc emb_qcache.cc
libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \

	rpl_injector.cc my_user.c partition_info.cc \
	sql_servers.cc event_parse_data.cc

nodist_libmysqld_int_la_SOURCES= $(libmysqlsources) $(sqlsources)
libmysqld_la_SOURCES=$(libmysqld_sources)
libmysqld_a_SOURCES=

sqlstoragesources =	$(EXTRA_libmysqld_la_SOURCES)
storagesources = @condition_dependent_plugin_modules@
storageobjects = @condition_dependent_plugin_objects@
storagesourceslinks = @condition_dependent_plugin_links@

# automake misses these
sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy

# The following libraries should be included in libmysqld.la
libmysqld_la_LIBADD=	$(top_builddir)/regex/libregex.la \
		$(top_builddir)/mysys/libmysys.la \
		$(top_builddir)/strings/libmystrings.la \
		$(top_builddir)/dbug/libdbug.la \
		$(top_builddir)/vio/libvio.la \
		@NDB_SCI_LIBS@ \
		@mysql_plugin_libs@ \
		$(yassl_inc_libs) \
		libmysqld_int.la

if HAVE_YASSL
yassl_inc_libs=	$(top_builddir)/extra/yassl/src/libyassl.la \
		$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
endif

# Storage engine specific compilation options

ha_myisammrg.o:ha_myisammrg.cc
		$(CXXCOMPILE) $(LM_CFLAGS) -c $<

#
# To make it easy for the end user to use the embedded library we
# generate a total libmysqld.a from all library files,

# note - InnoDB libraries have circular dependencies, so in INC_LIB
# few libraries are present two times. Metrowerks linker doesn't like
# it at all. Traditional ar has no problems with it, but still there's no
# need to add the same file twice to the library, so 'sort -u' save us
# some time and spares unnecessary work.

libmysqld.a:	libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects)
if DARWIN_MWCC
	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` $(storageobjects)
else
		-rm -f libmysqld.a
		if test "$(host_os)" = "netware" ; \
		then \
		  $(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \
		else \
		  current_dir=`pwd`; \
		  rm -rf tmp; mkdir tmp; \
		  (for arc in $(INC_LIB) ./libmysqld_int.a; do \
		    arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \
		    artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \
		    for F in `$(AR) t $$arc | grep -v SYMDEF`; do \
		      if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
		      mkdir $$artmp; cd $$artmp > /dev/null; \
		      $(AR) x ../../$$arc; \
		      cd $$current_dir > /dev/null; \
		      ls $$artmp/* | grep -v SYMDEF; \
		      continue 2; fi; done; \
		  done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \
		  $(AR) r libmysqld.a $(storageobjects); \
		  $(RANLIB) libmysqld.a	; \
		  rm -rf tmp; \
		fi
endif

## XXX: any time the client interface changes, we'll need to bump
## the version info for libmysqld; however, it's possible for the
## libmysqld interface to change without affecting the standard
## libmysqlclient interface.  Should we make a separate version
## string for the two?
libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
CLEANFILES =		$(libmysqld_la_LIBADD) libmysqld.la

BUILT_SOURCES = link_sources





MYSQLBASEdir=		$(prefix)
INCLUDES =		@ZLIB_INCLUDES@ -I$(top_builddir)/include \
			-I$(top_srcdir)/include -I$(srcdir)
pkglib_LTLIBRARIES =	libmysys.la
LDADD =			libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
noinst_HEADERS =	mysys_priv.h my_static.h my_handler_errors.h
libmysys_la_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
			mf_path.c mf_loadpath.c my_file.c \
			my_open.c my_create.c my_dup.c my_seek.c my_read.c \
			my_pread.c my_write.c my_getpagesize.c \

			my_quick.c my_lockmem.c my_static.c \
			my_sync.c my_getopt.c my_mkdir.c \
			default_modify.c default.c \
			my_compress.c checksum.c \
			my_net.c my_port.c my_sleep.c \
			charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
			my_gethostbyname.c rijndael.c my_aes.c sha1.c \

			my_memmem.c stacktrace.c \
			my_windac.c my_access.c base64.c my_libwrap.c

libmysys_la_LIBADD = $(top_builddir)/dbug/libdbug.la $(top_builddir)/strings/libmystrings.la \
			$(ZLIB_LIBS)
if NEED_THREAD
# mf_keycache is used only in the server, so it is safe to leave the file
# out of the non-threaded library.
# In fact, it will currently not compile without thread support.
libmysys_la_SOURCES +=  thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c my_pthread.c my_thr_init.c mf_keycache.c
endif

EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
			thr_mutex.c thr_rwlock.c \
			CMakeLists.txt mf_soundex.c \
			my_conio.c my_wincond.c my_winthread.c
# test_dir_DEPENDENCIES=	$(LTLIBRARIES)
# testhash_DEPENDENCIES=	$(LTLIBRARIES)
# test_charset_DEPENDENCIES=	$(LTLIBRARIES)
# charset2html_DEPENDENCIES=	$(LTLIBRARIES)
# charset2html_DEPENDENCIES=	$(LIBRARIES)
DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
			-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \

			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
                        @DEFS@

libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@

# I hope this always does the right thing. Otherwise this is only test programs
FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@


# which automaticly removes the object files you use to compile a final program
#

test_bitmap$(EXEEXT): my_bitmap.c $(LTLIBRARIES)
	$(LINK) $(FLAGS) -DMAIN  ./my_bitmap.c $(LDADD) $(LIBS)

test_priority_queue$(EXEEXT): queues.c $(LTLIBRARIES)
	$(LINK) $(FLAGS) -DMAIN  ./queues.c $(LDADD) $(LIBS)

test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES)
	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
	$(LINK) $(FLAGS) -DMAIN  ./test_thr_alarm.c $(LDADD) $(LIBS)
	$(RM) -f ./test_thr_alarm.c

test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES)
	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
	$(LINK) $(FLAGS) -DMAIN  ./test_thr_lock.c $(LDADD) $(LIBS)
	$(RM) -f ./test_thr_lock.c

test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES)
	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
	$(RM) -f test_vsnprintf.c

test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES)
	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
	$(RM) -f test_io_cache.c

test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES)
	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)

test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES)
	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)

testhash$(EXEEXT): testhash.c $(LTLIBRARIES)
	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)

test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)

	$(LINK) $(FLAGS) -DMAIN  ./test_gethwaddr.c $(LDADD) $(LIBS)
	$(RM) -f ./test_gethwaddr.c

test_base64$(EXEEXT): base64.c $(LTLIBRARIES)
	$(CP) $(srcdir)/base64.c ./test_base64.c
	$(LINK) $(FLAGS) -DMAIN  ./test_base64.c $(LDADD) $(LIBS)
	$(RM) -f ./test_base64.c





if HAVE_NETWARE
INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include -I..
LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la
				../dbug/libdbug.a ../strings/libmystrings.a
bin_PROGRAMS =			mysqld_safe mysql_install_db mysql_test_run libmysql
mysqld_safe_SOURCES=		mysqld_safe.c my_manage.c
mysql_install_db_SOURCES=	mysql_install_db.c my_manage.c
mysql_test_run_SOURCES=		mysql_test_run.c my_manage.c
libmysql_SOURCES=		libmysqlmain.c
libmysql_LDADD =		../libmysql/.libs/libmysqlclient.la \
				@openssl_libs@ @yassl_libs@

netware_build_files =           client/mysql.def client/mysqladmin.def \

Lines 22-29 Link Here

(-)../mysql-5.1.50/pstack/Makefile.am (-2 / +2 lines)
22		22
23	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	23	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
24		24
25	pkglib_LIBRARIES = libpstack.a	25	pkglib_LTLIBRARIES = libpstack.la
26	libpstack_a_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c \	26	libpstack_la_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c \
27	debug.c ieee.c pstack.c stabs.c	27	debug.c ieee.c pstack.c stabs.c
28	noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \	28	noinst_HEADERS = bucomm.h debug.h ieee.h budbg.h demangle.h \
29	linuxthreads.h pstack.h pstacktrace.h	29	linuxthreads.h pstack.h pstacktrace.h

Lines 16-25 Link Here

(-)../mysql-5.1.50/regex/Makefile.am (-3 / +3 lines)
16	# MA 02111-1307, USA	16	# MA 02111-1307, USA
17		17
18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
19	noinst_LIBRARIES = libregex.a	19	pkglib_LTLIBRARIES = libregex.la
20	LDADD= libregex.a $(top_builddir)/strings/libmystrings.a	20	LDADD= libregex.la $(top_builddir)/strings/libmystrings.la
21	noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h	21	noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c my_regex.h
22	libregex_a_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c	22	libregex_la_SOURCES = regerror.c regcomp.c regexec.c regfree.c reginit.c
23	noinst_PROGRAMS = re	23	noinst_PROGRAMS = re
24	re_SOURCES = split.c debug.c main.c	24	re_SOURCES = split.c debug.c main.c
25	re_LDFLAGS= @NOINST_LDFLAGS@	25	re_LDFLAGS= @NOINST_LDFLAGS@




# default_options.h, generated from default_options.h.in)
# See automake/autoconf docs for details

noinst_LTLIBRARIES= liboptions.la libnet.la
noinst_LIBRARIES=   libnet.a

liboptions_la_CXXFLAGS= $(CXXFLAGS) \
	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \

	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@

liboptions_la_SOURCES= options.h options.cc priv.h priv.cc

liboptions_la_LIBADD= $(top_builddir)/libmysql/libmysqlclient.la

# MySQL sometimes uses symlinks to reuse code 
# All symlinked files are grouped in libnet.a

nodist_libnet_la_SOURCES= net_serv.cc client_settings.h \
	$(srcdir)/../../sql/password.c $(srcdir)/../../sql/pack.c \
	$(srcdir)/../../sql/sql_state.c $(srcdir)/../../sql/mini_client_errors.c \
	$(srcdir)/../../sql/client.c

	$(top_builddir)/sql/client.$(OBJEXT)

CLEANFILES= net_serv.cc client_settings.h



mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \
			liboptions.la \
			libnet.la \
			$(top_builddir)/vio/libvio.la \
			$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/strings/libmystrings.la \
			$(top_builddir)/dbug/libdbug.la \
			@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@

EXTRA_DIST =		WindowsService.cpp WindowsService.h IMService.cpp \




noinst_LTLIBRARIES=	libndb.la \
			udf_example.la

SUPPORTING_LIBS =	$(top_builddir)/vio/libvio.la \
			$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/dbug/libdbug.la \
			$(top_builddir)/regex/libregex.la \
			$(top_builddir)/strings/libmystrings.la \
			$(top_builddir)/storage/myisam/libmyisam.la
mysqld_DEPENDENCIES=	@mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
mysqld_LDADD =		libndb.la \




INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
			-I$(top_srcdir)/regex \
			-I$(top_srcdir)/sql \
			-I$(srcdir) @ZLIB_INCLUDES@
WRAPLIBS=

LDADD =
LDFLAGS = --whole-archive

DEFS =                  @DEFS@

noinst_HEADERS =	ha_archive.h azlib.h
noinst_PROGRAMS	=	archive_test archive_reader

EXTRA_LTLIBRARIES =	ha_archive.la libarchive.la
pkgplugin_LTLIBRARIES =	@plugin_archive_shared_target@
ha_archive_la_LDFLAGS =	-module -rpath $(pkgplugindir)
ha_archive_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN

ha_archive_la_SOURCES =	ha_archive.cc azio.c


noinst_LTLIBRARIES =	@plugin_archive_static_target@
libarchive_la_CXXFLAGS =	$(AM_CXXFLAGS)
libarchive_la_CFLAGS =	$(AM_CFLAGS)
libarchive_la_SOURCES =	ha_archive.cc azio.c
libarchive_a_SOURCES =	ha_archive.cc azio.c


archive_test_SOURCES =	archive_test.c azio.c
archive_test_CFLAGS =	$(AM_CFLAGS)
archive_test_LDADD =	$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/dbug/libdbug.la \
			$(top_builddir)/strings/libmystrings.la \
			@ZLIB_LIBS@
archive_test_LDFLAGS = @NOINST_LDFLAGS@

archive_reader_SOURCES = archive_reader.c azio.c
archive_reader_CFLAGS =	$(AM_CFLAGS)
archive_reader_LDADD =	$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/dbug/libdbug.la \
			$(top_builddir)/strings/libmystrings.la \
			@ZLIB_LIBS@
archive_reader_LDFLAGS = @NOINST_LDFLAGS@


Lines 1-4 Link Here

(-)../mysql-5.1.50/storage/archive/plug.in (-1 / +1 lines)
1	MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine],	1	MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine],
2	[Archive Storage Engine], [max,max-no-ndb])	2	[Archive Storage Engine], [max,max-no-ndb])
3	MYSQL_PLUGIN_STATIC(archive, [libarchive.a])	3	MYSQL_PLUGIN_STATIC(archive, [libarchive.la])
4	MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la])	4	MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la])




WRAPLIBS=

LDADD =
LDFLAGS = --whole-archive

DEFS =                  @DEFS@

noinst_HEADERS =	ha_blackhole.h

EXTRA_LTLIBRARIES =	ha_blackhole.la libblackhole.la
pkgplugin_LTLIBRARIES =	@plugin_blackhole_shared_target@
ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN

ha_blackhole_la_SOURCES=ha_blackhole.cc


noinst_LTLIBRARIES =	@plugin_blackhole_static_target@
libblackhole_la_CXXFLAGS=$(AM_CXXFLAGS)
libblackhole_la_CFLAGS =	$(AM_CFLAGS)
libblackhole_la_SOURCES=	ha_blackhole.cc
libblackhole_a_SOURCES=	ha_blackhole.cc


EXTRA_DIST =		CMakeLists.txt plug.in

Lines 1-6 Link Here

(-)../mysql-5.1.50/storage/blackhole/plug.in (-2 / +1 lines)
1	MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],	1	MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
2	[Basic Write-only Read-never tables], [max,max-no-ndb])	2	[Basic Write-only Read-never tables], [max,max-no-ndb])
3	MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])	3	MYSQL_PLUGIN_DIRECTORY(blackhole, [storage/blackhole])
4	MYSQL_PLUGIN_STATIC(blackhole, [libblackhole.a])	4	MYSQL_PLUGIN_STATIC(blackhole, [libblackhole.la])
5	MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])	5	MYSQL_PLUGIN_DYNAMIC(blackhole, [ha_blackhole.la])
6




			-I$(top_srcdir)/sql \
                        -I$(srcdir)
LDADD =
LDFLAGS = --whole-archive

DEFS =	@DEFS@
noinst_HEADERS	  =	ha_tina.h transparent_file.h

EXTRA_LTLIBRARIES =	ha_csv.la libcsv.la
pkglib_LTLIBRARIES =	@plugin_csv_shared_target@
ha_csv_la_LDFLAGS =	-module -rpath $(MYSQLLIBdir)
ha_csv_la_CXXFLAGS =	$(AM_CXXFLAGS) -DMYSQL_PLUGIN
ha_csv_la_SOURCES =	transparent_file.cc ha_tina.cc 

noinst_LTLIBRARIES =	@plugin_csv_static_target@
libcsv_la_CXXFLAGS =	$(AM_CXXFLAGS)
libcsv_la_SOURCES =	transparent_file.cc ha_tina.cc
libcsv_a_SOURCES =	transparent_file.cc ha_tina.cc

EXTRA_DIST =		CMakeLists.txt plug.in
# Don't update the files from bitkeeper

Lines 1-5 Link Here

(-)../mysql-5.1.50/storage/csv/plug.in (-2 / +2 lines)
1	MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine],	1	MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine],
2	[Stores tables in text CSV format])	2	[Stores tables in text CSV format])
3	MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv])	3	MYSQL_PLUGIN_DIRECTORY(csv, [storage/csv])
4	MYSQL_PLUGIN_STATIC(csv, [libcsv.a])	4	MYSQL_PLUGIN_STATIC(csv, [libcsv.la])
5	MYSQL_PLUGIN_MANDATORY(csv) dnl Used for logging	5	MYSQL_PLUGIN_DYNAMIC(csv, [ha_csv.la])

Lines 27-32 Link Here

(-)../mysql-5.1.50/storage/example/Makefile.am (+1 lines)
27	WRAPLIBS=	27	WRAPLIBS=
28		28
29	LDADD =	29	LDADD =
		30	LDFLAGS = --whole-archive
30		31
31	DEFS = @DEFS@	32	DEFS = @DEFS@
32		33




WRAPLIBS=

LDADD =
LDFLAGS = --whole-archive

DEFS =                  @DEFS@

noinst_HEADERS =	ha_federated.h

EXTRA_LTLIBRARIES =	ha_federated.la libfederated.la
pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
ha_federated_la_LDFLAGS =	-module -rpath $(pkgplugindir)
ha_federated_la_CXXFLAGS=	$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN

ha_federated_la_SOURCES =	ha_federated.cc


noinst_LTLIBRARIES =	@plugin_federated_static_target@
libfederated_la_CXXFLAGS =	$(AM_CXXFLAGS)
libfederated_la_CFLAGS =	$(AM_CFLAGS)
libfederated_la_SOURCES=	ha_federated.cc
libfederated_a_SOURCES=	ha_federated.cc


EXTRA_DIST =		CMakeLists.txt plug.in

Lines 1-5 Link Here

(-)../mysql-5.1.50/storage/federated/plug.in (-2 / +2 lines)
1	MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],	1	MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
2	[Connects to tables on remote MySQL servers], [max,max-no-ndb])	2	[Connects to tables on remote MySQL servers], [max,max-no-ndb])
3	MYSQL_PLUGIN_STATIC(federated, [libfederated.a])	3	MYSQL_PLUGIN_STATIC(federated, [libfederated.la])
4	MYSQL_PLUGIN_DYNAMIC(federated, [ha_federated.la])
5	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc])	4	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(federated, [ha_federated.cc])
		5	MYSQL_PLUGIN_DYNAMIC(federated, [ha_federated.la])




WRAPLIBS=

LDADD =
LDFLAGS = --whole-archive

DEFS =                  @DEFS@
pkglib_LTLIBRARIES =	libheap.la
noinst_PROGRAMS	=	hp_test1 hp_test2
noinst_LIBRARIES =	libheap.a
hp_test1_LDFLAGS = @NOINST_LDFLAGS@
hp_test1_LDADD =	libheap.la \
			$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/dbug/libdbug.la \
			$(top_builddir)/strings/libmystrings.la
hp_test2_LDFLAGS = @NOINST_LDFLAGS@
hp_test2_LDADD =	libheap.la \
			$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/dbug/libdbug.la \
			$(top_builddir)/strings/libmystrings.la
noinst_HEADERS =	heapdef.h ha_heap.h
libheap_la_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \

Lines 1-7 Link Here

(-)../mysql-5.1.50/storage/heap/plug.in (-3 / +1 lines)
1	MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine],	1	MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine],
2	[Volatile memory based tables])	2	[Volatile memory based tables])
3	MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap])	3	MYSQL_PLUGIN_DIRECTORY(heap, [storage/heap])
4	MYSQL_PLUGIN_STATIC(heap, [libheap.a])	4	MYSQL_PLUGIN_DYNAMIC(heap, [libheap.la])
5	MYSQL_PLUGIN_MANDATORY(heap) dnl Memory tables
6	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc])	5	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(heap, [ha_heap.cc])
7

Lines 21-26 Link Here

(-)../mysql-5.1.50/storage/ibmdb2i/Makefile.am (+1 lines)
21	WRAPLIBS=	21	WRAPLIBS=
22		22
23	LDADD =	23	LDADD =
		24	LDFLAGS = --whole-archive
24		25
25	DEFS = @DEFS@	26	DEFS = @DEFS@
26		27




			include/ut0list.ic include/ut0wqueue.h		\
			include/ha_prototypes.h handler/ha_innodb.h

EXTRA_LTLIBRARIES=	ha_innodb.la libinnobase.la
noinst_LTLIBRARIES=	@plugin_innobase_static_target@
libinnobase_la_SOURCES=	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c	\
			btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c	\
			buf/buf0lru.c buf/buf0rea.c data/data0data.c	\
			data/data0type.c dict/dict0boot.c		\

			ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c		\
			handler/ha_innodb.cc

libinnobase_la_CXXFLAGS=	$(AM_CXXFLAGS)
libinnobase_la_CFLAGS=	$(AM_CFLAGS)

EXTRA_LTLIBRARIES=	ha_innodb.la
pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@

ha_innodb_la_LDFLAGS=	-module -rpath $(pkgplugindir)

Lines 1-8 Link Here

(-)../mysql-5.1.50/storage/innobase/plug.in (-2 / +2 lines)
1	MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],	1	MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
2	[Transactional Tables using InnoDB], [max,max-no-ndb])	2	[Transactional Tables using InnoDB], [max,max-no-ndb])
3	MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])	3	MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
4	MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a])	4	MYSQL_PLUGIN_STATIC(innobase, [libinnobase.la])
5	MYSQL_PLUGIN_DYNAMIC(innobase, [ha_innodb.la])	5	MYSQL_PLUGIN_DYNAMIC(innobase, [ha_innodb.so])
6	MYSQL_PLUGIN_ACTIONS(innobase, [	6	MYSQL_PLUGIN_ACTIONS(innobase, [
7	AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])	7	AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
8	AC_SUBST(innodb_system_libs)	8	AC_SUBST(innodb_system_libs)




INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
			-I$(top_srcdir)/regex \
			-I$(top_srcdir)/sql \
			-I$(srcdir)
WRAPLIBS=

LDADD =					@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
			$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/dbug/libdbug.la \
			$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
LDFLAGS = --whole-archive

DEFS =                  @DEFS@

EXTRA_DIST =		mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in
pkgdata_DATA =		mi_test_all mi_test_all.res

noinst_LTLIBRARIES =	libmyisam.la
bin_PROGRAMS =		myisamchk myisamlog myisampack myisam_ftdump
myisamchk_DEPENDENCIES=	$(LTLIBRARIES)
myisamlog_DEPENDENCIES=	$(LTLIBRARIES)
myisampack_DEPENDENCIES=$(LTLIBRARIES)
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
myisamlog_DEPENDENCIES=	$(LIBRARIES)
myisamlog_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
myisampack_DEPENDENCIES=$(LIBRARIES)
myisampack_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
noinst_PROGRAMS =	mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
noinst_HEADERS =	myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
			fulltext.h ftdefs.h ft_test1.h ft_eval.h \
			ha_myisam.h
mi_test1_DEPENDENCIES=	$(LTLIBRARIES)
mi_test2_DEPENDENCIES=	$(LTLIBRARIES)
mi_test3_DEPENDENCIES=	$(LTLIBRARIES)
#ft_test1_DEPENDENCIES=	$(LTLIBRARIES)
#ft_eval_DEPENDENCIES=	$(LTLIBRARIES)
myisam_ftdump_DEPENDENCIES=	$(LTLIBRARIES)
rt_test_DEPENDENCIES=	$(LTLIBRARIES)
sp_test_DEPENDENCIES=	$(LTLIBRARIES)
libmyisam_la_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
mi_test3_DEPENDENCIES=	$(LIBRARIES)
mi_test3_LDADD=		@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
#ft_test1_DEPENDENCIES=	$(LIBRARIES)
#ft_eval_DEPENDENCIES=	$(LIBRARIES)
myisam_ftdump_DEPENDENCIES=	$(LIBRARIES)
myisam_ftdump_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
rt_test_DEPENDENCIES=	$(LIBRARIES)
rt_test_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
sp_test_DEPENDENCIES=	$(LIBRARIES)
sp_test_LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
			$(top_builddir)/mysys/libmysys.a \
			$(top_builddir)/dbug/libdbug.a \
			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
libmyisam_a_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \
			mi_rnext.c mi_rnext_same.c \
			mi_search.c mi_page.c mi_key.c mi_locking.c \
			mi_rrnd.c mi_scan.c mi_cache.c \

Lines 1-7 Link Here

(-)../mysql-5.1.50/storage/myisam/plug.in (-3 / +1 lines)
1	MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],	1	MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
2	[Traditional non-transactional MySQL tables])	2	[Traditional non-transactional MySQL tables])
3	MYSQL_PLUGIN_DIRECTORY(myisam, [storage/myisam])	3	MYSQL_PLUGIN_DIRECTORY(myisam, [storage/myisam])
4	MYSQL_PLUGIN_STATIC(myisam, [libmyisam.a])	4	MYSQL_PLUGIN_STATIC(myisam, [libmyisam.la])
5	MYSQL_PLUGIN_MANDATORY(myisam) dnl Default
6	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisam, [ha_myisam.cc])	5	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisam, [ha_myisam.cc])
7




INCLUDES =              -I$(top_srcdir)/include -I$(top_builddir)/include \
			-I$(top_srcdir)/regex \
			-I$(top_srcdir)/sql \
			-I$(srcdir)
WRAPLIBS=

LDADD =
LDFLAGS = --whole-archive

DEFS =                  @DEFS@
noinst_LTLIBRARIES =	libmyisammrg.la
noinst_HEADERS =	myrg_def.h ha_myisammrg.h
libmyisammrg_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
			myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
			myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \

Lines 1-6 Link Here

(-)../mysql-5.1.50/storage/myisammrg/plug.in (-2 / +1 lines)
1	MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],	1	MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
2	[Merge multiple MySQL tables into one])	2	[Merge multiple MySQL tables into one])
3	MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])	3	MYSQL_PLUGIN_DIRECTORY(myisammrg,[storage/myisammrg])
4	MYSQL_PLUGIN_STATIC(myisammrg, [libmyisammrg.a])	4	MYSQL_PLUGIN_DYNAMIC(myisammrg, [libmyisammrg.la])
5	MYSQL_PLUGIN_MANDATORY(myisammrg)
6	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc])	5	MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(myisammrg, [ha_myisammrg.cc])

Lines 15-23 Link Here

(-)../mysql-5.1.50/storage/ndb/config/type_ndbapitest.mk.am (-3 / +3 lines)
15		15
16	LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \	16	LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
17	$(top_builddir)/storage/ndb/src/libndbclient.la \	17	$(top_builddir)/storage/ndb/src/libndbclient.la \
18	$(top_builddir)/dbug/libdbug.a \	18	$(top_builddir)/dbug/libdbug.la \
19	$(top_builddir)/mysys/libmysys.a \	19	$(top_builddir)/mysys/libmysys.la \
20	$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@	20	$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
21		21
22	INCLUDES += -I$(top_srcdir) \	22	INCLUDES += -I$(top_srcdir) \
23	-I$(top_builddir)/include \	23	-I$(top_builddir)/include \

Lines 15-23 Link Here

(-)../mysql-5.1.50/storage/ndb/config/type_ndbapitools.mk.am (-3 / +3 lines)
15		15
16	LDADD += \	16	LDADD += \
17	$(top_builddir)/storage/ndb/src/libndbclient.la \	17	$(top_builddir)/storage/ndb/src/libndbclient.la \
18	$(top_builddir)/dbug/libdbug.a \	18	$(top_builddir)/dbug/libdbug.la \
19	$(top_builddir)/mysys/libmysys.a \	19	$(top_builddir)/mysys/libmysys.la \
20	$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@	20	$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ @ZLIB_LIBS@
21		21
22	INCLUDES += -I$(srcdir) \	22	INCLUDES += -I$(srcdir) \
23	-I$(top_builddir)/include \	23	-I$(top_builddir)/include \

Lines 21-27 Link Here

(-)../mysql-5.1.50/storage/ndb/config/win-libraries (-1 / +1 lines)
21	# the same goes for mysys and strings	21	# the same goes for mysys and strings
22	lib=$i	22	lib=$i
23	case $i in	23	case $i in
24	libdbug.a \| libmysys.a \| *libmystrings.a)	24	libdbug.la \| libmysys.la \| *libmystrings.la)
25	lib=`echo $i \| sed s'!dbug\/lib!!' \| sed 's!mysys\/lib!!' \| sed 's!strings\/libmy!!'`	25	lib=`echo $i \| sed s'!dbug\/lib!!' \| sed 's!mysys\/lib!!' \| sed 's!strings\/libmy!!'`
26	echo "Changing from $i to $lib"	26	echo "Changing from $i to $lib"
27	;;	27	;;

Lines 31-39 Link Here

(-)../mysql-5.1.50/storage/ndb/src/common/util/Makefile.am (-3 / +3 lines)
31	testBitmask_SOURCES = testBitmask.cpp	31	testBitmask_SOURCES = testBitmask.cpp
32	testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \	32	testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
33	$(top_builddir)/storage/ndb/src/libndbclient.la \	33	$(top_builddir)/storage/ndb/src/libndbclient.la \
34	$(top_builddir)/dbug/libdbug.a \	34	$(top_builddir)/dbug/libdbug.la \
35	$(top_builddir)/mysys/libmysys.a \	35	$(top_builddir)/mysys/libmysys.la \
36	$(top_builddir)/strings/libmystrings.a	36	$(top_builddir)/strings/libmystrings.la
37		37
38	testBitmask.cpp : Bitmask.cpp	38	testBitmask.cpp : Bitmask.cpp
39	rm -f testBitmask.cpp	39	rm -f testBitmask.cpp

Lines 19-27 Link Here

(-)../mysql-5.1.50/storage/ndb/src/cw/cpcd/Makefile.am (-3 / +3 lines)
19		19
20	LDADD_LOC = \	20	LDADD_LOC = \
21	$(top_builddir)/storage/ndb/src/libndbclient.la \	21	$(top_builddir)/storage/ndb/src/libndbclient.la \
22	$(top_builddir)/dbug/libdbug.a \	22	$(top_builddir)/dbug/libdbug.la \
23	$(top_builddir)/mysys/libmysys.a \	23	$(top_builddir)/mysys/libmysys.la \
24	$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@	24	$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
25		25
26	include $(top_srcdir)/storage/ndb/config/common.mk.am	26	include $(top_srcdir)/storage/ndb/config/common.mk.am
27	include $(top_srcdir)/storage/ndb/config/type_util.mk.am	27	include $(top_srcdir)/storage/ndb/config/type_util.mk.am

Lines 17-25 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/blocks/backup/Makefile.am (-3 / +3 lines)
17	ndb_print_backup_file_SOURCES = read.cpp	17	ndb_print_backup_file_SOURCES = read.cpp
18	ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \	18	ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
19	$(top_builddir)/storage/ndb/src/libndbclient.la \	19	$(top_builddir)/storage/ndb/src/libndbclient.la \
20	$(top_builddir)/mysys/libmysys.a \	20	$(top_builddir)/mysys/libmysys.la \
21	$(top_builddir)/dbug/libdbug.a \	21	$(top_builddir)/dbug/libdbug.la \
22	$(top_builddir)/strings/libmystrings.a	22	$(top_builddir)/strings/libmystrings.la
23		23
24	include $(top_srcdir)/storage/ndb/config/common.mk.am	24	include $(top_srcdir)/storage/ndb/config/common.mk.am
25	include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am	25	include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am




LDADD +=  \
         $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
         $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
         $(top_builddir)/dbug/libdbug.la \
         $(top_builddir)/mysys/libmysys.la \
         $(top_builddir)/strings/libmystrings.la

ndbtools_PROGRAMS = ndb_print_schema_file
ndb_print_schema_file_SOURCES = printSchemaFile.cpp
ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \
  $(top_builddir)/storage/ndb/src/libndbclient.la \
         $(top_builddir)/dbug/libdbug.la \
         $(top_builddir)/mysys/libmysys.la \
         $(top_builddir)/strings/libmystrings.la

# Don't update the files from bitkeeper
%::SCCS/s.%

Lines 17-25 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbdih/Makefile.am (-3 / +3 lines)
17	ndb_print_sys_file_SOURCES = printSysfile.cpp	17	ndb_print_sys_file_SOURCES = printSysfile.cpp
18	ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \	18	ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
19	$(top_builddir)/storage/ndb/src/libndbclient.la \	19	$(top_builddir)/storage/ndb/src/libndbclient.la \
20	$(top_builddir)/dbug/libdbug.a \	20	$(top_builddir)/dbug/libdbug.la \
21	$(top_builddir)/mysys/libmysys.a \	21	$(top_builddir)/mysys/libmysys.la \
22	$(top_builddir)/strings/libmystrings.a	22	$(top_builddir)/strings/libmystrings.la
23		23
24		24
25	include $(top_srcdir)/storage/ndb/config/common.mk.am	25	include $(top_srcdir)/storage/ndb/config/common.mk.am

Lines 23-31 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/blocks/dblqh/Makefile.am (-3 / +3 lines)
23		23
24	ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \	24	ndbd_redo_log_reader_LDFLAGS = @ndb_bin_am_ldflags@ \
25	$(top_builddir)/storage/ndb/src/libndbclient.la \	25	$(top_builddir)/storage/ndb/src/libndbclient.la \
26	$(top_builddir)/dbug/libdbug.a \	26	$(top_builddir)/dbug/libdbug.la \
27	$(top_builddir)/mysys/libmysys.a \	27	$(top_builddir)/mysys/libmysys.la \
28	$(top_builddir)/strings/libmystrings.a	28	$(top_builddir)/strings/libmystrings.la
29		29
30	# Don't update the files from bitkeeper	30	# Don't update the files from bitkeeper
31	%::SCCS/s.%	31	%::SCCS/s.%

Lines 20-28 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/blocks/dbtup/Makefile.am (-3 / +3 lines)
20	test_varpage_SOURCES = test_varpage.cpp tuppage.cpp	20	test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
21	test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \	21	test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
22	$(top_builddir)/storage/ndb/src/libndbclient.la \	22	$(top_builddir)/storage/ndb/src/libndbclient.la \
23	$(top_builddir)/mysys/libmysys.a \	23	$(top_builddir)/mysys/libmysys.la \
24	$(top_builddir)/dbug/libdbug.a \	24	$(top_builddir)/dbug/libdbug.la \
25	$(top_builddir)/strings/libmystrings.a	25	$(top_builddir)/strings/libmystrings.la
26		26
27	# Don't update the files from bitkeeper	27	# Don't update the files from bitkeeper
28	%::SCCS/s.%	28	%::SCCS/s.%

Lines 57-65 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/blocks/Makefile.am (-3 / +3 lines)
57	ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp	57	ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
58	ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \	58	ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
59	$(top_builddir)/storage/ndb/src/libndbclient.la \	59	$(top_builddir)/storage/ndb/src/libndbclient.la \
60	$(top_builddir)/dbug/libdbug.a \	60	$(top_builddir)/dbug/libdbug.la \
61	$(top_builddir)/mysys/libmysys.a \	61	$(top_builddir)/mysys/libmysys.la \
62	$(top_builddir)/strings/libmystrings.a	62	$(top_builddir)/strings/libmystrings.la
63		63
64	include $(top_srcdir)/storage/ndb/config/common.mk.am	64	include $(top_srcdir)/storage/ndb/config/common.mk.am
65	include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am	65	include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am

Lines 53-61 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/Makefile.am (-3 / +3 lines)
53	$(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \	53	$(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
54	$(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \	54	$(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
55	$(top_builddir)/storage/ndb/src/common/util/libgeneral.la \	55	$(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
56	$(top_builddir)/dbug/libdbug.a \	56	$(top_builddir)/dbug/libdbug.la \
57	$(top_builddir)/mysys/libmysys.a \	57	$(top_builddir)/mysys/libmysys.la \
58	$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@	58	$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
59		59
60	windoze-dsp: ndbd.dsp	60	windoze-dsp: ndbd.dsp
61		61




ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
  $(top_builddir)/storage/ndb/src/libndbclient.la \
  $(top_builddir)/mysys/libmysys.la \
  $(top_builddir)/dbug/libdbug.la \
  $(top_builddir)/strings/libmystrings.la

bench_pool_SOURCES = bench_pool.cpp
bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\
  libkernel.a ../error/liberror.a \
  $(top_builddir)/storage/ndb/src/libndbclient.la \
  $(top_builddir)/mysys/libmysys.la \
  $(top_builddir)/dbug/libdbug.la \
  $(top_builddir)/strings/libmystrings.la

testDynArr256_CXXFLAGS = -DUNIT_TEST
testDynArr256_SOURCES = DynArr256.cpp
testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \
  libkernel.a ../error/liberror.a \
  $(top_builddir)/storage/ndb/src/libndbclient.la \
  $(top_builddir)/mysys/libmysys.la \
  $(top_builddir)/dbug/libdbug.la \
  $(top_builddir)/strings/libmystrings.la


Lines 37-45 Link Here

(-)../mysql-5.1.50/storage/ndb/src/mgmclient/Makefile.am (-3 / +3 lines)
37	../common/portlib/libportlib.la \	37	../common/portlib/libportlib.la \
38	@readline_link@ \	38	@readline_link@ \
39	$(top_builddir)/storage/ndb/src/libndbclient.la \	39	$(top_builddir)/storage/ndb/src/libndbclient.la \
40	$(top_builddir)/dbug/libdbug.a \	40	$(top_builddir)/dbug/libdbug.la \
41	$(top_builddir)/mysys/libmysys.a \	41	$(top_builddir)/mysys/libmysys.la \
42	$(top_builddir)/strings/libmystrings.a \	42	$(top_builddir)/strings/libmystrings.la \
43	@TERMCAP_LIB@ @NDB_SCI_LIBS@	43	@TERMCAP_LIB@ @NDB_SCI_LIBS@
44		44
45	ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@	45	ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@

Lines 40-48 Link Here

(-)../mysql-5.1.50/storage/ndb/src/mgmsrv/Makefile.am (-3 / +3 lines)
40		40
41	LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \	41	LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.lo \
42	$(top_builddir)/storage/ndb/src/libndbclient.la \	42	$(top_builddir)/storage/ndb/src/libndbclient.la \
43	$(top_builddir)/dbug/libdbug.a \	43	$(top_builddir)/dbug/libdbug.la \
44	$(top_builddir)/mysys/libmysys.a \	44	$(top_builddir)/mysys/libmysys.la \
45	$(top_builddir)/strings/libmystrings.a \	45	$(top_builddir)/strings/libmystrings.la \
46	@readline_link@ \	46	@readline_link@ \
47	@NDB_SCI_LIBS@ \	47	@NDB_SCI_LIBS@ \
48	@TERMCAP_LIB@	48	@TERMCAP_LIB@

Lines 67-75 Link Here

(-)../mysql-5.1.50/storage/ndb/src/ndbapi/Makefile.am (-3 / +3 lines)
67	include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am	67	include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
68		68
69	ndberror_check_LDFLAGS = \	69	ndberror_check_LDFLAGS = \
70	$(top_builddir)/dbug/libdbug.a \	70	$(top_builddir)/dbug/libdbug.la \
71	$(top_builddir)/mysys/libmysys.a \	71	$(top_builddir)/mysys/libmysys.la \
72	$(top_builddir)/strings/libmystrings.a	72	$(top_builddir)/strings/libmystrings.la
73		73
74	# Don't update the files from bitkeeper	74	# Don't update the files from bitkeeper
75	%::SCCS/s.%	75	%::SCCS/s.%

Lines 34-42 Link Here

(-)../mysql-5.1.50/storage/ndb/test/run-test/Makefile.am (-3 / +3 lines)
34	INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include	34	INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
35	LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \	35	LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
36	$(top_builddir)/storage/ndb/src/libndbclient.la \	36	$(top_builddir)/storage/ndb/src/libndbclient.la \
37	$(top_builddir)/dbug/libdbug.a \	37	$(top_builddir)/dbug/libdbug.la \
38	$(top_builddir)/mysys/libmysys.a \	38	$(top_builddir)/mysys/libmysys.la \
39	$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@	39	$(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@
40		40
41	atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \	41	atrt_CXXFLAGS = -I$(top_srcdir)/ndb/src/mgmapi \
42	-I$(top_srcdir)/ndb/src/mgmsrv \	42	-I$(top_srcdir)/ndb/src/mgmsrv \




# This file is public domain and comes with NO WARRANTY of any kind

INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
pkglib_LTLIBRARIES =	libmystrings.la

# Exact one of ASSEMBLER_X
if ASSEMBLER_x86

endif
endif

libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
noinst_PROGRAMS = conf_to_src
CLEANFILES = str_test uctypedump test_decimal
# Default charset definitions

			t_ctype.h my_strchr.c CMakeLists.txt \
			CHARSET_INFO.txt

libmystrings_la_LIBADD =
conf_to_src_SOURCES = conf_to_src.c
conf_to_src_LDADD = libmystrings.la
#force static linking of conf_to_src - essential when linking against
#custom installation of libc
conf_to_src_LDFLAGS= @NOINST_LDFLAGS@

# This is because the dependency tracking misses @FOO@ vars in sources.
#strtoull.o:		@CHARSET_OBJS@


FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)

str_test: str_test.c $(pkglib_LTLIBRARIES)
	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)

uctypedump: uctypedump.c
	$(LINK) $(INCLUDES) $(srcdir)/uctypedump.c

test_decimal$(EXEEXT): decimal.c $(pkglib_LTLIBRARIES)
	$(CP) $(srcdir)/decimal.c ./test_decimal.c
	$(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
	$(RM) -f ./test_decimal.c

# Don't update the files from bitkeeper

Lines 293-299 Link Here

(-)../mysql-5.1.50/strings/strings-x86.s (-1 / +1 lines)
293	movl %esp,%ebp	293	movl %esp,%ebp
294	pushl 12(%ebp) # search	294	pushl 12(%ebp) # search
295	pushl 8(%ebp) # str	295	pushl 8(%ebp) # str
296	call strstr	296	call strstr@plt
297	add $8,%esp	297	add $8,%esp
298	or %eax,%eax	298	or %eax,%eax
299	jz si_99 # Not found, return NULL	299	jz si_99 # Not found, return NULL

Lines 49-59 Link Here

(-)../mysql-5.1.50/tests/Makefile.am (-3 / +3 lines)
49		49
50	insert_test_SOURCES= insert_test.c	50	insert_test_SOURCES= insert_test.c
51	select_test_SOURCES= select_test.c	51	select_test_SOURCES= select_test.c
52	insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	52	insert_test_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
53	select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	53	select_test_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
54		54
55	bug25714_SOURCES= bug25714.c	55	bug25714_SOURCES= bug25714.c
56	bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	56	bug25714_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
57		57
58	# Fix for mit-threads	58	# Fix for mit-threads
59	DEFS = -DMYSQL_CLIENT_NO_THREADS	59	DEFS = -DMYSQL_CLIENT_NO_THREADS

Lines 16-24 Link Here

(-)../mysql-5.1.50/unittest/examples/Makefile.am (-3 / +1 lines)
16	AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include \	16	AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include \
17	-I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include	17	-I$(top_srcdir)/unittest/mytap -I$(top_srcdir)/include
18		18
19	AM_LDFLAGS = -L$(top_builddir)/unittest/mytap	19	LDADD = $(top_builddir)/unittest/mytap/libmytap.la
20
21	LDADD = -lmytap
22		20
23	# We omit core-t here, since it will always fail.	21	# We omit core-t here, since it will always fail.
24	noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t	22	noinst_PROGRAMS = simple-t skip-t todo-t skip_all-t no_plan-t

Lines 16-25 Link Here

(-)../mysql-5.1.50/unittest/mysys/Makefile.am (-4 / +4 lines)
16	AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include	16	AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include
17	AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap	17	AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
18		18
19	LDADD = $(top_builddir)/unittest/mytap/libmytap.a \	19	LDADD = $(top_builddir)/unittest/mytap/libmytap.la \
20	$(top_builddir)/mysys/libmysys.a \	20	$(top_builddir)/mysys/libmysys.la \
21	$(top_builddir)/dbug/libdbug.a \	21	$(top_builddir)/dbug/libdbug.la \
22	$(top_builddir)/strings/libmystrings.a	22	$(top_builddir)/strings/libmystrings.la
23		23
24	noinst_PROGRAMS = bitmap-t base64-t	24	noinst_PROGRAMS = bitmap-t base64-t
25		25

Lines 15-24 Link Here

(-)../mysql-5.1.50/unittest/mytap/Makefile.am (-2 / +2 lines)
15		15
16	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)	16	AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir)
17		17
18	noinst_LIBRARIES = libmytap.a	18	noinst_LTLIBRARIES = libmytap.la
19	noinst_HEADERS = tap.h	19	noinst_HEADERS = tap.h
20		20
21	libmytap_a_SOURCES = tap.c	21	libmytap_la_SOURCES = tap.c
22		22
23	SUBDIRS = . t	23	SUBDIRS = . t
24		24

Lines 15-23 Link Here

(-)../mysql-5.1.50/unittest/mytap/t/Makefile.am (-3 / +1 lines)
15		15
16	AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include	16	AM_CPPFLAGS = -I$(srcdir) -I$(top_builddir)/include -I$(srcdir)/.. -I$(top_srcdir)/include
17		17
18	AM_LDFLAGS = -L$(top_builddir)/unittest/mytap	18	LDADD = $(top_builddir)/unittest/mytap/libmytap.la
19
20	LDADD = -lmytap
21		19
22	noinst_PROGRAMS = basic-t	20	noinst_PROGRAMS = basic-t
23		21

Lines 16-25 Link Here

(-)../mysql-5.1.50/unittest/strings/Makefile.am (-4 / +4 lines)
16	AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include	16	AM_CPPFLAGS = @ZLIB_INCLUDES@ -I$(top_builddir)/include
17	AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap	17	AM_CPPFLAGS += -I$(top_srcdir)/include -I$(top_srcdir)/unittest/mytap
18		18
19	LDADD = $(top_builddir)/unittest/mytap/libmytap.a \	19	LDADD = $(top_builddir)/unittest/mytap/libmytap.la \
20	$(top_builddir)/mysys/libmysys.a \	20	$(top_builddir)/mysys/libmysys.la \
21	$(top_builddir)/dbug/libdbug.a \	21	$(top_builddir)/dbug/libdbug.la \
22	$(top_builddir)/strings/libmystrings.a	22	$(top_builddir)/strings/libmystrings.la
23		23
24	noinst_PROGRAMS = strings-t	24	noinst_PROGRAMS = strings-t
25		25




INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
			$(openssl_includes)
LDADD =			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
pkglib_LTLIBRARIES =	libvio.la

noinst_HEADERS =	vio_priv.h

libvio_la_LIBADD = -lssl
libvio_la_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c

EXTRA_DIST=		CMakeLists.txt


Return to bug 306315

Lines 2769-2775 Link Here

(-)../mysql-5.1.50/configure.in (-5 / +3 lines)
2769		2769
2770	dnl This probably should be cleaned up more - for now the threaded	2770	dnl This probably should be cleaned up more - for now the threaded
2771	dnl client is just using plain-old libs.	2771	dnl client is just using plain-old libs.
2772	sql_client_dirs="strings mysys dbug extra regex libmysql"	2772	sql_client_dirs="strings regex dbug mysys extra libmysql"
2773		2773
2774	AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")	2774	AM_CONDITIONAL(THREAD_SAFE_CLIENT, test "$THREAD_SAFE_CLIENT" != "no")
2775		2775
Lines 2797-2816 Link Here
2797	AC_SUBST(netware_dir)	2797	AC_SUBST(netware_dir)
2798	AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")	2798	AM_CONDITIONAL(HAVE_NETWARE, test "$netware_dir" = "netware")
2799		2799
		2800	AM_CONDITIONAL([NEED_THREADS], [test x"$with_server" != xno -o x"$THREAD_SAFE_CLIENT" != xno])
2800	if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"	2801	if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
2801	then	2802	then
2802	AC_DEFINE([THREAD], [1],	2803	AC_DEFINE([THREAD], [1],
2803	[Define if you want to have threaded code. This may be undef on client code])	2804	[Define if you want to have threaded code. This may be undef on client code])
2804	# Avoid _PROGRAMS names
2805	THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
2806	AC_SUBST(THREAD_LOBJECTS)
2807	fi	2805	fi
2808	AM_CONDITIONAL(NEED_THREAD, test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no")	2806	AM_CONDITIONAL(NEED_THREAD, test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no")
2809		2807
2810	if test "$with_server" != "no"	2808	if test "$with_server" != "no"
2811	then	2809	then
2812	server_scripts="mysqld_safe mysql_install_db"	2810	server_scripts="mysqld_safe mysql_install_db"
2813	sql_server_dirs="strings mysys dbug extra regex storage plugin"	2811	sql_server_dirs="strings dbug mysys extra regex storage plugin"
2814		2812
2815	sql_server="vio sql"	2813	sql_server="vio sql"
2816	fi	2814	fi

Lines 122-130 Link Here

(-)../mysql-5.1.50/storage/innobase/Makefile.am (-6 / +5 lines)
122	include/ut0list.ic include/ut0wqueue.h \	122	include/ut0list.ic include/ut0wqueue.h \
123	include/ha_prototypes.h handler/ha_innodb.h	123	include/ha_prototypes.h handler/ha_innodb.h
124		124
125	EXTRA_LIBRARIES= libinnobase.a	125	EXTRA_LTLIBRARIES= ha_innodb.la libinnobase.la
126	noinst_LIBRARIES= @plugin_innobase_static_target@	126	noinst_LTLIBRARIES= @plugin_innobase_static_target@
127	libinnobase_a_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \	127	libinnobase_la_SOURCES= btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c \
128	btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c \	128	btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c \
129	buf/buf0lru.c buf/buf0rea.c data/data0data.c \	129	buf/buf0lru.c buf/buf0rea.c data/data0data.c \
130	data/data0type.c dict/dict0boot.c \	130	data/data0type.c dict/dict0boot.c \
Lines 156-165 Link Here
156	ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \	156	ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c \
157	handler/ha_innodb.cc	157	handler/ha_innodb.cc
158		158
159	libinnobase_a_CXXFLAGS= $(AM_CXXFLAGS)	159	libinnobase_la_CXXFLAGS= $(AM_CXXFLAGS)
160	libinnobase_a_CFLAGS= $(AM_CFLAGS)	160	libinnobase_la_CFLAGS= $(AM_CFLAGS)
161		161
162	EXTRA_LTLIBRARIES= ha_innodb.la
163	pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@	162	pkgplugin_LTLIBRARIES= @plugin_innobase_shared_target@
164		163
165	ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir)	164	ha_innodb_la_LDFLAGS= -module -rpath $(pkgplugindir)

Lines 75-81 Link Here

(-)../mysql-5.1.50/client/Makefile.am (-4 / +4 lines)
75	mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \	75	mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
76	@CLIENT_EXTRA_LDFLAGS@ \	76	@CLIENT_EXTRA_LDFLAGS@ \
77	$(LIBMYSQLCLIENT_LA) \	77	$(LIBMYSQLCLIENT_LA) \
78	$(top_builddir)/mysys/libmysys.a	78	$(top_builddir)/mysys/libmysys.la
79		79
80	mysqlshow_SOURCES= mysqlshow.c	80	mysqlshow_SOURCES= mysqlshow.c
81		81
Lines 84-98 Link Here
84	mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \	84	mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
85	@CLIENT_EXTRA_LDFLAGS@ \	85	@CLIENT_EXTRA_LDFLAGS@ \
86	$(LIBMYSQLCLIENT_LA) \	86	$(LIBMYSQLCLIENT_LA) \
87	$(top_builddir)/mysys/libmysys.a	87	$(top_builddir)/mysys/libmysys.la
88		88
89	mysqltest_SOURCES= mysqltest.cc	89	mysqltest_SOURCES= mysqltest.cc
90	mysqltest_CXXFLAGS= -DTHREAD -UMYSQL_CLIENT_NO_THREADS	90	mysqltest_CXXFLAGS= -DTHREAD -UMYSQL_CLIENT_NO_THREADS
91	mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \	91	mysqltest_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \
92	@CLIENT_EXTRA_LDFLAGS@ \	92	@CLIENT_EXTRA_LDFLAGS@ \
93	$(LIBMYSQLCLIENT_LA) \	93	$(LIBMYSQLCLIENT_LA) \
94	$(top_builddir)/mysys/libmysys.a \	94	$(top_builddir)/mysys/libmysys.la \
95	$(top_builddir)/regex/libregex.a \	95	$(top_builddir)/regex/libregex.la \
96	$(CLIENT_THREAD_LIBS)	96	$(CLIENT_THREAD_LIBS)
97		97
98	mysql_upgrade_SOURCES= mysql_upgrade.c \	98	mysql_upgrade_SOURCES= mysql_upgrade.c \

Lines 16-25 Link Here

(-)../mysql-5.1.50/dbug/Makefile.am (-5 / +5 lines)
16	# MA 02111-1307, USA	16	# MA 02111-1307, USA
17		17
18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
19	LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a	19	LDADD = ../mysys/libmysys.la ../strings/libmystrings.la
20	pkglib_LIBRARIES = libdbug.a	20	noinst_LTLIBRARIES = libdbug.la
21	noinst_HEADERS = dbug_long.h	21	noinst_HEADERS = dbug_long.h
22	libdbug_a_SOURCES = dbug.c sanity.c	22	libdbug_la_SOURCES = dbug.c sanity.c
23	EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \	23	EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \
24	user.r monty.doc dbug_add_tags.pl \	24	user.r monty.doc dbug_add_tags.pl \
25	my_main.c main.c factorial.c dbug_analyze.c \	25	my_main.c main.c factorial.c dbug_analyze.c \
Lines 31-41 Link Here
31		31
32		32
33	# Must be linked with libs that are not compiled yet	33	# Must be linked with libs that are not compiled yet
34	noinst_PROGRAMS = factorial dbug_analyze	34	EXTRA_PROGRAMS = factorial dbug_analyze
35	factorial_SOURCES = my_main.c factorial.c	35	factorial_SOURCES = my_main.c factorial.c
36	dbug_analyze_SOURCES = dbug_analyze.c	36	dbug_analyze_SOURCES = dbug_analyze.c
37		37
38	all: user.t user.ps	38	check-local: user.t user.ps
39		39
40	user.t: user.r $(NROFF_INC)	40	user.t: user.r $(NROFF_INC)
41	-nroff -mm user.r > $@	41	-nroff -mm user.r > $@

Lines 37-49 Link Here

(-)../mysql-5.1.50/libmysqld/examples/Makefile.am (-3 / +5 lines)
37	-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \	37	-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
38	$(openssl_includes)	38	$(openssl_includes)
39	LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)	39	LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
40	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \	40	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
41	@NDB_SCI_LIBS@	41	@NDB_SCI_LIBS@ $(top_builddir)/libmysql/libmysqlclient.la
42		42
43	mysqltest_embedded_LINK = $(CXXLINK)	43	mysqltest_embedded_LINK = $(CXXLINK)
44	nodist_mysqltest_embedded_SOURCES = mysqltest.cc	44	nodist_mysqltest_embedded_SOURCES = mysqltest.cc
45	mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a \	45	mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.la \
46	@MYSQLD_EXTRA_LDFLAGS@	46	@MYSQLD_EXTRA_LDFLAGS@
		47	mysqltest_embedded_LDFLAGS = -static
47		48
48	nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \	49	nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
49	my_readline.h sql_string.h completion_hash.h	50	my_readline.h sql_string.h completion_hash.h
Lines 51-56 Link Here
51		52
52	mysql_client_test_embedded_LINK = $(CXXLINK)	53	mysql_client_test_embedded_LINK = $(CXXLINK)
53	nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c	54	nodist_mysql_client_test_embedded_SOURCES = mysql_client_test.c
		55	mysql_client_test_embedded_LDFLAGS = -static
54		56
55	# Don't update the files from bitkeeper	57	# Don't update the files from bitkeeper
56	%::SCCS/s.%	58	%::SCCS/s.%

Lines 36-43 Link Here

(-)../mysql-5.1.50/libmysqld/Makefile.am (-56 / +18 lines)
36	$(openssl_includes) @ZLIB_INCLUDES@ \	36	$(openssl_includes) @ZLIB_INCLUDES@ \
37	@condition_dependent_plugin_includes@	37	@condition_dependent_plugin_includes@
38		38
39	noinst_LIBRARIES = libmysqld_int.a	39	noinst_LTLIBRARIES = libmysqld_int.la
40	pkglib_LIBRARIES = libmysqld.a	40	pkglib_LTLIBRARIES = libmysqld.la
41	SUBDIRS = . examples	41	SUBDIRS = . examples
42	libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc	42	libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
43	libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \	43	libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
Lines 79-89 Link Here
79	rpl_injector.cc my_user.c partition_info.cc \	79	rpl_injector.cc my_user.c partition_info.cc \
80	sql_servers.cc event_parse_data.cc	80	sql_servers.cc event_parse_data.cc
81		81
82	libmysqld_int_a_SOURCES= $(libmysqld_sources)	82	nodist_libmysqld_int_la_SOURCES= $(libmysqlsources) $(sqlsources)
83	nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)	83	libmysqld_la_SOURCES=$(libmysqld_sources)
84	libmysqld_a_SOURCES=
85		84
86	sqlstoragesources = $(EXTRA_libmysqld_a_SOURCES)	85	sqlstoragesources = $(EXTRA_libmysqld_la_SOURCES)
87	storagesources = @condition_dependent_plugin_modules@	86	storagesources = @condition_dependent_plugin_modules@
88	storageobjects = @condition_dependent_plugin_objects@	87	storageobjects = @condition_dependent_plugin_objects@
89	storagesourceslinks = @condition_dependent_plugin_links@	88	storagesourceslinks = @condition_dependent_plugin_links@
Lines 91-109 Link Here
91	# automake misses these	90	# automake misses these
92	sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy	91	sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
93		92
94	# The following libraries should be included in libmysqld.a	93	# The following libraries should be included in libmysqld.la
95	INC_LIB= $(top_builddir)/regex/libregex.a \	94	libmysqld_la_LIBADD= $(top_builddir)/regex/libregex.la \
96	$(top_builddir)/mysys/libmysys.a \	95	$(top_builddir)/mysys/libmysys.la \
97	$(top_builddir)/strings/libmystrings.a \	96	$(top_builddir)/strings/libmystrings.la \
98	$(top_builddir)/dbug/libdbug.a \	97	$(top_builddir)/dbug/libdbug.la \
99	$(top_builddir)/vio/libvio.a \	98	$(top_builddir)/vio/libvio.la \
100	@NDB_SCI_LIBS@ \	99	@NDB_SCI_LIBS@ \
101	@mysql_plugin_libs@ \	100	@mysql_plugin_libs@ \
102	$(yassl_inc_libs)	101	$(yassl_inc_libs) \
		102	libmysqld_int.la
103		103
104	if HAVE_YASSL	104	if HAVE_YASSL
105	yassl_inc_libs= $(top_builddir)/extra/yassl/src/.libs/libyassl.a \	105	yassl_inc_libs= $(top_builddir)/extra/yassl/src/libyassl.la \
106	$(top_builddir)/extra/yassl/taocrypt/src/.libs/libtaocrypt.a	106	$(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
107	endif	107	endif
108		108
109	# Storage engine specific compilation options	109	# Storage engine specific compilation options
Lines 139-189 Link Here
139	ha_myisammrg.o:ha_myisammrg.cc	139	ha_myisammrg.o:ha_myisammrg.cc
140	$(CXXCOMPILE) $(LM_CFLAGS) -c $<	140	$(CXXCOMPILE) $(LM_CFLAGS) -c $<
141		141
142	#
143	# To make it easy for the end user to use the embedded library we
144	# generate a total libmysqld.a from all library files,
145
146	# note - InnoDB libraries have circular dependencies, so in INC_LIB
147	# few libraries are present two times. Metrowerks linker doesn't like
148	# it at all. Traditional ar has no problems with it, but still there's no
149	# need to add the same file twice to the library, so 'sort -u' save us
150	# some time and spares unnecessary work.
151
152	libmysqld.a: libmysqld_int.a $(INC_LIB) $(libmysqld_a_DEPENDENCIES) $(storageobjects)
153	if DARWIN_MWCC
154	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) \| sort -u` $(storageobjects)
155	else
156	-rm -f libmysqld.a
157	if test "$(host_os)" = "netware" ; \
158	then \
159	$(libmysqld_a_AR) libmysqld.a $(INC_LIB) libmysqld_int.a $(storageobjects); \
160	else \
161	current_dir=`pwd`; \
162	rm -rf tmp; mkdir tmp; \
163	(for arc in $(INC_LIB) ./libmysqld_int.a; do \
164	arpath=`echo $$arc\|sed 's\|[^/]*$$\|\|'\|sed 's\|\.libs/$$\|\|'`; \
165	artmp=`echo $$arc\|sed 's\|^.*/\|tmp/lib-\|'`; \
166	for F in `$(AR) t $$arc \| grep -v SYMDEF`; do \
167	if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \
168	mkdir $$artmp; cd $$artmp > /dev/null; \
169	$(AR) x ../../$$arc; \
170	cd $$current_dir > /dev/null; \
171	ls $$artmp/* \| grep -v SYMDEF; \
172	continue 2; fi; done; \
173	done; echo $(libmysqld_a_DEPENDENCIES) ) \| sort -u \| xargs $(AR) cq libmysqld.a ; \
174	$(AR) r libmysqld.a $(storageobjects); \
175	$(RANLIB) libmysqld.a ; \
176	rm -rf tmp; \
177	fi
178	endif
179
180	## XXX: any time the client interface changes, we'll need to bump	142	## XXX: any time the client interface changes, we'll need to bump
181	## the version info for libmysqld; however, it's possible for the	143	## the version info for libmysqld; however, it's possible for the
182	## libmysqld interface to change without affecting the standard	144	## libmysqld interface to change without affecting the standard
183	## libmysqlclient interface. Should we make a separate version	145	## libmysqlclient interface. Should we make a separate version
184	## string for the two?	146	## string for the two?
185	#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@	147	libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
186	#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la	148	CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la
187		149
188	BUILT_SOURCES = link_sources	150	BUILT_SOURCES = link_sources
189		151

Lines 18-27 Link Here

(-)../mysql-5.1.50/mysys/Makefile.am (-22 / +20 lines)
18	MYSQLBASEdir= $(prefix)	18	MYSQLBASEdir= $(prefix)
19	INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \	19	INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \
20	-I$(top_srcdir)/include -I$(srcdir)	20	-I$(top_srcdir)/include -I$(srcdir)
21	pkglib_LIBRARIES = libmysys.a	21	pkglib_LTLIBRARIES = libmysys.la
22	LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
23	noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h	22	noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h
24	libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \	23	libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
25	mf_path.c mf_loadpath.c my_file.c \	24	mf_path.c mf_loadpath.c my_file.c \
26	my_open.c my_create.c my_dup.c my_seek.c my_read.c \	25	my_open.c my_create.c my_dup.c my_seek.c my_read.c \
27	my_pread.c my_write.c my_getpagesize.c \	26	my_pread.c my_write.c my_getpagesize.c \
Lines 45-51 Link Here
45	my_quick.c my_lockmem.c my_static.c \	44	my_quick.c my_lockmem.c my_static.c \
46	my_sync.c my_getopt.c my_mkdir.c \	45	my_sync.c my_getopt.c my_mkdir.c \
47	default_modify.c default.c \	46	default_modify.c default.c \
48	my_compress.c checksum.c \	47	my_compress.c checksum.c \
49	my_net.c my_port.c my_sleep.c \	48	my_net.c my_port.c my_sleep.c \
50	charset.c charset-def.c my_bitmap.c my_bit.c md5.c \	49	charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
51	my_gethostbyname.c rijndael.c my_aes.c sha1.c \	50	my_gethostbyname.c rijndael.c my_aes.c sha1.c \
Lines 53-74 Link Here
53	my_memmem.c stacktrace.c \	52	my_memmem.c stacktrace.c \
54	my_windac.c my_access.c base64.c my_libwrap.c	53	my_windac.c my_access.c base64.c my_libwrap.c
55		54
		55	libmysys_la_LIBADD = $(top_builddir)/dbug/libdbug.la $(top_builddir)/strings/libmystrings.la \
		56	$(ZLIB_LIBS)
56	if NEED_THREAD	57	if NEED_THREAD
57	# mf_keycache is used only in the server, so it is safe to leave the file	58	# mf_keycache is used only in the server, so it is safe to leave the file
58	# out of the non-threaded library.	59	# out of the non-threaded library.
59	# In fact, it will currently not compile without thread support.	60	# In fact, it will currently not compile without thread support.
60	libmysys_a_SOURCES += mf_keycache.c	61	libmysys_la_SOURCES += thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c my_pthread.c my_thr_init.c mf_keycache.c
61	endif	62	endif
62		63
63	EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \	64	EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
64	thr_mutex.c thr_rwlock.c \	65	thr_mutex.c thr_rwlock.c \
65	CMakeLists.txt mf_soundex.c \	66	CMakeLists.txt mf_soundex.c \
66	my_conio.c my_wincond.c my_winthread.c	67	my_conio.c my_wincond.c my_winthread.c
67	libmysys_a_LIBADD = @THREAD_LOBJECTS@	68	# test_dir_DEPENDENCIES= $(LTLIBRARIES)
68	# test_dir_DEPENDENCIES= $(LIBRARIES)	69	# testhash_DEPENDENCIES= $(LTLIBRARIES)
69	# testhash_DEPENDENCIES= $(LIBRARIES)	70	# test_charset_DEPENDENCIES= $(LTLIBRARIES)
70	# test_charset_DEPENDENCIES= $(LIBRARIES)	71	# charset2html_DEPENDENCIES= $(LTLIBRARIES)
71	# charset2html_DEPENDENCIES= $(LIBRARIES)
72	DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \	72	DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
73	-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \	73	-DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \
74	-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \	74	-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
Lines 78-85 Link Here
78	-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \	78	-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
79	@DEFS@	79	@DEFS@
80		80
81	libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
82
83	# I hope this always does the right thing. Otherwise this is only test programs	81	# I hope this always does the right thing. Otherwise this is only test programs
84	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@	82	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
85		83
Lines 88-126 Link Here
88	# which automaticly removes the object files you use to compile a final program	86	# which automaticly removes the object files you use to compile a final program
89	#	87	#
90		88
91	test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES)	89	test_bitmap$(EXEEXT): my_bitmap.c $(LTLIBRARIES)
92	$(LINK) $(FLAGS) -DMAIN ./my_bitmap.c $(LDADD) $(LIBS)	90	$(LINK) $(FLAGS) -DMAIN ./my_bitmap.c $(LDADD) $(LIBS)
93		91
94	test_priority_queue$(EXEEXT): queues.c $(LIBRARIES)	92	test_priority_queue$(EXEEXT): queues.c $(LTLIBRARIES)
95	$(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS)	93	$(LINK) $(FLAGS) -DMAIN ./queues.c $(LDADD) $(LIBS)
96		94
97	test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)	95	test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES)
98	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c	96	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
99	$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)	97	$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
100	$(RM) -f ./test_thr_alarm.c	98	$(RM) -f ./test_thr_alarm.c
101		99
102	test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)	100	test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES)
103	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c	101	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
104	$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)	102	$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
105	$(RM) -f ./test_thr_lock.c	103	$(RM) -f ./test_thr_lock.c
106		104
107	test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)	105	test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES)
108	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c	106	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
109	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)	107	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
110	$(RM) -f test_vsnprintf.c	108	$(RM) -f test_vsnprintf.c
111		109
112	test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)	110	test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES)
113	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c	111	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
114	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)	112	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
115	$(RM) -f test_io_cache.c	113	$(RM) -f test_io_cache.c
116		114
117	test_dir$(EXEEXT): test_dir.c $(LIBRARIES)	115	test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES)
118	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)	116	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
119		117
120	test_charset$(EXEEXT): test_charset.c $(LIBRARIES)	118	test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES)
121	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)	119	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
122		120
123	testhash$(EXEEXT): testhash.c $(LIBRARIES)	121	testhash$(EXEEXT): testhash.c $(LTLIBRARIES)
124	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)	122	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
125		123
126	test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)	124	test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
Lines 128-134 Link Here
128	$(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)	126	$(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)
129	$(RM) -f ./test_gethwaddr.c	127	$(RM) -f ./test_gethwaddr.c
130		128
131	test_base64$(EXEEXT): base64.c $(LIBRARIES)	129	test_base64$(EXEEXT): base64.c $(LTLIBRARIES)
132	$(CP) $(srcdir)/base64.c ./test_base64.c	130	$(CP) $(srcdir)/base64.c ./test_base64.c
133	$(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)	131	$(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)
134	$(RM) -f ./test_base64.c	132	$(RM) -f ./test_base64.c

Lines 16-29 Link Here

(-)../mysql-5.1.50/netware/Makefile.am (-3 / +2 lines)
16		16
17	if HAVE_NETWARE	17	if HAVE_NETWARE
18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..	18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..
19	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \	19	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la
20	../dbug/libdbug.a ../strings/libmystrings.a
21	bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql	20	bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql
22	mysqld_safe_SOURCES= mysqld_safe.c my_manage.c	21	mysqld_safe_SOURCES= mysqld_safe.c my_manage.c
23	mysql_install_db_SOURCES= mysql_install_db.c my_manage.c	22	mysql_install_db_SOURCES= mysql_install_db.c my_manage.c
24	mysql_test_run_SOURCES= mysql_test_run.c my_manage.c	23	mysql_test_run_SOURCES= mysql_test_run.c my_manage.c
25	libmysql_SOURCES= libmysqlmain.c	24	libmysql_SOURCES= libmysqlmain.c
26	libmysql_LDADD = ../libmysql/.libs/libmysqlclient.a \	25	libmysql_LDADD = ../libmysql/.libs/libmysqlclient.la \
27	@openssl_libs@ @yassl_libs@	26	@openssl_libs@ @yassl_libs@
28		27
29	netware_build_files = client/mysql.def client/mysqladmin.def \	28	netware_build_files = client/mysql.def client/mysqladmin.def \

Lines 23-30 Link Here

(-)../mysql-5.1.50/server-tools/instance-manager/Makefile.am (-14 / +13 lines)
23	# default_options.h, generated from default_options.h.in)	23	# default_options.h, generated from default_options.h.in)
24	# See automake/autoconf docs for details	24	# See automake/autoconf docs for details
25		25
26	noinst_LTLIBRARIES= liboptions.la	26	noinst_LTLIBRARIES= liboptions.la libnet.la
27	noinst_LIBRARIES= libnet.a
28		27
29	liboptions_la_CXXFLAGS= $(CXXFLAGS) \	28	liboptions_la_CXXFLAGS= $(CXXFLAGS) \
30	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \	29	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
Lines 36-52 Link Here
36	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@	35	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
37		36
38	liboptions_la_SOURCES= options.h options.cc priv.h priv.cc	37	liboptions_la_SOURCES= options.h options.cc priv.h priv.cc
39	liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo	38
		39	liboptions_la_LIBADD= $(top_builddir)/libmysql/libmysqlclient.la
40		40
41	# MySQL sometimes uses symlinks to reuse code	41	# MySQL sometimes uses symlinks to reuse code
42	# All symlinked files are grouped in libnet.a	42	# All symlinked files are grouped in libnet.a
43		43
44	nodist_libnet_a_SOURCES= net_serv.cc client_settings.h	44	nodist_libnet_la_SOURCES= net_serv.cc client_settings.h \
45	libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \	45	$(srcdir)/../../sql/password.c $(srcdir)/../../sql/pack.c \
46	$(top_builddir)/sql/pack.$(OBJEXT) \	46	$(srcdir)/../../sql/sql_state.c $(srcdir)/../../sql/mini_client_errors.c \
47	$(top_builddir)/sql/sql_state.$(OBJEXT) \	47	$(srcdir)/../../sql/client.c
48	$(top_builddir)/sql/mini_client_errors.$(OBJEXT)\	48
49	$(top_builddir)/sql/client.$(OBJEXT)
50		49
51	CLEANFILES= net_serv.cc client_settings.h	50	CLEANFILES= net_serv.cc client_settings.h
52		51
Lines 86-96 Link Here
86		85
87	mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \	86	mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \
88	liboptions.la \	87	liboptions.la \
89	libnet.a \	88	libnet.la \
90	$(top_builddir)/vio/libvio.a \	89	$(top_builddir)/vio/libvio.la \
91	$(top_builddir)/mysys/libmysys.a \	90	$(top_builddir)/mysys/libmysys.la \
92	$(top_builddir)/strings/libmystrings.a \	91	$(top_builddir)/strings/libmystrings.la \
93	$(top_builddir)/dbug/libdbug.a \	92	$(top_builddir)/dbug/libdbug.la \
94	@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@	93	@openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
95		94
96	EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \	95	EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \

Lines 32-42 Link Here

(-)../mysql-5.1.50/sql/Makefile.am (-5 / +6 lines)
32	noinst_LTLIBRARIES= libndb.la \	32	noinst_LTLIBRARIES= libndb.la \
33	udf_example.la	33	udf_example.la
34		34
35	SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \	35	SUPPORTING_LIBS = $(top_builddir)/vio/libvio.la \
36	$(top_builddir)/mysys/libmysys.a \	36	$(top_builddir)/mysys/libmysys.la \
37	$(top_builddir)/dbug/libdbug.a \	37	$(top_builddir)/dbug/libdbug.la \
38	$(top_builddir)/regex/libregex.a \	38	$(top_builddir)/regex/libregex.la \
39	$(top_builddir)/strings/libmystrings.a	39	$(top_builddir)/strings/libmystrings.la \
		40	$(top_builddir)/storage/myisam/libmyisam.la
40	mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la	41	mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) libndb.la
41	LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@	42	LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
42	mysqld_LDADD = libndb.la \	43	mysqld_LDADD = libndb.la \

Lines 23-39 Link Here

(-)../mysql-5.1.50/storage/archive/Makefile.am (-13 / +13 lines)
23	INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \	23	INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
24	-I$(top_srcdir)/regex \	24	-I$(top_srcdir)/regex \
25	-I$(top_srcdir)/sql \	25	-I$(top_srcdir)/sql \
26	-I$(srcdir) @ZLIB_INCLUDES@	26	-I$(srcdir) @ZLIB_INCLUDES@
27	WRAPLIBS=	27	WRAPLIBS=
28		28
29	LDADD =	29	LDADD =
		30	LDFLAGS = --whole-archive
30		31
31	DEFS = @DEFS@	32	DEFS = @DEFS@
32		33
33	noinst_HEADERS = ha_archive.h azlib.h	34	noinst_HEADERS = ha_archive.h azlib.h
34	noinst_PROGRAMS = archive_test archive_reader	35	noinst_PROGRAMS = archive_test archive_reader
35		36
36	EXTRA_LTLIBRARIES = ha_archive.la	37	EXTRA_LTLIBRARIES = ha_archive.la libarchive.la
37	pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@	38	pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@
38	ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir)	39	ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir)
39	ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN	40	ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
Lines 41-66 Link Here
41	ha_archive_la_SOURCES = ha_archive.cc azio.c	42	ha_archive_la_SOURCES = ha_archive.cc azio.c
42		43
43		44
44	EXTRA_LIBRARIES = libarchive.a	45	noinst_LTLIBRARIES = @plugin_archive_static_target@
45	noinst_LIBRARIES = @plugin_archive_static_target@	46	libarchive_la_CXXFLAGS = $(AM_CXXFLAGS)
46	libarchive_a_CXXFLAGS = $(AM_CXXFLAGS)	47	libarchive_la_CFLAGS = $(AM_CFLAGS)
47	libarchive_a_CFLAGS = $(AM_CFLAGS)	48	libarchive_la_SOURCES = ha_archive.cc azio.c
48	libarchive_a_SOURCES = ha_archive.cc azio.c
49		49
50		50
51	archive_test_SOURCES = archive_test.c azio.c	51	archive_test_SOURCES = archive_test.c azio.c
52	archive_test_CFLAGS = $(AM_CFLAGS)	52	archive_test_CFLAGS = $(AM_CFLAGS)
53	archive_test_LDADD = $(top_builddir)/mysys/libmysys.a \	53	archive_test_LDADD = $(top_builddir)/mysys/libmysys.la \
54	$(top_builddir)/dbug/libdbug.a \	54	$(top_builddir)/dbug/libdbug.la \
55	$(top_builddir)/strings/libmystrings.a \	55	$(top_builddir)/strings/libmystrings.la \
56	@ZLIB_LIBS@	56	@ZLIB_LIBS@
57	archive_test_LDFLAGS = @NOINST_LDFLAGS@	57	archive_test_LDFLAGS = @NOINST_LDFLAGS@
58		58
59	archive_reader_SOURCES = archive_reader.c azio.c	59	archive_reader_SOURCES = archive_reader.c azio.c
60	archive_reader_CFLAGS = $(AM_CFLAGS)	60	archive_reader_CFLAGS = $(AM_CFLAGS)
61	archive_reader_LDADD = $(top_builddir)/mysys/libmysys.a \	61	archive_reader_LDADD = $(top_builddir)/mysys/libmysys.la \
62	$(top_builddir)/dbug/libdbug.a \	62	$(top_builddir)/dbug/libdbug.la \
63	$(top_builddir)/strings/libmystrings.a \	63	$(top_builddir)/strings/libmystrings.la \
64	@ZLIB_LIBS@	64	@ZLIB_LIBS@
65	archive_reader_LDFLAGS = @NOINST_LDFLAGS@	65	archive_reader_LDFLAGS = @NOINST_LDFLAGS@
66		66

Lines 27-38 Link Here

(-)../mysql-5.1.50/storage/blackhole/Makefile.am (-6 / +6 lines)
27	WRAPLIBS=	27	WRAPLIBS=
28		28
29	LDADD =	29	LDADD =
		30	LDFLAGS = --whole-archive
30		31
31	DEFS = @DEFS@	32	DEFS = @DEFS@
32		33
33	noinst_HEADERS = ha_blackhole.h	34	noinst_HEADERS = ha_blackhole.h
34		35
35	EXTRA_LTLIBRARIES = ha_blackhole.la	36	EXTRA_LTLIBRARIES = ha_blackhole.la libblackhole.la
36	pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@	37	pkgplugin_LTLIBRARIES = @plugin_blackhole_shared_target@
37	ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)	38	ha_blackhole_la_LDFLAGS=-module -rpath $(pkgplugindir)
38	ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN	39	ha_blackhole_la_CXXFLAGS=$(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
Lines 40-50 Link Here
40	ha_blackhole_la_SOURCES=ha_blackhole.cc	41	ha_blackhole_la_SOURCES=ha_blackhole.cc
41		42
42		43
43	EXTRA_LIBRARIES = libblackhole.a	44	noinst_LTLIBRARIES = @plugin_blackhole_static_target@
44	noinst_LIBRARIES = @plugin_blackhole_static_target@	45	libblackhole_la_CXXFLAGS=$(AM_CXXFLAGS)
45	libblackhole_a_CXXFLAGS=$(AM_CXXFLAGS)	46	libblackhole_la_CFLAGS = $(AM_CFLAGS)
46	libblackhole_a_CFLAGS = $(AM_CFLAGS)	47	libblackhole_la_SOURCES= ha_blackhole.cc
47	libblackhole_a_SOURCES= ha_blackhole.cc
48		48
49		49
50	EXTRA_DIST = CMakeLists.txt plug.in	50	EXTRA_DIST = CMakeLists.txt plug.in

Lines 25-44 Link Here

(-)../mysql-5.1.50/storage/csv/Makefile.am (-5 / +5 lines)
25	-I$(top_srcdir)/sql \	25	-I$(top_srcdir)/sql \
26	-I$(srcdir)	26	-I$(srcdir)
27	LDADD =	27	LDADD =
		28	LDFLAGS = --whole-archive
28		29
29	DEFS = @DEFS@	30	DEFS = @DEFS@
30	noinst_HEADERS = ha_tina.h transparent_file.h	31	noinst_HEADERS = ha_tina.h transparent_file.h
31		32
32	EXTRA_LTLIBRARIES = ha_csv.la	33	EXTRA_LTLIBRARIES = ha_csv.la libcsv.la
33	pkglib_LTLIBRARIES = @plugin_csv_shared_target@	34	pkglib_LTLIBRARIES = @plugin_csv_shared_target@
34	ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)	35	ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir)
35	ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN	36	ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN
36	ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc	37	ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc
37		38
38	EXTRA_LIBRARIES = libcsv.a	39	noinst_LTLIBRARIES = @plugin_csv_static_target@
39	noinst_LIBRARIES = @plugin_csv_static_target@	40	libcsv_la_CXXFLAGS = $(AM_CXXFLAGS)
40	libcsv_a_CXXFLAGS = $(AM_CXXFLAGS)	41	libcsv_la_SOURCES = transparent_file.cc ha_tina.cc
41	libcsv_a_SOURCES = transparent_file.cc ha_tina.cc
42		42
43	EXTRA_DIST = CMakeLists.txt plug.in	43	EXTRA_DIST = CMakeLists.txt plug.in
44	# Don't update the files from bitkeeper	44	# Don't update the files from bitkeeper

Lines 27-38 Link Here

(-)../mysql-5.1.50/storage/federated/Makefile.am (-6 / +6 lines)
27	WRAPLIBS=	27	WRAPLIBS=
28		28
29	LDADD =	29	LDADD =
		30	LDFLAGS = --whole-archive
30		31
31	DEFS = @DEFS@	32	DEFS = @DEFS@
32		33
33	noinst_HEADERS = ha_federated.h	34	noinst_HEADERS = ha_federated.h
34		35
35	EXTRA_LTLIBRARIES = ha_federated.la	36	EXTRA_LTLIBRARIES = ha_federated.la libfederated.la
36	pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@	37	pkgplugin_LTLIBRARIES = @plugin_federated_shared_target@
37	ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir)	38	ha_federated_la_LDFLAGS = -module -rpath $(pkgplugindir)
38	ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN	39	ha_federated_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
Lines 40-50 Link Here
40	ha_federated_la_SOURCES = ha_federated.cc	41	ha_federated_la_SOURCES = ha_federated.cc
41		42
42		43
43	EXTRA_LIBRARIES = libfederated.a	44	noinst_LTLIBRARIES = @plugin_federated_static_target@
44	noinst_LIBRARIES = @plugin_federated_static_target@	45	libfederated_la_CXXFLAGS = $(AM_CXXFLAGS)
45	libfederated_a_CXXFLAGS = $(AM_CXXFLAGS)	46	libfederated_la_CFLAGS = $(AM_CFLAGS)
46	libfederated_a_CFLAGS = $(AM_CFLAGS)	47	libfederated_la_SOURCES= ha_federated.cc
47	libfederated_a_SOURCES= ha_federated.cc
48		48
49		49
50	EXTRA_DIST = CMakeLists.txt plug.in	50	EXTRA_DIST = CMakeLists.txt plug.in

Lines 24-46 Link Here

(-)../mysql-5.1.50/storage/heap/Makefile.am (-11 / +11 lines)
24	WRAPLIBS=	24	WRAPLIBS=
25		25
26	LDADD =	26	LDADD =
		27	LDFLAGS = --whole-archive
27		28
28	DEFS = @DEFS@	29	DEFS = @DEFS@
29	pkglib_LIBRARIES = libheap.a	30	pkglib_LTLIBRARIES = libheap.la
30	noinst_PROGRAMS = hp_test1 hp_test2	31	noinst_PROGRAMS = hp_test1 hp_test2
31	noinst_LIBRARIES = libheap.a
32	hp_test1_LDFLAGS = @NOINST_LDFLAGS@	32	hp_test1_LDFLAGS = @NOINST_LDFLAGS@
33	hp_test1_LDADD = libheap.a \	33	hp_test1_LDADD = libheap.la \
34	$(top_builddir)/mysys/libmysys.a \	34	$(top_builddir)/mysys/libmysys.la \
35	$(top_builddir)/dbug/libdbug.a \	35	$(top_builddir)/dbug/libdbug.la \
36	$(top_builddir)/strings/libmystrings.a	36	$(top_builddir)/strings/libmystrings.la
37	hp_test2_LDFLAGS = @NOINST_LDFLAGS@	37	hp_test2_LDFLAGS = @NOINST_LDFLAGS@
38	hp_test2_LDADD = libheap.a \	38	hp_test2_LDADD = libheap.la \
39	$(top_builddir)/mysys/libmysys.a \	39	$(top_builddir)/mysys/libmysys.la \
40	$(top_builddir)/dbug/libdbug.a \	40	$(top_builddir)/dbug/libdbug.la \
41	$(top_builddir)/strings/libmystrings.a	41	$(top_builddir)/strings/libmystrings.la
42	noinst_HEADERS = heapdef.h ha_heap.h	42	noinst_HEADERS = heapdef.h ha_heap.h
43	libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \	43	libheap_la_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
44	hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \	44	hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
45	hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \	45	hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
46	hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \	46	hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \

Lines 20-89 Link Here

(-)../mysql-5.1.50/storage/myisam/Makefile.am (-51 / +19 lines)
20	INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \	20	INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
21	-I$(top_srcdir)/regex \	21	-I$(top_srcdir)/regex \
22	-I$(top_srcdir)/sql \	22	-I$(top_srcdir)/sql \
23	-I$(srcdir)	23	-I$(srcdir)
24	WRAPLIBS=	24	WRAPLIBS=
25		25
26	LDADD =	26	LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
		27	$(top_builddir)/mysys/libmysys.la \
		28	$(top_builddir)/dbug/libdbug.la \
		29	$(top_builddir)/strings/libmystrings.la @ZLIB_LIBS@
		30	LDFLAGS = --whole-archive
27		31
28	DEFS = @DEFS@	32	DEFS = @DEFS@
29		33
30	EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in	34	EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in
31	pkgdata_DATA = mi_test_all mi_test_all.res	35	pkgdata_DATA = mi_test_all mi_test_all.res
32		36
33	pkglib_LIBRARIES = libmyisam.a	37	noinst_LTLIBRARIES = libmyisam.la
34	bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump	38	bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump
35	myisamchk_DEPENDENCIES= $(LIBRARIES)	39	myisamchk_DEPENDENCIES= $(LTLIBRARIES)
36	myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \	40	myisamlog_DEPENDENCIES= $(LTLIBRARIES)
37	$(top_builddir)/mysys/libmysys.a \	41	myisampack_DEPENDENCIES=$(LTLIBRARIES)
38	$(top_builddir)/dbug/libdbug.a \
39	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
40	myisamlog_DEPENDENCIES= $(LIBRARIES)
41	myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
42	$(top_builddir)/mysys/libmysys.a \
43	$(top_builddir)/dbug/libdbug.a \
44	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
45	myisampack_DEPENDENCIES=$(LIBRARIES)
46	myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
47	$(top_builddir)/mysys/libmysys.a \
48	$(top_builddir)/dbug/libdbug.a \
49	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
50	noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval	42	noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
51	noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \	43	noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \
52	fulltext.h ftdefs.h ft_test1.h ft_eval.h \	44	fulltext.h ftdefs.h ft_test1.h ft_eval.h \
53	ha_myisam.h	45	ha_myisam.h
54	mi_test1_DEPENDENCIES= $(LIBRARIES)	46	mi_test1_DEPENDENCIES= $(LTLIBRARIES)
55	mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \	47	mi_test2_DEPENDENCIES= $(LTLIBRARIES)
56	$(top_builddir)/mysys/libmysys.a \	48	mi_test3_DEPENDENCIES= $(LTLIBRARIES)
57	$(top_builddir)/dbug/libdbug.a \	49	#ft_test1_DEPENDENCIES= $(LTLIBRARIES)
58	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@	50	#ft_eval_DEPENDENCIES= $(LTLIBRARIES)
59	mi_test2_DEPENDENCIES= $(LIBRARIES)	51	myisam_ftdump_DEPENDENCIES= $(LTLIBRARIES)
60	mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \	52	rt_test_DEPENDENCIES= $(LTLIBRARIES)
61	$(top_builddir)/mysys/libmysys.a \	53	sp_test_DEPENDENCIES= $(LTLIBRARIES)
62	$(top_builddir)/dbug/libdbug.a \	54	libmyisam_la_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
63	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
64	mi_test3_DEPENDENCIES= $(LIBRARIES)
65	mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
66	$(top_builddir)/mysys/libmysys.a \
67	$(top_builddir)/dbug/libdbug.a \
68	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
69	#ft_test1_DEPENDENCIES= $(LIBRARIES)
70	#ft_eval_DEPENDENCIES= $(LIBRARIES)
71	myisam_ftdump_DEPENDENCIES= $(LIBRARIES)
72	myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
73	$(top_builddir)/mysys/libmysys.a \
74	$(top_builddir)/dbug/libdbug.a \
75	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
76	rt_test_DEPENDENCIES= $(LIBRARIES)
77	rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
78	$(top_builddir)/mysys/libmysys.a \
79	$(top_builddir)/dbug/libdbug.a \
80	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
81	sp_test_DEPENDENCIES= $(LIBRARIES)
82	sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
83	$(top_builddir)/mysys/libmysys.a \
84	$(top_builddir)/dbug/libdbug.a \
85	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
86	libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
87	mi_rnext.c mi_rnext_same.c \	55	mi_rnext.c mi_rnext_same.c \
88	mi_search.c mi_page.c mi_key.c mi_locking.c \	56	mi_search.c mi_page.c mi_key.c mi_locking.c \
89	mi_rrnd.c mi_scan.c mi_cache.c \	57	mi_rrnd.c mi_scan.c mi_cache.c \

Lines 20-35 Link Here

(-)../mysql-5.1.50/storage/myisammrg/Makefile.am (-4 / +4 lines)
20	INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \	20	INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
21	-I$(top_srcdir)/regex \	21	-I$(top_srcdir)/regex \
22	-I$(top_srcdir)/sql \	22	-I$(top_srcdir)/sql \
23	-I$(srcdir)	23	-I$(srcdir)
24	WRAPLIBS=	24	WRAPLIBS=
25		25
26	LDADD =	26	LDADD =
		27	LDFLAGS = --whole-archive
27		28
28	DEFS = @DEFS@	29	DEFS = @DEFS@
29	pkglib_LIBRARIES = libmyisammrg.a	30	noinst_LTLIBRARIES = libmyisammrg.la
30	noinst_HEADERS = myrg_def.h ha_myisammrg.h	31	noinst_HEADERS = myrg_def.h ha_myisammrg.h
31	noinst_LIBRARIES = libmyisammrg.a	32	libmyisammrg_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
32	libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
33	myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \	33	myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
34	myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \	34	myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
35	myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \	35	myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \

Lines 65-88 Link Here

(-)../mysql-5.1.50/storage/ndb/src/kernel/vm/Makefile.am (-9 / +9 lines)
65	ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp	65	ndbd_malloc_impl_test_SOURCES = ndbd_malloc_impl.cpp
66	ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \	66	ndbd_malloc_impl_test_LDFLAGS = @ndb_bin_am_ldflags@ \
67	$(top_builddir)/storage/ndb/src/libndbclient.la \	67	$(top_builddir)/storage/ndb/src/libndbclient.la \
68	$(top_builddir)/mysys/libmysys.a \	68	$(top_builddir)/mysys/libmysys.la \
69	$(top_builddir)/dbug/libdbug.a \	69	$(top_builddir)/dbug/libdbug.la \
70	$(top_builddir)/strings/libmystrings.a	70	$(top_builddir)/strings/libmystrings.la
71		71
72	bench_pool_SOURCES = bench_pool.cpp	72	bench_pool_SOURCES = bench_pool.cpp
73	bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\	73	bench_pool_LDFLAGS = @ndb_bin_am_ldflags@\
74	libkernel.a ../error/liberror.a \	74	libkernel.a ../error/liberror.a \
75	$(top_builddir)/storage/ndb/src/libndbclient.la \	75	$(top_builddir)/storage/ndb/src/libndbclient.la \
76	$(top_builddir)/mysys/libmysys.a \	76	$(top_builddir)/mysys/libmysys.la \
77	$(top_builddir)/dbug/libdbug.a \	77	$(top_builddir)/dbug/libdbug.la \
78	$(top_builddir)/strings/libmystrings.a	78	$(top_builddir)/strings/libmystrings.la
79		79
80	testDynArr256_CXXFLAGS = -DUNIT_TEST	80	testDynArr256_CXXFLAGS = -DUNIT_TEST
81	testDynArr256_SOURCES = DynArr256.cpp	81	testDynArr256_SOURCES = DynArr256.cpp
82	testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \	82	testDynArr256_LDFLAGS = @ndb_bin_am_ldflags@ \
83	libkernel.a ../error/liberror.a \	83	libkernel.a ../error/liberror.a \
84	$(top_builddir)/storage/ndb/src/libndbclient.la \	84	$(top_builddir)/storage/ndb/src/libndbclient.la \
85	$(top_builddir)/mysys/libmysys.a \	85	$(top_builddir)/mysys/libmysys.la \
86	$(top_builddir)/dbug/libdbug.a \	86	$(top_builddir)/dbug/libdbug.la \
87	$(top_builddir)/strings/libmystrings.a	87	$(top_builddir)/strings/libmystrings.la
88		88

Lines 16-22 Link Here

(-)../mysql-5.1.50/strings/Makefile.am (-11 / +10 lines)
16	# This file is public domain and comes with NO WARRANTY of any kind	16	# This file is public domain and comes with NO WARRANTY of any kind
17		17
18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	18	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
19	pkglib_LIBRARIES = libmystrings.a	19	pkglib_LTLIBRARIES = libmystrings.la
20		20
21	# Exact one of ASSEMBLER_X	21	# Exact one of ASSEMBLER_X
22	if ASSEMBLER_x86	22	if ASSEMBLER_x86
Lines 37-43 Link Here
37	endif	37	endif
38	endif	38	endif
39		39
40	libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)	40	libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
41	noinst_PROGRAMS = conf_to_src	41	noinst_PROGRAMS = conf_to_src
42	CLEANFILES = str_test uctypedump test_decimal	42	CLEANFILES = str_test uctypedump test_decimal
43	# Default charset definitions	43	# Default charset definitions
Lines 56-83 Link Here
56	t_ctype.h my_strchr.c CMakeLists.txt \	56	t_ctype.h my_strchr.c CMakeLists.txt \
57	CHARSET_INFO.txt	57	CHARSET_INFO.txt
58		58
59	libmystrings_a_LIBADD=	59	libmystrings_la_LIBADD =
60	conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c	60	conf_to_src_SOURCES = conf_to_src.c
61	conf_to_src_LDADD=	61	conf_to_src_LDADD = libmystrings.la
62	#force static linking of conf_to_src - essential when linking against	62	#force static linking of conf_to_src - essential when linking against
63	#custom installation of libc	63	#custom installation of libc
64	conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
65		64
66	# This is because the dependency tracking misses @FOO@ vars in sources.	65	# This is because the dependency tracking misses @FOO@ vars in sources.
67	#strtoull.o: @CHARSET_OBJS@	66	#strtoull.o: @CHARSET_OBJS@
68		67
69		68
70	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@	69	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
71		70
72	str_test: str_test.c $(pkglib_LIBRARIES)	71	str_test: str_test.c $(pkglib_LTLIBRARIES)
73	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES)	72	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)
74		73
75	uctypedump: uctypedump.c	74	uctypedump: uctypedump.c
76	$(LINK) $(INCLUDES) $(srcdir)/uctypedump.c	75	$(LINK) $(INCLUDES) $(srcdir)/uctypedump.c
77		76
78	test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)	77	test_decimal$(EXEEXT): decimal.c $(pkglib_LTLIBRARIES)
79	$(CP) $(srcdir)/decimal.c ./test_decimal.c	78	$(CP) $(srcdir)/decimal.c ./test_decimal.c
80	$(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)	79	$(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
81	$(RM) -f ./test_decimal.c	80	$(RM) -f ./test_decimal.c
82		81
83	# Don't update the files from bitkeeper	82	# Don't update the files from bitkeeper

Lines 16-26 Link Here

(-)../mysql-5.1.50/vio/Makefile.am (-2 / +3 lines)
16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \	16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
17	$(openssl_includes)	17	$(openssl_includes)
18	LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)	18	LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
19	pkglib_LIBRARIES = libvio.a	19	pkglib_LTLIBRARIES = libvio.la
20		20
21	noinst_HEADERS = vio_priv.h	21	noinst_HEADERS = vio_priv.h
22		22
23	libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c	23	libvio_la_LIBADD = -lssl
		24	libvio_la_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
24		25
25	EXTRA_DIST= CMakeLists.txt	26	EXTRA_DIST= CMakeLists.txt
26		27