From 9311345eccbd3c7526e2c17e6902a286a890a72f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Oct 2002 21:57:10 +0200 Subject: - Applied required modifications for automake 1.5 - some additional small fixes - added "depcomp" for automake 1.5 acinclude.m4: - Removed AC_SYS_LARGEFILE (is in autoconf since v2.50) config.guess: - applied diffs from config.guess of automake 1.5 config.sub: - applied diffs from config.sub of automake 1.5 configure.in: - adapted for automake 1.5 - added AM_PROG_AS - replaced MYSQL_SYS_LARGEFILE with AC_SYS_LARGEFILE (is in autoconf since v2.50) dbug/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy extra/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy heap/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy include/my_global.h: - fix for PPC64 install-sh: - applied diffs from install-sh of automake 1.5 isam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysql_r/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy libmysqld/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy ltconfig: - small correction for new libtool ltmain.sh: - applied diffs from ltmain.sh of libtool 1.4.2 merge/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy missing: - applied diffs from missing of automake 1.5 myisam/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy myisammrg/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy mysys/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy regex/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy sql/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy strings/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy tools/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy vio/Makefile.am: - removed OMIT_DEPENDENCIES to make automake 1.5 happy --- mysys/Makefile.am | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'mysys/Makefile.am') diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 4ff1b04fc79..c59d15d59f5 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -70,15 +70,6 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ -OMIT_DEPENDENCIES = pthread.h stdio.h __stdio.h stdlib.h __stdlib.h math.h\ - __math.h time.h __time.h unistd.h __unistd.h types.h \ - xtypes.h ac-types.h posix.h string.h __string.h \ - errno.h socket.h inet.h dirent.h netdb.h \ - cleanup.h cond.h debug_out.h fd.h kernel.h mutex.h \ - prio_queue.h pthread_attr.h pthread_once.h queue.h\ - sleep.h specific.h version.h pwd.h timers.h uio.h \ - cdefs.h machdep.h signal.h __signal.h util.h - # I hope this always does the right thing. Otherwise this is only test programs FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ @@ -109,7 +100,7 @@ test_io_cache: mf_iocache.c $(LIBRARIES) test_dir: test_dir.c $(LIBRARIES) $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) -test_charset: test_charset.c $(LIBRARIES) +test_charset$(EXEEXT): test_charset.c $(LIBRARIES) $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS) testhash: testhash.c $(LIBRARIES) -- cgit v1.2.1