Commit de8f1500 authored by unknown's avatar unknown
Browse files

Bug#23984 mysqltest on HP-UX 

- Cleanup the Makefile for client
- Don't link mysqltest with mysys as it's been compiled with different flags.


client/Makefile.am:
  Cleanup the Makefile for client
  Don't link mysqltest with mysys as it's been compiled with different flags.
parent e94e55c7

client/Makefile.am

+53 −30
Original line number Diff line number Diff line
@@ -28,57 +28,81 @@ else 
LIBMYSQLCLIENT_LA =		$(top_builddir)/libmysql/libmysqlclient.la

endif



#AUTOMAKE_OPTIONS =              nostdinc

INCLUDES =			-I$(top_builddir)/include \

				-I$(top_srcdir)/include \

				-I$(top_srcdir)/regex \

                                $(openssl_includes)



LIBS =				@CLIENT_LIBS@



LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \

				$(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \

				mysqlslap mysql_upgrade



noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

mysqltest_SOURCES=		mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \

				$(yassl_dummy_link_fix)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD) \

				$(top_builddir)/mysys/libmysys.a

mysqlbinlog_SOURCES =		mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \



EXTRA_DIST =			get_password.c CMakeLists.txt



bin_PROGRAMS =			mysql \

				mysqladmin \

				mysqlbinlog \

				mysqlcheck \

				mysqldump \

				mysqlimport \

				mysqlshow \

				mysqlslap \

				mysqltest \

				mysql_upgrade



mysql_SOURCES =			mysql.cc readline.cc sql_string.cc \

				completion_hash.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ \

				$(LDADD) $(CXXLDFLAGS)



mysqlbinlog_SOURCES =		mysqlbinlog.cc \

				$(top_srcdir)/mysys/mf_tempdir.c \

				$(top_srcdir)/mysys/my_new.cc \

				$(top_srcdir)/mysys/my_bit.c \

				$(top_srcdir)/mysys/my_bitmap.c \

				$(top_srcdir)/mysys/my_vle.c \

				$(top_srcdir)/mysys/base64.c

mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a 



mysqldump_SOURCES=              mysqldump.c \

				my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c \

                                $(yassl_dummy_link_fix)



mysqlimport_SOURCES=		mysqlimport.c $(yassl_dummy_link_fix)



mysqlimport_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a

mysqlcheck_SOURCES=		mysqlcheck.c $(yassl_dummy_link_fix)



mysqlshow_SOURCES=		mysqlshow.c $(yassl_dummy_link_fix)



mysqlslap_SOURCES=		mysqlslap.c $(yassl_dummy_link_fix)

mysqldump_SOURCES=              mysqldump.c my_user.c \

	                        $(top_srcdir)/mysys/mf_getdate.c \

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \

				$(top_builddir)/mysys/libmysys.a



mysqltest_SOURCES=		mysqltest.c \

				$(top_srcdir)/mysys/my_getsystime.c \

				$(top_srcdir)/mysys/my_copy.c \

				$(yassl_dummy_link_fix)

mysqlimport_SOURCES=		mysqlimport.c $(yassl_dummy_link_fix)

mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)



mysql_upgrade_SOURCES=          mysql_upgrade.c $(yassl_dummy_link_fix)

sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c



# Fix for mit-threads

DEFS =			-DUNDEF_THREADS_HACK \

			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

			-DDATADIR="\"$(localstatedir)\""

EXTRA_DIST =		get_password.c CMakeLists.txt



sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c



link_sources:

	for f in $(sql_src) ; do \
@@ -92,6 +116,5 @@ link_sources: 
         rm -f $(srcdir)/my_user.c; \

         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;





# Don't update the files from bitkeeper

%::SCCS/s.%