diff options
| author | unknown <kent@mysql.com> | 2005-11-04 01:15:35 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-11-04 01:15:35 +0100 |
| commit | 21c0c02705c0ba4695b202a6f4d7cd418fd13331 (patch) | |
| tree | a0700217b074f5374b745569de7a1f521d31d856 /include | |
| parent | e515af86fb9b93ea16cea24c426cf5e831e81d2b (diff) | |
| parent | dc6117efa606f8e84d1196f474a64d380a73280d (diff) | |
| download | mariadb-git-21c0c02705c0ba4695b202a6f4d7cd418fd13331.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
Makefile.am:
Auto merged
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 0c845900a4f..3fa7b04d69a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -38,23 +38,15 @@ SUPERCLEANFILES = mysql_version.h my_config.h # Some include files that may be moved and patched by configure DISTCLEANFILES = sched.h $(SUPERCLEANFILES) -clean: +clean-local: $(RM) -fr readline -distclean: +distclean-local: $(RM) -fr readline -all-local: my_config.h - -# Since we include my_config.h it better exist from the beginning -link_sources: - $(CP) ../config.h my_config.h - -$(RM) -fr readline - @readline_h_ln_cmd@ - -# Keep automake happy - my_config.h: ../config.h $(CP) ../config.h my_config.h + +link_sources: -$(RM) -fr readline @readline_h_ln_cmd@ |