Attachment #186704 for bug #238487

Lines 37-43 Link Here

(-)mysql-5.0.76-old/client/Makefile.am (-1 / +1 lines)
37	$(top_srcdir)/mysys/my_copy.c \	37	$(top_srcdir)/mysys/my_copy.c \
38	$(top_srcdir)/mysys/my_mkdir.c	38	$(top_srcdir)/mysys/my_mkdir.c
39		39
40	mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD)	40	mysqltest_LDADD = $(top_builddir)/regex/libregex.la $(LDADD)
41	mysqlbinlog_SOURCES = mysqlbinlog.cc \	41	mysqlbinlog_SOURCES = mysqlbinlog.cc \
42	$(top_srcdir)/mysys/mf_tempdir.c \	42	$(top_srcdir)/mysys/mf_tempdir.c \
43	$(top_srcdir)/mysys/my_new.cc	43	$(top_srcdir)/mysys/my_new.cc




dnl Some libs are listed several times, in order for gcc to sort out
dnl circular references.
      innodb_libs="\
 \$(top_builddir)/innobase/usr/libusr.la\
 \$(top_builddir)/innobase/srv/libsrv.la\
 \$(top_builddir)/innobase/dict/libdict.la\
 \$(top_builddir)/innobase/que/libque.la\
 \$(top_builddir)/innobase/ibuf/libibuf.la\
 \$(top_builddir)/innobase/row/librow.la\
 \$(top_builddir)/innobase/pars/libpars.la\
 \$(top_builddir)/innobase/btr/libbtr.la\
 \$(top_builddir)/innobase/trx/libtrx.la\
 \$(top_builddir)/innobase/read/libread.la\
 \$(top_builddir)/innobase/buf/libbuf.la\
 \$(top_builddir)/innobase/eval/libeval.la\
 \$(top_builddir)/innobase/log/liblog.la\
 \$(top_builddir)/innobase/fsp/libfsp.la\
 \$(top_builddir)/innobase/fut/libfut.la\
 \$(top_builddir)/innobase/fil/libfil.la\
 \$(top_builddir)/innobase/lock/liblock.la\
 \$(top_builddir)/innobase/mtr/libmtr.la\
 \$(top_builddir)/innobase/page/libpage.la\
 \$(top_builddir)/innobase/rem/librem.la\
 \$(top_builddir)/innobase/thr/libthr.la\
 \$(top_builddir)/innobase/sync/libsync.la\
 \$(top_builddir)/innobase/data/libdata.la\
 \$(top_builddir)/innobase/mach/libmach.la\
 \$(top_builddir)/innobase/ha/libha.la\
 \$(top_builddir)/innobase/dyn/libdyn.la\
 \$(top_builddir)/innobase/mem/libmem.la\
 \$(top_builddir)/innobase/ut/libut.la\
 \$(top_builddir)/innobase/os/libos.la"
 \$(top_builddir)/innobase/mem/libmem.a\
 \$(top_builddir)/innobase/sync/libsync.a\
 \$(top_builddir)/innobase/ut/libut.a\
 \$(top_builddir)/innobase/os/libos.a\
 \$(top_builddir)/innobase/ut/libut.a"

      AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
      ;;

Lines 253-259 Link Here

(-)mysql-5.0.76-old/configure.in (-7 / +8 lines)
253	fi	253	fi
254		254
255	# Still need ranlib for readline; local static use only so no libtool.	255	# Still need ranlib for readline; local static use only so no libtool.
256	AC_PROG_RANLIB	256	#AC_PROG_RANLIB
257	# We use libtool	257	# We use libtool
258	#AC_LIBTOOL_WIN32_DLL	258	#AC_LIBTOOL_WIN32_DLL
259	AC_PROG_LIBTOOL	259	AC_PROG_LIBTOOL
Lines 574-579 Link Here
574	# We need an ANSI C compiler	574	# We need an ANSI C compiler
575	AM_PROG_CC_STDC	575	AM_PROG_CC_STDC
576		576
		577	# Testing as sugggested by Diego
		578	AM_PROG_CC_C_O
		579
577	# We need an assembler, too	580	# We need an assembler, too
578	AM_PROG_AS	581	AM_PROG_AS
579	CCASFLAGS="$CCASFLAGS $ASFLAGS"	582	CCASFLAGS="$CCASFLAGS $ASFLAGS"
Lines 2692-2700 Link Here
2692		2695
2693	if test "$THREAD_SAFE_CLIENT" = "no"	2696	if test "$THREAD_SAFE_CLIENT" = "no"
2694	then	2697	then
2695	sql_client_dirs="strings regex mysys dbug extra libmysql client"	2698	sql_client_dirs="strings regex dbug mysys extra libmysql client"
2696	else	2699	else
2697	sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"	2700	sql_client_dirs="strings regex dbug mysys extra libmysql libmysql_r client"
2698	linked_client_targets="$linked_client_targets linked_libmysql_r_sources"	2701	linked_client_targets="$linked_client_targets linked_libmysql_r_sources"
2699	AC_CONFIG_FILES(libmysql_r/Makefile)	2702	AC_CONFIG_FILES(libmysql_r/Makefile)
2700	AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])	2703	AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])
Lines 2723-2735 Link Here
2723	export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR	2726	export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
2724	ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"	2727	ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"
2725		2728
		2729	AM_CONDITIONAL([NEED_THREADS], [test x"$with_server" != xno -o x"$THREAD_SAFE_CLIENT" != xno])
2726	if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"	2730	if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
2727	then	2731	then
2728	AC_DEFINE([THREAD], [1],	2732	AC_DEFINE([THREAD], [1],
2729	[Define if you want to have threaded code. This may be undef on client code])	2733	[Define if you want to have threaded code. This may be undef on client code])
2730	# Avoid _PROGRAMS names
2731	THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
2732	AC_SUBST(THREAD_LOBJECTS)
2733	fi	2734	fi
2734		2735
2735	if test "$with_server" = "no"	2736	if test "$with_server" = "no"
Lines 2737-2743 Link Here
2737	AM_CONDITIONAL([BUILD_INNODB_TOOLS], [false])	2738	AM_CONDITIONAL([BUILD_INNODB_TOOLS], [false])
2738	else	2739	else
2739	server_scripts="mysqld_safe mysql_install_db"	2740	server_scripts="mysqld_safe mysql_install_db"
2740	sql_server_dirs="strings mysys dbug extra regex"	2741	sql_server_dirs="strings dbug mysys extra regex"
2741		2742
2742		2743
2743	#	2744	#




# MA 02111-1307, USA

INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
noinst_LTLIBRARIES =    libdbug.la
pkglib_LIBRARIES =      libdbug.a
noinst_HEADERS =        dbug_long.h
libdbug_la_SOURCES =    dbug.c sanity.c
EXTRA_DIST =            example1.c example2.c example3.c \
                        user.r monty.doc readme.prof 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.0.76-old/extra/Makefile.am (-2 / +1 lines)
15		15
16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \	16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
17	@ndbcluster_includes@ -I$(top_srcdir)/sql	17	@ndbcluster_includes@ -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 \
20	$(ZLIB_LIBS)	19	$(ZLIB_LIBS)
21	BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \	20	BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \
22	$(top_builddir)/include/sql_state.h \	21	$(top_builddir)/include/sql_state.h \




# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include 
LDADD =			libheap.la ../mysys/libmysys.la
pkglib_LTLIBRARIES =	libheap.la
pkglib_LIBRARIES =	libheap.a
noinst_PROGRAMS	=	hp_test1 hp_test2
hp_test1_LDFLAGS = @NOINST_LDFLAGS@
hp_test2_LDFLAGS = @NOINST_LDFLAGS@
noinst_HEADERS =	heapdef.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 15-23 Link Here

(-)mysql-5.0.76-old/innobase/btr/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libbtr.a	18	noinst_LTLIBRARIES = libbtr.la
19		19
20	libbtr_a_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c	20	libbtr_la_SOURCES = btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/buf/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libbuf.a	18	noinst_LTLIBRARIES = libbuf.la
19		19
20	libbuf_a_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c	20	libbuf_la_SOURCES = buf0buf.c buf0flu.c buf0lru.c buf0rea.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23




CXXFLAGS="$CXXFLAGS "

AC_PROG_CC
#AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_CHECK_HEADERS(aio.h sched.h)

fi
AC_SUBST(ARFLAGS)

AC_OUTPUT(Makefile)
		buf/Makefile data/Makefile dnl
		dict/Makefile dyn/Makefile dnl
		eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl
		ha/Makefile ibuf/Makefile include/Makefile dnl
		lock/Makefile log/Makefile dnl
		mach/Makefile mem/Makefile mtr/Makefile dnl
		page/Makefile pars/Makefile que/Makefile dnl
		read/Makefile rem/Makefile row/Makefile dnl
		srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl
		usr/Makefile)

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/data/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libdata.a	18	noinst_LTLIBRARIES = libdata.la
19		19
20	libdata_a_SOURCES = data0data.c data0type.c	20	libdata_la_SOURCES = data0data.c data0type.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/dict/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libdict.a	18	noinst_LTLIBRARIES = libdict.la
19		19
20	libdict_a_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\	20	libdict_la_SOURCES = dict0boot.c dict0crea.c dict0dict.c dict0load.c\
21	dict0mem.c	21	dict0mem.c
22		22
23	EXTRA_PROGRAMS =	23	EXTRA_PROGRAMS =

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/dyn/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libdyn.a	18	noinst_LTLIBRARIES = libdyn.la
19		19
20	libdyn_a_SOURCES = dyn0dyn.c	20	libdyn_la_SOURCES = dyn0dyn.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/eval/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libeval.a	18	noinst_LTLIBRARIES = libeval.la
19		19
20	libeval_a_SOURCES = eval0eval.c eval0proc.c	20	libeval_la_SOURCES = eval0eval.c eval0proc.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/fil/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libfil.a	18	noinst_LTLIBRARIES = libfil.la
19		19
20	libfil_a_SOURCES = fil0fil.c	20	libfil_la_SOURCES = fil0fil.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 16-24 Link Here

(-)mysql-5.0.76-old/innobase/fsp/Makefile.am (-2 / +2 lines)
16		16
17	include ../include/Makefile.i	17	include ../include/Makefile.i
18		18
19	noinst_LIBRARIES = libfsp.a	19	noinst_LTLIBRARIES = libfsp.la
20		20
21	libfsp_a_SOURCES = fsp0fsp.c	21	libfsp_la_SOURCES = fsp0fsp.c
22		22
23	EXTRA_PROGRAMS =	23	EXTRA_PROGRAMS =
24		24

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/fut/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libfut.a	18	noinst_LTLIBRARIES = libfut.la
19		19
20	libfut_a_SOURCES = fut0fut.c fut0lst.c	20	libfut_la_SOURCES = fut0fut.c fut0lst.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/ha/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libha.a	18	noinst_LTLIBRARIES = libha.la
19		19
20	libha_a_SOURCES = ha0ha.c hash0hash.c	20	libha_la_SOURCES = ha0ha.c hash0hash.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/ibuf/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libibuf.a	18	noinst_LTLIBRARIES = libibuf.la
19		19
20	libibuf_a_SOURCES = ibuf0ibuf.c	20	libibuf_la_SOURCES = ibuf0ibuf.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/lock/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = liblock.a	18	noinst_LTLIBRARIES = liblock.la
19		19
20	liblock_a_SOURCES = lock0lock.c	20	liblock_la_SOURCES = lock0lock.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/log/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = liblog.a	18	noinst_LTLIBRARIES = liblog.la
19		19
20	liblog_a_SOURCES = log0log.c log0recv.c	20	liblog_la_SOURCES = log0log.c log0recv.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/mach/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libmach.a	18	noinst_LTLIBRARIES = libmach.la
19		19
20	libmach_a_SOURCES = mach0data.c	20	libmach_la_SOURCES = mach0data.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23





# Process this file with automake to create Makefile.in

AUTOMAKE_OPTIONS =	foreign
TAR =			gtar

noinst_HEADERS = ib_config.h

INCLUDES = -I$(srcdir)/include -I$(srcdir)/../include

pkglib_LTLIBRARIES = libinnobase.la

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 dict/dict0crea.c dict/dict0dict.c \
	dict/dict0load.c dict/dict0mem.c dyn/dyn0dyn.c \
	eval/eval0eval.c eval/eval0proc.c fil/fil0fil.c \
	fsp/fsp0fsp.c fut/fut0fut.c fut/fut0lst.c ha/ha0ha.c \
	ha/hash0hash.c ibuf/ibuf0ibuf.c lock/lock0lock.c \
	log/log0log.c log/log0recv.c mach/mach0data.c \
	mem/mem0mem.c mem/mem0pool.c mtr/mtr0mtr.c mtr/mtr0log.c \
	os/os0proc.c os/os0sync.c os/os0thread.c os/os0file.c \
	page/page0page.c page/page0cur.c pars/pars0grm.c pars/lexyy.c \
	pars/pars0opt.c pars/pars0pars.c pars/pars0sym.c \
	que/que0que.c read/read0read.c rem/rem0rec.c rem/rem0cmp.c \
	row/row0ins.c row/row0mysql.c row/row0purge.c row/row0row.c \
	row/row0sel.c row/row0uins.c row/row0umod.c row/row0undo.c \
	row/row0upd.c row/row0vers.c srv/srv0srv.c srv/srv0que.c \
	srv/srv0start.c sync/sync0arr.c sync/sync0rw.c \
	sync/sync0sync.c thr/thr0loc.c trx/trx0purge.c \
	trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c trx/trx0sys.c \
	trx/trx0trx.c trx/trx0undo.c usr/usr0sess.c ut/ut0byte.c \
	ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c

EXTRA_DIST = CMakeLists.txt

# Don't update the files from bitkeeper

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/mem/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libmem.a	18	noinst_LTLIBRARIES = libmem.la
19		19
20	libmem_a_SOURCES = mem0mem.c mem0pool.c	20	libmem_la_SOURCES = mem0mem.c mem0pool.c
21		21
22	EXTRA_DIST = mem0dbg.c	22	EXTRA_DIST = mem0dbg.c
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/mtr/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libmtr.a	18	noinst_LTLIBRARIES = libmtr.la
19		19
20	libmtr_a_SOURCES = mtr0mtr.c mtr0log.c	20	libmtr_la_SOURCES = mtr0mtr.c mtr0log.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/os/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libos.a	18	noinst_LTLIBRARIES = libos.la
19		19
20	libos_a_SOURCES = os0proc.c os0sync.c os0thread.c os0file.c	20	libos_la_SOURCES = os0proc.c os0sync.c os0thread.c os0file.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/page/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libpage.a	18	noinst_LTLIBRARIES = libpage.la
19		19
20	libpage_a_SOURCES = page0page.c page0cur.c	20	libpage_la_SOURCES = page0page.c page0cur.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-25 Link Here

(-)mysql-5.0.76-old/innobase/pars/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libpars.a	18	noinst_LTLIBRARIES = libpars.la
19		19
20	noinst_HEADERS = pars0grm.h	20	noinst_HEADERS = pars0grm.h
21		21
22	libpars_a_SOURCES = pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sym.c	22	libpars_la_SOURCES = pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sym.c
23		23
24	EXTRA_PROGRAMS =	24	EXTRA_PROGRAMS =
25		25

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/que/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libque.a	18	noinst_LTLIBRARIES = libque.la
19		19
20	libque_a_SOURCES = que0que.c	20	libque_la_SOURCES = que0que.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/read/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libread.a	18	noinst_LTLIBRARIES = libread.la
19		19
20	libread_a_SOURCES = read0read.c	20	libread_la_SOURCES = read0read.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/rem/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = librem.a	18	noinst_LTLIBRARIES = librem.la
19		19
20	librem_a_SOURCES = rem0rec.c rem0cmp.c	20	librem_la_SOURCES = rem0rec.c rem0cmp.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/row/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = librow.a	18	noinst_LTLIBRARIES = librow.la
19		19
20	librow_a_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\	20	librow_la_SOURCES = row0ins.c row0mysql.c row0purge.c row0row.c row0sel.c\
21	row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c	21	row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c
22		22
23	EXTRA_PROGRAMS =	23	EXTRA_PROGRAMS =

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/srv/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libsrv.a	18	noinst_LTLIBRARIES = libsrv.la
19		19
20	libsrv_a_SOURCES = srv0srv.c srv0que.c srv0start.c	20	libsrv_la_SOURCES = srv0srv.c srv0que.c srv0start.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/sync/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libsync.a	18	noinst_LTLIBRARIES = libsync.la
19		19
20	libsync_a_SOURCES = sync0arr.c sync0rw.c sync0sync.c	20	libsync_la_SOURCES = sync0arr.c sync0rw.c sync0sync.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/thr/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libthr.a	18	noinst_LTLIBRARIES = libthr.la
19		19
20	libthr_a_SOURCES = thr0loc.c	20	libthr_la_SOURCES = thr0loc.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/trx/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libtrx.a	18	noinst_LTLIBRARIES = libtrx.la
19		19
20	libtrx_a_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\	20	libtrx_la_SOURCES = trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\
21	trx0sys.c trx0trx.c trx0undo.c	21	trx0sys.c trx0trx.c trx0undo.c
22		22
23	EXTRA_PROGRAMS =	23	EXTRA_PROGRAMS =

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/usr/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libusr.a	18	noinst_LTLIBRARIES = libusr.la
19		19
20	libusr_a_SOURCES = usr0sess.c	20	libusr_la_SOURCES = usr0sess.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 15-23 Link Here

(-)mysql-5.0.76-old/innobase/ut/Makefile.am (-2 / +2 lines)
15		15
16	include ../include/Makefile.i	16	include ../include/Makefile.i
17		17
18	noinst_LIBRARIES = libut.a	18	noinst_LTLIBRARIES = libut.la
19		19
20	libut_a_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c	20	libut_la_SOURCES = ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c
21		21
22	EXTRA_PROGRAMS =	22	EXTRA_PROGRAMS =
23		23

Lines 106-113 Link Here

(-)mysql-5.0.76-old/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. -DUNDEF_THREADS_HACK' >>$$dir/Makefile; \	107	echo 'CFLAGS= -I. -DUNDEF_THREADS_HACK' >>$$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 @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) \
                @NDB_SCI_LIBS@

mysqltest_embedded_LINK = $(CXXLINK)
mysqltest_embedded_SOURCES =	mysqltest.c
mysqltest_embedded_LDADD =	$(LDADD) $(top_builddir)/regex/libregex.la

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




			-I$(top_srcdir)/regex \
			$(openssl_includes) @ZLIB_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 \
                        my_time.c
sqlexamplessources =	ha_example.cc ha_tina.cc

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
	ha_blackhole.cc ha_archive.cc my_user.c

libmysqld_int_la_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
#libmysqld_la_SOURCES=
libmysqld_la_SOURCES=	libmysqld.c lib_sql.cc emb_qcache.cc

# 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)/myisam/libmyisam.la \
		$(top_builddir)/myisammrg/libmyisammrg.la \
		$(top_builddir)/heap/libheap.la \
		$(top_builddir)/innobase/libinnobase.la @bdb_libs_with_path@ \
		$(top_builddir)/mysys/libmysys.la \
		$(top_builddir)/vio/libvio.la @NDB_SCI_LIBS@ \
		libmysqld_int.la
		$(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@


#
# 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)
if DARWIN_MWCC
	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
else
		-rm -f libmysqld.a
		if test "$(host_os)" = "netware" ; \
		then \
		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
		else \
		  for arc in ./libmysqld_int.a $(INC_LIB); do \
		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
		    $(AR) t $$arc|sed "s|^|$$arpath|"; \
		  done | sort -u | xargs $(AR) cq libmysqld.a ; \
		  $(RANLIB) libmysqld.a	; \
		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




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

INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
				-I$(top_builddir)/sql -I$(top_srcdir)/sql
LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
			$(top_builddir)/mysys/libmysys.la \
			$(ZLIB_LIBS)
noinst_LTLIBRARIES =	libmyisam.la
bin_PROGRAMS =		myisamchk myisamlog myisampack myisam_ftdump
myisamchk_DEPENDENCIES=	$(LTLIBRARIES)
myisamlog_DEPENDENCIES=	$(LTLIBRARIES)
myisampack_DEPENDENCIES=$(LTLIBRARIES)
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
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 \
			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 14-22 Link Here

(-)mysql-5.0.76-old/myisammrg/Makefile.am (-2 / +2 lines)
14	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	14	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15		15
16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
17	pkglib_LIBRARIES = libmyisammrg.a	17	noinst_LTLIBRARIES = libmyisammrg.la
18	noinst_HEADERS = myrg_def.h	18	noinst_HEADERS = myrg_def.h
19	libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \	19	libmyisammrg_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
20	myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \	20	myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
21	myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \	21	myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
22	myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \	22	myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \




MYSQLBASEdir=		$(prefix)
INCLUDES =		@ZLIB_INCLUDES@ -I$(top_builddir)/include \
			-I$(top_srcdir)/include -I$(srcdir)
pkglib_LTLIBRARIES =	libmysys.la
LDADD =			libmysys.a ../dbug/libdbug.a \
			../strings/libmystrings.a
noinst_HEADERS =	mysys_priv.h my_static.h \
			my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
			my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
			my_os2thread.c my_os2tls.c
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 raid.cc \
			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_handler.c my_netware.c my_largepage.c \
			my_memmem.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_THREADS
libmysys_la_SOURCES += thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c my_pthread.c my_thr_init.c
endif

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

			-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_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 $(LTLIBRARIES)
	$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
	$(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 27-34 Link Here

(-)mysql-5.0.76-old/pstack/Makefile.am (-2 / +2 lines)
27	EXTRA_DIST= $(SRC)	27	EXTRA_DIST= $(SRC)
28		28
29	if COMPILE_PSTACK	29	if COMPILE_PSTACK
30	pkglib_LIBRARIES = libpstack.a	30	pkglib_LTLIBRARIES = libpstack.la
31	libpstack_a_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c debug.c ieee.c pstack.c stabs.c	31	libpstack_la_SOURCES = bucomm.c filemode.c linuxthreads.c rddbg.c debug.c ieee.c pstack.c stabs.c
32	endif	32	endif
33		33
34	# Don't update the files from bitkeeper	34	# Don't update the files from bitkeeper

Lines 16-25 Link Here

(-)mysql-5.0.76-old/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	noinst_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

libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
	$(top_builddir)/sql/pack.$(OBJEXT) \
	$(top_builddir)/sql/sql_state.$(OBJEXT) \
	$(top_builddir)/sql/mini_client_errors.$(OBJEXT)\
	$(top_builddir)/sql/client.$(OBJEXT)

CLEANFILES= net_serv.cc client_settings.h


                        portability.h

mysqlmanager_LDADD=	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@






			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
			-I$(top_builddir)/include -I$(top_srcdir)/include \
			-I$(top_srcdir)/regex -I$(srcdir) \
			$(openssl_includes)
WRAPLIBS=		@WRAPLIBS@
SUBDIRS =		share
libexec_PROGRAMS =	mysqld
EXTRA_PROGRAMS =	gen_lex_hash
bin_PROGRAMS =		mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
LDADD =			$(top_builddir)/myisam/libmyisam.la \
			$(top_builddir)/myisammrg/libmyisammrg.la \
			$(top_builddir)/heap/libheap.la \
			$(top_builddir)/vio/libvio.la \
			$(top_builddir)/mysys/libmysys.la \
			$(top_builddir)/regex/libregex.la \
			@ZLIB_LIBS@ @NDB_SCI_LIBS@

mysqld_LDADD =	@MYSQLD_EXTRA_LDFLAGS@ \
			@bdb_libs@ $(top_builddir)/innobase/libinnobase.la \
			@pstack_libs@ @innodb_system_libs@ \
                        @innodb_system_libs@ \
			@ndbcluster_libs@ @ndbcluster_system_libs@ \
			$(LDADD)  $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
			$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@

			procedure.h sql_class.h sql_lex.h sql_list.h \
			sql_manager.h sql_map.h sql_string.h unireg.h \
			sql_error.h field.h handler.h mysqld_suffix.h \
			ha_heap.h ha_berkeley.h ha_innodb.h \
			ha_ndbcluster.h ha_ndbcluster_cond.h opt_range.h \
			protocol.h sql_select.h structs.h table.h sql_udf.h \
			hash_filo.h lex.h lex_symbol.h sql_acl.h sql_crypt.h  \
			log_event.h sql_repl.h slave.h stacktrace.h sql_sort.h \
			sql_cache.h set_var.h spatial.h gstream.h \
			client_settings.h tzfile.h tztime.h my_decimal.h\
			stacktrace.h sql_sort.h sql_cache.h set_var.h \
			spatial.h gstream.h client_settings.h tzfile.h \
                        tztime.h my_decimal.h\
			sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
			parse_file.h sql_view.h	sql_trigger.h \
			sql_array.h sql_cursor.h examples/ha_example.h \
			ha_archive.h examples/ha_tina.h ha_blackhole.h  \
			examples/ha_tina.h ha_blackhole.h  \
			ha_federated.h
mysqld_SOURCES =	sql_lex.cc sql_handler.cc item.cc item_sum.cc \
			item_buff.cc item_func.cc item_cmpfunc.cc \
			item_strfunc.cc item_timefunc.cc thr_malloc.cc \
			item_create.cc item_subselect.cc item_row.cc \
			item_geofunc.cc field.cc strfunc.cc key.cc \
			sql_class.cc sql_list.cc net_serv.cc protocol.cc \
			sql_state.c lock.cc my_lock.c sql_string.cc \
			sql_manager.cc sql_map.cc mysqld.cc password.c \
			hash_filo.cc hostname.cc set_var.cc sql_parse.cc \
			sql_yacc.yy sql_base.cc table.cc sql_select.cc \
			sql_insert.cc sql_prepare.cc sql_error.cc \
			sql_locale.cc sql_update.cc sql_delete.cc uniques.cc \
			sql_do.cc procedure.cc item_uniq.cc sql_test.cc \
			sql_update.cc sql_delete.cc uniques.cc sql_do.cc \
			procedure.cc item_uniq.cc sql_test.cc \
			log.cc log_event.cc init.cc derror.cc sql_acl.cc \
			unireg.cc des_key_file.cc discover.cc time.cc \
			opt_range.cc opt_sum.cc records.cc filesort.cc \
			handler.cc ha_heap.cc ha_berkeley.cc ha_innodb.cc \
		        ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
	                ha_berkeley.cc ha_innodb.cc \
			ha_ndbcluster.cc ha_ndbcluster_cond.cc \
			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \

			slave.cc sql_repl.cc sql_union.cc sql_derived.cc \
			client.c sql_client.cc mini_client_errors.c pack.c\
			stacktrace.c repl_failsafe.h repl_failsafe.cc \
			sql_olap.cc sql_view.cc gstream.cc spatial.cc \
			sql_help.cc sql_cursor.cc tztime.cc my_time.c \
			my_user.c my_decimal.cc sp_head.cc sp_pcontext.cc \
			sp_rcontext.cc sp.cc sp_cache.cc parse_file.cc \
			sql_trigger.cc examples/ha_example.cc ha_archive.cc \
			examples/ha_tina.cc ha_blackhole.cc ha_federated.cc \
			ha_myisam.cc ha_myisammrg.cc
			ha_federated.cc

gen_lex_hash_SOURCES =	gen_lex_hash.cc
gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)




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

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

# Exact one of ASSEMBLER_X
if ASSEMBLER_x86

endif
endif

libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
noinst_PROGRAMS = conf_to_src
# Default charset definitions
EXTRA_DIST =		ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \

			strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
			t_ctype.h CMakeLists.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)

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 42-52 Link Here

(-)mysql-5.0.76-old/tests/Makefile.am (-3 / +3 lines)
42		42
43	insert_test_SOURCES= insert_test.c	43	insert_test_SOURCES= insert_test.c
44	select_test_SOURCES= select_test.c	44	select_test_SOURCES= select_test.c
45	insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	45	insert_test_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
46	select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	46	select_test_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
47		47
48	bug25714_SOURCES= bug25714.c	48	bug25714_SOURCES= bug25714.c
49	bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	49	bug25714_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
50		50
51	# Fix for mit-threads	51	# Fix for mit-threads
52	DEFS = -DUNDEF_THREADS_HACK	52	DEFS = -DUNDEF_THREADS_HACK

Lines 23-29 Link Here

(-)mysql-5.0.76-old/tools/Makefile.am (-1 / +1 lines)
23		23
24	bin_PROGRAMS= mysqltestmanager	24	bin_PROGRAMS= mysqltestmanager
25	mysqltestmanager_SOURCES= mysqlmanager.c	25	mysqltestmanager_SOURCES= mysqlmanager.c
26	mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)	26	mysqltestmanager_DEPENDENCIES= $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
27	DEF= -DUNDEF_THREADS_HACK	27	DEF= -DUNDEF_THREADS_HACK
28		28
29	# Don't update the files from bitkeeper	29	# Don't update the files from bitkeeper




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 238487

Lines 25-64 Link Here

(-)mysql-5.0.76-old/config/ac-macros/ha_innodb.m4 (-34 / +29 lines)
25	dnl Some libs are listed several times, in order for gcc to sort out	25	dnl Some libs are listed several times, in order for gcc to sort out
26	dnl circular references.	26	dnl circular references.
27	innodb_libs="\	27	innodb_libs="\
28	\$(top_builddir)/innobase/usr/libusr.a\	28	\$(top_builddir)/innobase/usr/libusr.la\
29	\$(top_builddir)/innobase/srv/libsrv.a\	29	\$(top_builddir)/innobase/srv/libsrv.la\
30	\$(top_builddir)/innobase/dict/libdict.a\	30	\$(top_builddir)/innobase/dict/libdict.la\
31	\$(top_builddir)/innobase/que/libque.a\	31	\$(top_builddir)/innobase/que/libque.la\
32	\$(top_builddir)/innobase/srv/libsrv.a\	32	\$(top_builddir)/innobase/ibuf/libibuf.la\
33	\$(top_builddir)/innobase/ibuf/libibuf.a\	33	\$(top_builddir)/innobase/row/librow.la\
34	\$(top_builddir)/innobase/row/librow.a\	34	\$(top_builddir)/innobase/pars/libpars.la\
35	\$(top_builddir)/innobase/pars/libpars.a\	35	\$(top_builddir)/innobase/btr/libbtr.la\
36	\$(top_builddir)/innobase/btr/libbtr.a\	36	\$(top_builddir)/innobase/trx/libtrx.la\
37	\$(top_builddir)/innobase/trx/libtrx.a\	37	\$(top_builddir)/innobase/read/libread.la\
38	\$(top_builddir)/innobase/read/libread.a\	38	\$(top_builddir)/innobase/buf/libbuf.la\
39	\$(top_builddir)/innobase/usr/libusr.a\	39	\$(top_builddir)/innobase/eval/libeval.la\
40	\$(top_builddir)/innobase/buf/libbuf.a\	40	\$(top_builddir)/innobase/log/liblog.la\
41	\$(top_builddir)/innobase/ibuf/libibuf.a\	41	\$(top_builddir)/innobase/fsp/libfsp.la\
42	\$(top_builddir)/innobase/eval/libeval.a\	42	\$(top_builddir)/innobase/fut/libfut.la\
43	\$(top_builddir)/innobase/log/liblog.a\	43	\$(top_builddir)/innobase/fil/libfil.la\
44	\$(top_builddir)/innobase/fsp/libfsp.a\	44	\$(top_builddir)/innobase/lock/liblock.la\
45	\$(top_builddir)/innobase/fut/libfut.a\	45	\$(top_builddir)/innobase/mtr/libmtr.la\
46	\$(top_builddir)/innobase/fil/libfil.a\	46	\$(top_builddir)/innobase/page/libpage.la\
47	\$(top_builddir)/innobase/lock/liblock.a\	47	\$(top_builddir)/innobase/rem/librem.la\
48	\$(top_builddir)/innobase/mtr/libmtr.a\	48	\$(top_builddir)/innobase/thr/libthr.la\
49	\$(top_builddir)/innobase/page/libpage.a\	49	\$(top_builddir)/innobase/sync/libsync.la\
50	\$(top_builddir)/innobase/rem/librem.a\	50	\$(top_builddir)/innobase/data/libdata.la\
51	\$(top_builddir)/innobase/thr/libthr.a\	51	\$(top_builddir)/innobase/mach/libmach.la\
52	\$(top_builddir)/innobase/sync/libsync.a\	52	\$(top_builddir)/innobase/ha/libha.la\
53	\$(top_builddir)/innobase/data/libdata.a\	53	\$(top_builddir)/innobase/dyn/libdyn.la\
54	\$(top_builddir)/innobase/mach/libmach.a\	54	\$(top_builddir)/innobase/mem/libmem.la\
55	\$(top_builddir)/innobase/ha/libha.a\	55	\$(top_builddir)/innobase/ut/libut.la\
56	\$(top_builddir)/innobase/dyn/libdyn.a\	56	\$(top_builddir)/innobase/os/libos.la"
57	\$(top_builddir)/innobase/mem/libmem.a\
58	\$(top_builddir)/innobase/sync/libsync.a\
59	\$(top_builddir)/innobase/ut/libut.a\
60	\$(top_builddir)/innobase/os/libos.a\
61	\$(top_builddir)/innobase/ut/libut.a"
62		57
63	AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])	58	AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
64	;;	59	;;

Lines 16-25 Link Here

(-)mysql-5.0.76-old/dbug/Makefile.am (-5 / +4 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	noinst_LTLIBRARIES = libdbug.la
20	pkglib_LIBRARIES = libdbug.a
21	noinst_HEADERS = dbug_long.h	20	noinst_HEADERS = dbug_long.h
22	libdbug_a_SOURCES = dbug.c sanity.c	21	libdbug_la_SOURCES = dbug.c sanity.c
23	EXTRA_DIST = example1.c example2.c example3.c \	22	EXTRA_DIST = example1.c example2.c example3.c \
24	user.r monty.doc readme.prof dbug_add_tags.pl \	23	user.r monty.doc readme.prof dbug_add_tags.pl \
25	my_main.c main.c factorial.c dbug_analyze.c \	24	my_main.c main.c factorial.c dbug_analyze.c \
Lines 31-41 Link Here
31		30
32		31
33	# Must be linked with libs that are not compiled yet	32	# Must be linked with libs that are not compiled yet
34	noinst_PROGRAMS = factorial dbug_analyze	33	EXTRA_PROGRAMS = factorial dbug_analyze
35	factorial_SOURCES = my_main.c factorial.c	34	factorial_SOURCES = my_main.c factorial.c
36	dbug_analyze_SOURCES = dbug_analyze.c	35	dbug_analyze_SOURCES = dbug_analyze.c
37		36
38	all: user.t user.ps	37	check-local: user.t user.ps
39		38
40	user.t: user.r $(NROFF_INC)	39	user.t: user.r $(NROFF_INC)
41	-nroff -mm user.r > $@	40	-nroff -mm user.r > $@

Lines 14-27 Link Here

(-)mysql-5.0.76-old/heap/Makefile.am (-4 / +3 lines)
14	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	14	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15		15
16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	16	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
17	LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \	17	LDADD = libheap.la ../mysys/libmysys.la
18	../strings/libmystrings.a	18	pkglib_LTLIBRARIES = libheap.la
19	pkglib_LIBRARIES = libheap.a
20	noinst_PROGRAMS = hp_test1 hp_test2	19	noinst_PROGRAMS = hp_test1 hp_test2
21	hp_test1_LDFLAGS = @NOINST_LDFLAGS@	20	hp_test1_LDFLAGS = @NOINST_LDFLAGS@
22	hp_test2_LDFLAGS = @NOINST_LDFLAGS@	21	hp_test2_LDFLAGS = @NOINST_LDFLAGS@
23	noinst_HEADERS = heapdef.h	22	noinst_HEADERS = heapdef.h
24	libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \	23	libheap_la_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
25	hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \	24	hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
26	hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \	25	hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
27	hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \	26	hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \

Lines 32-38 Link Here

(-)mysql-5.0.76-old/innobase/configure.in (-12 / +2 lines)
32	CXXFLAGS="$CXXFLAGS "	32	CXXFLAGS="$CXXFLAGS "
33		33
34	AC_PROG_CC	34	AC_PROG_CC
35	AC_PROG_RANLIB	35	#AC_PROG_RANLIB
36	AC_PROG_INSTALL	36	AC_PROG_INSTALL
37	AC_PROG_LIBTOOL	37	AC_PROG_LIBTOOL
38	AC_CHECK_HEADERS(aio.h sched.h)	38	AC_CHECK_HEADERS(aio.h sched.h)
Lines 126-139 Link Here
126	fi	126	fi
127	AC_SUBST(ARFLAGS)	127	AC_SUBST(ARFLAGS)
128		128
129	AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl	129	AC_OUTPUT(Makefile)
130	buf/Makefile data/Makefile dnl
131	dict/Makefile dyn/Makefile dnl
132	eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl
133	ha/Makefile ibuf/Makefile include/Makefile dnl
134	lock/Makefile log/Makefile dnl
135	mach/Makefile mem/Makefile mtr/Makefile dnl
136	page/Makefile pars/Makefile que/Makefile dnl
137	read/Makefile rem/Makefile row/Makefile dnl
138	srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl
139	usr/Makefile)

Lines 15-28 Link Here

(-)mysql-5.0.76-old/innobase/Makefile.am (-6 / +27 lines)
15		15
16	# Process this file with automake to create Makefile.in	16	# Process this file with automake to create Makefile.in
17		17
18	AUTOMAKE_OPTIONS = foreign
19	TAR = gtar
20
21	noinst_HEADERS = ib_config.h	18	noinst_HEADERS = ib_config.h
22		19
23	SUBDIRS = os ut btr buf data dict dyn eval fil fsp fut \	20	INCLUDES = -I$(srcdir)/include -I$(srcdir)/../include
24	ha ibuf include lock log mach mem mtr page \	21
25	pars que read rem row srv sync thr trx usr	22	pkglib_LTLIBRARIES = libinnobase.la
		23
		24	libinnobase_la_SOURCES = btr/btr0btr.c btr/btr0cur.c \
		25	btr/btr0pcur.c btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c \
		26	buf/buf0lru.c buf/buf0rea.c data/data0data.c data/data0type.c \
		27	dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c \
		28	dict/dict0load.c dict/dict0mem.c dyn/dyn0dyn.c \
		29	eval/eval0eval.c eval/eval0proc.c fil/fil0fil.c \
		30	fsp/fsp0fsp.c fut/fut0fut.c fut/fut0lst.c ha/ha0ha.c \
		31	ha/hash0hash.c ibuf/ibuf0ibuf.c lock/lock0lock.c \
		32	log/log0log.c log/log0recv.c mach/mach0data.c \
		33	mem/mem0mem.c mem/mem0pool.c mtr/mtr0mtr.c mtr/mtr0log.c \
		34	os/os0proc.c os/os0sync.c os/os0thread.c os/os0file.c \
		35	page/page0page.c page/page0cur.c pars/pars0grm.c pars/lexyy.c \
		36	pars/pars0opt.c pars/pars0pars.c pars/pars0sym.c \
		37	que/que0que.c read/read0read.c rem/rem0rec.c rem/rem0cmp.c \
		38	row/row0ins.c row/row0mysql.c row/row0purge.c row/row0row.c \
		39	row/row0sel.c row/row0uins.c row/row0umod.c row/row0undo.c \
		40	row/row0upd.c row/row0vers.c srv/srv0srv.c srv/srv0que.c \
		41	srv/srv0start.c sync/sync0arr.c sync/sync0rw.c \
		42	sync/sync0sync.c thr/thr0loc.c trx/trx0purge.c \
		43	trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c trx/trx0sys.c \
		44	trx/trx0trx.c trx/trx0undo.c usr/usr0sess.c ut/ut0byte.c \
		45	ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c
		46
26	EXTRA_DIST = CMakeLists.txt	47	EXTRA_DIST = CMakeLists.txt
27		48
28	# Don't update the files from bitkeeper	49	# Don't update the files from bitkeeper

Lines 35-46 Link Here

(-)mysql-5.0.76-old/libmysqld/examples/Makefile.am (-2 / +2 lines)
35	-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \	35	-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
36	$(openssl_includes)	36	$(openssl_includes)
37	LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)	37	LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
38	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) \	38	LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) \
39	@NDB_SCI_LIBS@	39	@NDB_SCI_LIBS@
40		40
41	mysqltest_embedded_LINK = $(CXXLINK)	41	mysqltest_embedded_LINK = $(CXXLINK)
42	mysqltest_embedded_SOURCES = mysqltest.c	42	mysqltest_embedded_SOURCES = mysqltest.c
43	mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.a	43	mysqltest_embedded_LDADD = $(LDADD) $(top_builddir)/regex/libregex.la
44		44
45	mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \	45	mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
46	my_readline.h sql_string.h completion_hash.h	46	my_readline.h sql_string.h completion_hash.h

Lines 32-41 Link Here

(-)mysql-5.0.76-old/libmysqld/Makefile.am (-43 / +15 lines)
32	-I$(top_srcdir)/regex \	32	-I$(top_srcdir)/regex \
33	$(openssl_includes) @ZLIB_INCLUDES@	33	$(openssl_includes) @ZLIB_INCLUDES@
34		34
35	noinst_LIBRARIES = libmysqld_int.a	35	noinst_LTLIBRARIES = libmysqld_int.la
36	pkglib_LIBRARIES = libmysqld.a	36	pkglib_LTLIBRARIES = libmysqld.la
37	SUBDIRS = . examples	37	SUBDIRS = . examples
38	libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc	38	#libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
39	libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \	39	libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
40	my_time.c	40	my_time.c
41	sqlexamplessources = ha_example.cc ha_tina.cc	41	sqlexamplessources = ha_example.cc ha_tina.cc
Lines 66-115 Link Here
66	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \	66	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
67	ha_blackhole.cc ha_archive.cc my_user.c	67	ha_blackhole.cc ha_archive.cc my_user.c
68		68
69	libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)	69	libmysqld_int_la_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
70	libmysqld_a_SOURCES=	70	#libmysqld_la_SOURCES=
		71	libmysqld_la_SOURCES= libmysqld.c lib_sql.cc emb_qcache.cc
71		72
72	# automake misses these	73	# automake misses these
73	sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy	74	sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
74		75
75	# The following libraries should be included in libmysqld.a	76	# The following libraries should be included in libmysqld.la
76	INC_LIB= $(top_builddir)/regex/libregex.a \	77	libmysqld_la_LIBADD= $(top_builddir)/regex/libregex.la \
77	$(top_builddir)/myisam/libmyisam.a \	78	$(top_builddir)/myisam/libmyisam.la \
78	$(top_builddir)/myisammrg/libmyisammrg.a \	79	$(top_builddir)/myisammrg/libmyisammrg.la \
79	$(top_builddir)/heap/libheap.a \	80	$(top_builddir)/heap/libheap.la \
80	@innodb_libs@ @bdb_libs_with_path@ \	81	$(top_builddir)/innobase/libinnobase.la @bdb_libs_with_path@ \
81	$(top_builddir)/mysys/libmysys.a \	82	$(top_builddir)/mysys/libmysys.la \
82	$(top_builddir)/strings/libmystrings.a \	83	$(top_builddir)/vio/libvio.la @NDB_SCI_LIBS@ \
83	$(top_builddir)/dbug/libdbug.a \	84	libmysqld_int.la
84	$(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@
85
86
87	#
88	# To make it easy for the end user to use the embedded library we
89	# generate a total libmysqld.a from all library files,
90
91	# note - InnoDB libraries have circular dependencies, so in INC_LIB
92	# few libraries are present two times. Metrowerks linker doesn't like
93	# it at all. Traditional ar has no problems with it, but still there's no
94	# need to add the same file twice to the library, so 'sort -u' save us
95	# some time and spares unnecessary work.
96
97	libmysqld.a: libmysqld_int.a $(INC_LIB)
98	if DARWIN_MWCC
99	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) \| sort -u`
100	else
101	-rm -f libmysqld.a
102	if test "$(host_os)" = "netware" ; \
103	then \
104	$(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
105	else \
106	for arc in ./libmysqld_int.a $(INC_LIB); do \
107	arpath=`echo $$arc\|sed 's\|[^/]*$$\|\|'`; \
108	$(AR) t $$arc\|sed "s\|^\|$$arpath\|"; \
109	done \| sort -u \| xargs $(AR) cq libmysqld.a ; \
110	$(RANLIB) libmysqld.a ; \
111	fi
112	endif
113		85
114	## XXX: any time the client interface changes, we'll need to bump	86	## XXX: any time the client interface changes, we'll need to bump
115	## the version info for libmysqld; however, it's possible for the	87	## the version info for libmysqld; however, it's possible for the

Lines 16-42 Link Here

(-)mysql-5.0.76-old/myisam/Makefile.am (-18 / +18 lines)
16	EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt	16	EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt
17	pkgdata_DATA = mi_test_all mi_test_all.res	17	pkgdata_DATA = mi_test_all mi_test_all.res
18		18
19	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include	19	INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
20	LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \	20	-I$(top_builddir)/sql -I$(top_srcdir)/sql
21	$(top_builddir)/mysys/libmysys.a \	21	LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
22	$(top_builddir)/dbug/libdbug.a \	22	$(top_builddir)/mysys/libmysys.la \
23	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@	23	$(ZLIB_LIBS)
24	pkglib_LIBRARIES = libmyisam.a	24	noinst_LTLIBRARIES = libmyisam.la
25	bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump	25	bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump
26	myisamchk_DEPENDENCIES= $(LIBRARIES)	26	myisamchk_DEPENDENCIES= $(LTLIBRARIES)
27	myisamlog_DEPENDENCIES= $(LIBRARIES)	27	myisamlog_DEPENDENCIES= $(LTLIBRARIES)
28	myisampack_DEPENDENCIES=$(LIBRARIES)	28	myisampack_DEPENDENCIES=$(LTLIBRARIES)
29	noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval	29	noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
30	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	30	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
31	mi_test1_DEPENDENCIES= $(LIBRARIES)	31	mi_test1_DEPENDENCIES= $(LTLIBRARIES)
32	mi_test2_DEPENDENCIES= $(LIBRARIES)	32	mi_test2_DEPENDENCIES= $(LTLIBRARIES)
33	mi_test3_DEPENDENCIES= $(LIBRARIES)	33	mi_test3_DEPENDENCIES= $(LTLIBRARIES)
34	#ft_test1_DEPENDENCIES= $(LIBRARIES)	34	#ft_test1_DEPENDENCIES= $(LTLIBRARIES)
35	#ft_eval_DEPENDENCIES= $(LIBRARIES)	35	#ft_eval_DEPENDENCIES= $(LTLIBRARIES)
36	myisam_ftdump_DEPENDENCIES= $(LIBRARIES)	36	myisam_ftdump_DEPENDENCIES= $(LTLIBRARIES)
37	rt_test_DEPENDENCIES= $(LIBRARIES)	37	rt_test_DEPENDENCIES= $(LTLIBRARIES)
38	sp_test_DEPENDENCIES= $(LIBRARIES)	38	sp_test_DEPENDENCIES= $(LTLIBRARIES)
39	libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \	39	libmyisam_la_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \
40	mi_rnext.c mi_rnext_same.c \	40	mi_rnext.c mi_rnext_same.c \
41	mi_search.c mi_page.c mi_key.c mi_locking.c \	41	mi_search.c mi_page.c mi_key.c mi_locking.c \
42	mi_rrnd.c mi_scan.c mi_cache.c \	42	mi_rrnd.c mi_scan.c mi_cache.c \

Lines 18-31 Link Here

(-)mysql-5.0.76-old/mysys/Makefile.am (-23 / +24 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 ../dbug/libdbug.a \
23	../strings/libmystrings.a
24	noinst_HEADERS = mysys_priv.h my_static.h \	22	noinst_HEADERS = mysys_priv.h my_static.h \
25	my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \	23	my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
26	my_os2dlfcn.c my_os2file64.c my_os2mutex.c \	24	my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
27	my_os2thread.c my_os2tls.c	25	my_os2thread.c my_os2tls.c
28	libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \	26	libmysys_la_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \
29	mf_path.c mf_loadpath.c my_file.c \	27	mf_path.c mf_loadpath.c my_file.c \
30	my_open.c my_create.c my_dup.c my_seek.c my_read.c \	28	my_open.c my_create.c my_dup.c my_seek.c my_read.c \
31	my_pread.c my_write.c my_getpagesize.c \	29	my_pread.c my_write.c my_getpagesize.c \
Lines 49-69 Link Here
49	my_quick.c my_lockmem.c my_static.c \	47	my_quick.c my_lockmem.c my_static.c \
50	my_sync.c my_getopt.c my_mkdir.c \	48	my_sync.c my_getopt.c my_mkdir.c \
51	default_modify.c default.c \	49	default_modify.c default.c \
52	my_compress.c checksum.c raid.cc \	50	my_compress.c checksum.c raid.cc \
53	my_net.c my_port.c my_sleep.c \	51	my_net.c my_port.c my_sleep.c \
54	charset.c charset-def.c my_bitmap.c my_bit.c md5.c \	52	charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
55	my_gethostbyname.c rijndael.c my_aes.c sha1.c \	53	my_gethostbyname.c rijndael.c my_aes.c sha1.c \
56	my_handler.c my_netware.c my_largepage.c \	54	my_handler.c my_netware.c my_largepage.c \
57	my_memmem.c \	55	my_memmem.c my_windac.c my_access.c base64.c \
58	my_windac.c my_access.c base64.c my_libwrap.c	56	my_libwrap.c
		57	libmysys_la_LIBADD = $(top_builddir)/dbug/libdbug.la $(top_builddir)/strings/libmystrings.la \
		58	$(ZLIB_LIBS)
		59	if NEED_THREADS
		60	libmysys_la_SOURCES += thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c my_pthread.c my_thr_init.c
		61	endif
		62
59	EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \	63	EXTRA_DIST = thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
60	thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \	64	thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \
61	my_wincond.c my_winthread.c CMakeLists.txt	65	my_wincond.c my_winthread.c CMakeLists.txt
62	libmysys_a_LIBADD = @THREAD_LOBJECTS@	66	# test_dir_DEPENDENCIES= $(LTLIBRARIES)
63	# test_dir_DEPENDENCIES= $(LIBRARIES)	67	# testhash_DEPENDENCIES= $(LTLIBRARIES)
64	# testhash_DEPENDENCIES= $(LIBRARIES)	68	# test_charset_DEPENDENCIES= $(LTLIBRARIES)
65	# test_charset_DEPENDENCIES= $(LIBRARIES)	69	# charset2html_DEPENDENCIES= $(LTLIBRARIES)
66	# charset2html_DEPENDENCIES= $(LIBRARIES)
67	EXTRA_PROGRAMS =	70	EXTRA_PROGRAMS =
68	DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \	71	DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
69	-DDATADIR="\"$(MYSQLDATAdir)\"" \	72	-DDATADIR="\"$(MYSQLDATAdir)\"" \
Lines 74-81 Link Here
74	-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \	77	-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
75	@DEFS@	78	@DEFS@
76		79
77	libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
78
79	# I hope this always does the right thing. Otherwise this is only test programs	80	# I hope this always does the right thing. Otherwise this is only test programs
80	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@	81	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
81		82
Lines 84-124 Link Here
84	# which automaticly removes the object files you use to compile a final program	85	# which automaticly removes the object files you use to compile a final program
85	#	86	#
86		87
87	test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)	88	test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES)
88	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c	89	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
89	$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)	90	$(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS)
90	$(RM) -f ./test_thr_alarm.c	91	$(RM) -f ./test_thr_alarm.c
91		92
92	test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)	93	test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES)
93	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c	94	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
94	$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)	95	$(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS)
95	$(RM) -f ./test_thr_lock.c	96	$(RM) -f ./test_thr_lock.c
96		97
97	test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)	98	test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES)
98	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c	99	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
99	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)	100	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
100	$(RM) -f test_vsnprintf.c	101	$(RM) -f test_vsnprintf.c
101		102
102	test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)	103	test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES)
103	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c	104	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
104	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)	105	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
105	$(RM) -f test_io_cache.c	106	$(RM) -f test_io_cache.c
106		107
107	test_dir$(EXEEXT): test_dir.c $(LIBRARIES)	108	test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES)
108	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)	109	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
109		110
110	test_charset$(EXEEXT): test_charset.c $(LIBRARIES)	111	test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES)
111	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)	112	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
112		113
113	testhash$(EXEEXT): testhash.c $(LIBRARIES)	114	testhash$(EXEEXT): testhash.c $(LTLIBRARIES)
114	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)	115	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
115		116
116	test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)	117	test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LTLIBRARIES)
117	$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c	118	$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
118	$(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)	119	$(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS)
119	$(RM) -f ./test_gethwaddr.c	120	$(RM) -f ./test_gethwaddr.c
120		121
121	test_base64$(EXEEXT): base64.c $(LIBRARIES)	122	test_base64$(EXEEXT): base64.c $(LTLIBRARIES)
122	$(CP) $(srcdir)/base64.c ./test_base64.c	123	$(CP) $(srcdir)/base64.c ./test_base64.c
123	$(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)	124	$(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS)
124	$(RM) -f ./test_base64.c	125	$(RM) -f ./test_base64.c

Lines 16-29 Link Here

(-)mysql-5.0.76-old/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 24-31 Link Here

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

Lines 22-46 Link Here

(-)mysql-5.0.76-old/sql/Makefile.am (-54 / +44 lines)
22	@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \	22	@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
23	-I$(top_builddir)/include -I$(top_srcdir)/include \	23	-I$(top_builddir)/include -I$(top_srcdir)/include \
24	-I$(top_srcdir)/regex -I$(srcdir) \	24	-I$(top_srcdir)/regex -I$(srcdir) \
25	$(openssl_includes)	25	$(openssl_includes)
26	WRAPLIBS= @WRAPLIBS@	26	WRAPLIBS= @WRAPLIBS@
27	SUBDIRS = share	27	SUBDIRS = share
28	libexec_PROGRAMS = mysqld	28	libexec_PROGRAMS = mysqld
29	EXTRA_PROGRAMS = gen_lex_hash	29	EXTRA_PROGRAMS = gen_lex_hash
30	bin_PROGRAMS = mysql_tzinfo_to_sql	30	bin_PROGRAMS = mysql_tzinfo_to_sql
31	gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@	31	gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
32	LDADD = $(top_builddir)/myisam/libmyisam.a \	32	LDADD = $(top_builddir)/myisam/libmyisam.la \
33	$(top_builddir)/myisammrg/libmyisammrg.a \	33	$(top_builddir)/myisammrg/libmyisammrg.la \
34	$(top_builddir)/heap/libheap.a \	34	$(top_builddir)/heap/libheap.la \
35	$(top_builddir)/vio/libvio.a \	35	$(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)/regex/libregex.la \
38	$(top_builddir)/regex/libregex.a \	38	@ZLIB_LIBS@ @NDB_SCI_LIBS@
39	$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@	39
40		40	mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
41	mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \	41	@bdb_libs@ $(top_builddir)/innobase/libinnobase.la \
42	@bdb_libs@ @innodb_libs@ @pstack_libs@ \	42	@pstack_libs@ @innodb_system_libs@ \
43	@innodb_system_libs@ \
44	@ndbcluster_libs@ @ndbcluster_system_libs@ \	43	@ndbcluster_libs@ @ndbcluster_system_libs@ \
45	$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \	44	$(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \
46	$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@	45	$(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@
Lines 52-94 Link Here
52	procedure.h sql_class.h sql_lex.h sql_list.h \	51	procedure.h sql_class.h sql_lex.h sql_list.h \
53	sql_manager.h sql_map.h sql_string.h unireg.h \	52	sql_manager.h sql_map.h sql_string.h unireg.h \
54	sql_error.h field.h handler.h mysqld_suffix.h \	53	sql_error.h field.h handler.h mysqld_suffix.h \
55	ha_myisammrg.h\	54	ha_heap.h ha_berkeley.h ha_innodb.h \
56	ha_heap.h ha_myisam.h ha_berkeley.h ha_innodb.h \	55	ha_ndbcluster.h ha_ndbcluster_cond.h opt_range.h \
57	ha_ndbcluster.h ha_ndbcluster_cond.h \	56	protocol.h sql_select.h structs.h table.h sql_udf.h \
58	opt_range.h protocol.h \	57	hash_filo.h lex.h lex_symbol.h sql_acl.h sql_crypt.h \
59	sql_select.h structs.h table.h sql_udf.h hash_filo.h\	58	log_event.h sql_repl.h slave.h stacktrace.h sql_sort.h \
60	lex.h lex_symbol.h sql_acl.h sql_crypt.h \	59	sql_cache.h set_var.h spatial.h gstream.h \
61	log_event.h sql_repl.h slave.h \	60	client_settings.h tzfile.h tztime.h my_decimal.h\
62	stacktrace.h sql_sort.h sql_cache.h set_var.h \
63	spatial.h gstream.h client_settings.h tzfile.h \
64	tztime.h my_decimal.h\
65	sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \	61	sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
66	parse_file.h sql_view.h sql_trigger.h \	62	parse_file.h sql_view.h sql_trigger.h \
67	sql_array.h sql_cursor.h \	63	sql_array.h sql_cursor.h examples/ha_example.h \
68	examples/ha_example.h ha_archive.h \	64	ha_archive.h examples/ha_tina.h ha_blackhole.h \
69	examples/ha_tina.h ha_blackhole.h \
70	ha_federated.h	65	ha_federated.h
71	mysqld_SOURCES = sql_lex.cc sql_handler.cc \	66	mysqld_SOURCES = sql_lex.cc sql_handler.cc item.cc item_sum.cc \
72	item.cc item_sum.cc item_buff.cc item_func.cc \	67	item_buff.cc item_func.cc item_cmpfunc.cc \
73	item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \	68	item_strfunc.cc item_timefunc.cc thr_malloc.cc \
74	thr_malloc.cc item_create.cc item_subselect.cc \	69	item_create.cc item_subselect.cc item_row.cc \
75	item_row.cc item_geofunc.cc \	70	item_geofunc.cc field.cc strfunc.cc key.cc \
76	field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \	71	sql_class.cc sql_list.cc net_serv.cc protocol.cc \
77	net_serv.cc protocol.cc sql_state.c \	72	sql_state.c lock.cc my_lock.c sql_string.cc \
78	lock.cc my_lock.c \	73	sql_manager.cc sql_map.cc mysqld.cc password.c \
79	sql_string.cc sql_manager.cc sql_map.cc \	74	hash_filo.cc hostname.cc set_var.cc sql_parse.cc \
80	mysqld.cc password.c hash_filo.cc hostname.cc \	75	sql_yacc.yy sql_base.cc table.cc sql_select.cc \
81	set_var.cc sql_parse.cc sql_yacc.yy \	76	sql_insert.cc sql_prepare.cc sql_error.cc \
82	sql_base.cc table.cc sql_select.cc sql_insert.cc \	77	sql_locale.cc sql_update.cc sql_delete.cc uniques.cc \
83	sql_prepare.cc sql_error.cc sql_locale.cc \	78	sql_do.cc procedure.cc item_uniq.cc sql_test.cc \
84	sql_update.cc sql_delete.cc uniques.cc sql_do.cc \
85	procedure.cc item_uniq.cc sql_test.cc \
86	log.cc log_event.cc init.cc derror.cc sql_acl.cc \	79	log.cc log_event.cc init.cc derror.cc sql_acl.cc \
87	unireg.cc des_key_file.cc \	80	unireg.cc des_key_file.cc discover.cc time.cc \
88	discover.cc time.cc opt_range.cc opt_sum.cc \	81	opt_range.cc opt_sum.cc records.cc filesort.cc \
89	records.cc filesort.cc handler.cc \	82	handler.cc ha_heap.cc ha_berkeley.cc ha_innodb.cc \
90	ha_heap.cc ha_myisam.cc ha_myisammrg.cc \
91	ha_berkeley.cc ha_innodb.cc \
92	ha_ndbcluster.cc ha_ndbcluster_cond.cc \	83	ha_ndbcluster.cc ha_ndbcluster_cond.cc \
93	sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \	84	sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
94	sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \	85	sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
Lines 96-109 Link Here
96	slave.cc sql_repl.cc sql_union.cc sql_derived.cc \	87	slave.cc sql_repl.cc sql_union.cc sql_derived.cc \
97	client.c sql_client.cc mini_client_errors.c pack.c\	88	client.c sql_client.cc mini_client_errors.c pack.c\
98	stacktrace.c repl_failsafe.h repl_failsafe.cc \	89	stacktrace.c repl_failsafe.h repl_failsafe.cc \
99	sql_olap.cc sql_view.cc \	90	sql_olap.cc sql_view.cc gstream.cc spatial.cc \
100	gstream.cc spatial.cc sql_help.cc sql_cursor.cc \	91	sql_help.cc sql_cursor.cc tztime.cc my_time.c \
101	tztime.cc my_time.c my_user.c my_decimal.cc\	92	my_user.c my_decimal.cc sp_head.cc sp_pcontext.cc \
102	sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \	93	sp_rcontext.cc sp.cc sp_cache.cc parse_file.cc \
103	sp_cache.cc parse_file.cc sql_trigger.cc \	94	sql_trigger.cc examples/ha_example.cc ha_archive.cc \
104	examples/ha_example.cc ha_archive.cc \	95	examples/ha_tina.cc ha_blackhole.cc ha_federated.cc \
105	examples/ha_tina.cc ha_blackhole.cc \	96	ha_myisam.cc ha_myisammrg.cc
106	ha_federated.cc
107		97
108	gen_lex_hash_SOURCES = gen_lex_hash.cc	98	gen_lex_hash_SOURCES = gen_lex_hash.cc
109	gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)	99	gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)

Lines 16-22 Link Here

(-)mysql-5.0.76-old/strings/Makefile.am (-11 / +11 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	noinst_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	# Default charset definitions	42	# Default charset definitions
43	EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \	43	EXTRA_DIST = ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \
Lines 54-78 Link Here
54	strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \	54	strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
55	t_ctype.h CMakeLists.txt	55	t_ctype.h CMakeLists.txt
56		56
57	libmystrings_a_LIBADD=	57	libmystrings_la_LIBADD=
58	conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c	58	conf_to_src_SOURCES = conf_to_src.c
59	conf_to_src_LDADD=	59	conf_to_src_LDADD = libmystrings.la
60	#force static linking of conf_to_src - essential when linking against	60	#force static linking of conf_to_src - essential when linking against
61	#custom installation of libc	61	#custom installation of libc
62	conf_to_src_LDFLAGS= @NOINST_LDFLAGS@	62	#conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
63		63
64	# This is because the dependency tracking misses @FOO@ vars in sources.	64	# This is because the dependency tracking misses @FOO@ vars in sources.
65	#strtoull.o: @CHARSET_OBJS@	65	#strtoull.o: @CHARSET_OBJS@
66		66
67		67
68	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@	68	FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
69		69
70	str_test: str_test.c $(pkglib_LIBRARIES)	70	str_test: str_test.c $(pkglib_LTLIBRARIES)
71	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES)	71	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)
72		72
73	test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)	73	test_decimal$(EXEEXT): decimal.c $(pkglib_LTLIBRARIES)
74	$(CP) $(srcdir)/decimal.c ./test_decimal.c	74	$(CP) $(srcdir)/decimal.c ./test_decimal.c
75	$(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)	75	$(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
76	$(RM) -f ./test_decimal.c	76	$(RM) -f ./test_decimal.c
77		77
78	# Don't update the files from bitkeeper	78	# Don't update the files from bitkeeper

Lines 16-26 Link Here

(-)mysql-5.0.76-old/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