Commit cce4cc25 authored by unknown's avatar unknown
Browse files

make dist changes for Cmake build 


libmysql/mytest.c:
  Rename: BitKeeper/deleted/.del-mytest.c -> libmysql/mytest.c
sql/message.mc:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/message.mc
parent 8f447728

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS = foreign 


# These are built from source in the Docs directory

EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \

			README COPYING EXCEPTIONS-CLIENT

			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt

SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \
@@ -33,7 +33,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ 
			@thread_dirs@ pstack \

			@sql_union_dirs@ scripts @man_dirs@ tests SSL\

			BUILD netware os2 @libmysqld_dirs@ \

			@bench_dirs@ support-files @tools_dirs@

			@bench_dirs@ support-files @tools_dirs@ win



# Run these targets before any others, also make part of clean target,

# to make sure we create new links after a clean.

bdb/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@ 
# distdir and top_distdir are set by the calling Makefile



bdb_build = build_unix

files = LICENSE Makefile Makefile.in README

files = LICENSE Makefile Makefile.in README CMakeLists.txt

subdirs = btree build_vxworks build_win32 clib common cxx db dbinc \

  dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \

  db_dump185 db_load db_printlog db_recover db_stat db_upgrade \

client/Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

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



EXTRA_DIST =		get_password.c CMakeLists.txt



link_sources:

	for f in $(sql_src) ; do \

	  rm -f $$f; \

dbug/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ noinst_HEADERS = dbug_long.h 
libdbug_a_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

                        my_main.c main.c factorial.c dbug_analyze.c \

						CMakeLists.txt

NROFF_INC =             example1.r example2.r example3.r main.r \

                        factorial.r output1.r output2.r output3.r \

                        output4.r output5.r

extra/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h 
bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html

EXTRA_DIST =	CMakeLists.txt



# Don't update the files from bitkeeper

%::SCCS/s.%