diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-04 16:34:03 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-04 16:34:03 +0100 |
| commit | de307de5cf1287a09ca27336ce2bad20e23fa12f (patch) | |
| tree | 584a2632ee8f48c31991d9ec12939e405e9ddb5f /include/Makefile.am | |
| parent | 1fa7eb82bf35e710449ea2058ef364c1facf7dd1 (diff) | |
| parent | 6f2eb6e00d73b064d1cd986dac56713dc35cbd87 (diff) | |
| download | mariadb-git-de307de5cf1287a09ca27336ce2bad20e23fa12f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my51-yassl_link_problem
include/Makefile.am:
Auto merged
Diffstat (limited to 'include/Makefile.am')
| -rw-r--r-- | include/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 44efe0b7211..ba9f8029def 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -34,7 +34,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ my_vle.h # mysql_version.h are generated -CLEANFILES = mysql_version.h my_config.h readline +CLEANFILES = mysql_version.h my_config.h readline openssl # Some include files that may be moved and patched by configure DISTCLEANFILES = sched.h $(CLEANFILES) @@ -42,6 +42,7 @@ DISTCLEANFILES = sched.h $(CLEANFILES) link_sources: -$(RM) -fr readline @readline_h_ln_cmd@ + @yassl_h_ln_cmd@ my_config.h: ../config.h $(CP) ../config.h my_config.h |