diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-14 15:41:20 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-14 15:41:20 +0300 |
| commit | b35a18596c602e654b821ebef8e8a3147fae6dbf (patch) | |
| tree | c48831b384a7c9c2a7ffdc6e95a91f2183050d93 /include | |
| parent | 473359b7f036c6dfc57e9b20304ec4c7155eaeba (diff) | |
| parent | 87affa25034753e1125b0f97072571410ce597f4 (diff) | |
| download | mariadb-git-b35a18596c602e654b821ebef8e8a3147fae6dbf.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 3f6ed988fbb..1833ea8096b 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -15,11 +15,11 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -BUILT_SOURCES = my_config.h mysql_version.h m_ctype.h +BUILT_SOURCES = mysql_version.h m_ctype.h pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ mysqld_error.h my_list.h \ my_pthread.h my_no_pthread.h raid.h errmsg.h \ - my_config.h my_global.h my_net.h \ + my_global.h my_net.h \ sslopt-case.h sslopt-longopts.h sslopt-usage.h \ sslopt-vars.h $(BUILT_SOURCES) noinst_HEADERS = global.h config-win.h \ @@ -30,17 +30,19 @@ noinst_HEADERS = global.h config-win.h \ my_tree.h hash.h thr_alarm.h thr_lock.h \ getopt.h t_ctype.h violite.h \ mysql_version.h.in +EXTRA_DIST= my_config.h # mysql_version.h are generated -SUPERCLEANFILES = mysql_version.h +SUPERCLEANFILES = mysql_version.h my_global.h # Some include files that may be moved and patched by configure DISTCLEANFILES = sched.h +CLEANFILES = my_config.h -all-local: my_config.h my_global.h +all-local: my_global.h # Since we include my_config.h it better exist from the beginning -my_config.h: ../config.h +link_sources: $(CP) ../config.h my_config.h # This should be changed in the source and removed. |