summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-01-09 15:31:38 +0100
committermsvensson@neptunus.(none) <>2006-01-09 15:31:38 +0100
commit0e7953d8b35b20667620028bf2c80bd587899eb5 (patch)
treebbee591a64311acab018c10b4ab9a9971dfb0ea3 /include
parent44ea4f5441dba0960c47d7733796bd8cf96848dd (diff)
parentdad7268273328b0de7c4fca9623960103e2f8fec (diff)
downloadmariadb-git-0e7953d8b35b20667620028bf2c80bd587899eb5.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 8ad63f088ac..12b8c301b8d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -33,7 +33,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \
mysql_version.h.in my_handler.h my_time.h decimal.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)
@@ -41,6 +41,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