From c4a50dea3f919404adbb92701eb3426e780b14c7 Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Wed, 27 Sep 2006 17:11:19 +0200 Subject: [PATCH] Build fixes for netware/ directory - Create the file netware/libmysql.imp from libmysql/libmysql.def - Remove the outdated netware/libmysql.imp file from version control --- .bzrignore | 1 + netware/Makefile.am | 16 +++++++-- netware/libmysql.imp | 85 -------------------------------------------- 3 files changed, 15 insertions(+), 87 deletions(-) delete mode 100644 netware/libmysql.imp diff --git a/.bzrignore b/.bzrignore index 1d0184fb0f5..71684058558 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1316,3 +1316,4 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj +netware/libmysql.imp diff --git a/netware/Makefile.am b/netware/Makefile.am index 61e7925301d..648ce79c484 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -46,8 +46,20 @@ link_sources: @LN_CP_F@ $(srcdir)/$$org ../$$f; \ done else -EXTRA_DIST= comp_err.def init_db.sql install_test_db.ncf \ - libmysql.def libmysql.imp \ + +BUILT_SOURCES = libmysql.imp +DISTCLEANFILES = $(BUILT_SOURCES) + +# Create the libmysql.imp from libmysql/libmysql.def +libmysql.imp: $(top_srcdir)/libmysql/libmysql.def + awk 'BEGIN{x=0;} \ + END{printf("\n");} \ + x==1 {printf(" %s",$$1); x++; next} \ + x>1 {printf(",\n %s", $$1); next} \ + /EXPORTS/{x=1}' $(top_srcdir)/libmysql/libmysql.def > libmysql.imp + +EXTRA_DIST= $(BUILT_SOURCES) comp_err.def init_db.sql install_test_db.ncf \ + libmysql.def \ libmysqlmain.c my_manage.c my_manage.h \ my_print_defaults.def myisam_ftdump.def myisamchk.def \ myisamlog.def myisampack.def mysql.def mysql.xdc \ diff --git a/netware/libmysql.imp b/netware/libmysql.imp deleted file mode 100644 index 977fb1b0b1f..00000000000 --- a/netware/libmysql.imp +++ /dev/null @@ -1,85 +0,0 @@ -myodbc_remove_escape, -mysql_add_slave, -mysql_affected_rows, -mysql_change_user, -mysql_character_set_name, -mysql_close, -mysql_data_seek, -mysql_debug, -mysql_disable_reads_from_master, -mysql_disable_rpl_parse, -mysql_dump_debug_info, -mysql_enable_reads_from_master, -mysql_enable_rpl_parse, -mysql_eof, -mysql_errno, -mysql_error, -mysql_escape_string, -mysql_fetch_field, -mysql_fetch_field_direct, -mysql_fetch_fields, -mysql_fetch_lengths, -mysql_fetch_row, -mysql_field_count, -mysql_field_seek, -mysql_field_tell, -mysql_free_result, -mysql_get_client_info, -mysql_get_host_info, -mysql_get_proto_info, -mysql_get_server_info, -mysql_info, -mysql_init, -mysql_insert_id, -mysql_kill, -mysql_list_dbs, -mysql_list_fields, -mysql_list_processes, -mysql_list_tables, -mysql_manager_close, -mysql_manager_command, -mysql_manager_connect, -mysql_manager_fetch_line, -mysql_manager_init, -mysql_master_query, -mysql_master_send_query, -mysql_num_fields, -mysql_num_rows, -mysql_odbc_escape_string, -mysql_options, -mysql_ping, -mysql_query, -mysql_read_query_result, -mysql_reads_from_master_enabled, -mysql_real_connect, -mysql_real_escape_string, -mysql_real_query, -mysql_refresh, -mysql_row_seek, -mysql_row_tell, -mysql_rpl_parse_enabled, -mysql_rpl_probe, -mysql_rpl_query_type, -mysql_select_db, -mysql_send_query, -mysql_server_end, -mysql_server_init, -mysql_set_master, -mysql_shutdown, -mysql_slave_query, -mysql_slave_send_query, -mysql_ssl_set, -mysql_stat, -mysql_store_result, -mysql_thread_end, -mysql_thread_id, -mysql_thread_init, -mysql_thread_safe, -mysql_use_result, -net_safe_read, -#simple_command, -mysql_connect, -mysql_create_db, -mysql_drop_db, - - -- 2.30.9