diff options
| author | unknown <serg@serg.mylan> | 2005-01-28 17:14:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-28 17:14:03 +0100 |
| commit | 5c3c40798dce878bd6561b8da6a5e1cbd9f16279 (patch) | |
| tree | 9cc656a413f403a59b9dfda94e260b6e2158c288 /extra | |
| parent | 085f70728768abc2f25ad46a329a6659c17088bc (diff) | |
| download | mariadb-git-5c3c40798dce878bd6561b8da6a5e1cbd9f16279.tar.gz | |
small Makefile.am cleanup
clean: targets removed
generated *.h files moved to include/
Docs/Images/Makefile.am:
no clean: targets please!
client/Makefile.am:
generated *.h files moved to include/
extra/Makefile.am:
generated *.h files moved to include/
include/Makefile.am:
no clean: targets please!
libmysql/Makefile.am:
generated *.h files moved to include/
libmysql_r/Makefile.am:
generated *.h files moved to include/
libmysqld/Makefile.am:
generated *.h files moved to include/
libmysqld/examples/Makefile.am:
generated *.h files moved to include/
no clean: target please!
ndb/docs/Makefile.am:
no clean: targets please!
scripts/Makefile.am:
SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
generated *.h files moved to include/
sql/Makefile.am:
generated *.h files moved to include/
sql/share/Makefile.am:
instead of (incorrectly) duplicating comp_err command line,
call do make in extra/
tools/Makefile.am:
generated *.h files moved to include/
BitKeeper/etc/ignore:
Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Makefile.am | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 9f18cbf96e6..43981753515 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -16,25 +16,26 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include \ @ndbcluster_includes@ -I$(top_srcdir)/sql \ - -I$(top_srcdir)/extra + -I$(top_builddir)/include LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a -BUILT_SOURCES= mysqld_error.h sql_state.h mysqld_ername.h +BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ + $(top_builddir)/include/sql_state.h \ + $(top_builddir)/include/mysqld_ername.h pkginclude_HEADERS= $(BUILT_SOURCES) -created_sources = created_include_files -CLEANFILES = $(created_sources) -SUPERCLEANFILES = $(BUILT_SOURCES) - -all: $(created_sources) +CLEANFILES = $(BUILT_SOURCES) # This will build mysqld_error.h and sql_state.h -mysqld_error.h: created_include_files -mysqld_ername.h: created_include_files -sql_state.h: created_include_files - -created_include_files: comp_err - $(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --name_file=$(top_builddir)/extra/mysqld_ername.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt - touch created_include_files +$(top_builddir)/include/mysqld_error.h: comp_err + $(top_builddir)/extra/comp_err \ + --charset=$(top_srcdir)/sql/share/charsets \ + --out-dir=$(top_builddir)/sql/share/ \ + --header_file=$(top_builddir)/include/mysqld_error.h \ + --name_file=$(top_builddir)/include/mysqld_ername.h \ + --state_file=$(top_builddir)/include/sql_state.h \ + --in_file=$(top_srcdir)/sql/share/errmsg.txt +$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h +$(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 |