From d1392836d0081f8dc358c1f34b1f6845e1296f4a Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 6 Apr 2014 23:03:24 -0400 Subject: [PATCH] Convert to LIBTOOL --- Makefile.am | 12 ++++++++++-- configure.ac | 4 ++-- m4/.gitignore | 0 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 m4/.gitignore diff --git a/Makefile.am b/Makefile.am index 12f0515..cdea16b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,14 @@ SUBDIRS = src/common src/cli src/gtk data doc tests ## We want these in the dist tarball EXTRA_DIST = pixmaps -ACLOCAL = aclocal -I $(ac_aux_dir) +ACLOCAL_AMFLAGS = -I m4 + +LIBTOOL_MACROS = \ + m4/libtool.m4 \ + m4/ltoptions.m4 \ + m4/ltsugar.m4 \ + m4/ltversion.m4 \ + m4/lt~obsolete.m4 CLEANFILES = *~ @@ -23,7 +30,8 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in \ $(ac_aux_dir)/compile \ $(ac_aux_dir)/test-driver \ $(ac_aux_dir)/ar-lib \ - $(ac_aux_dir)/ylwrap + $(ac_aux_dir)/ylwrap \ + $(LIBTOOL_MACROS) changelog: @if test -d $(srcdir)/.git; then \ diff --git a/configure.ac b/configure.ac index aca2410..1efc861 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,7 @@ dnl Initialization stuff. AC_INIT([emu8051], [2.0.1], [hugo@hugovil.com], [emu8051], [http://www.hugovil.com/fr/emu8051/]) AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/common/cpu8051.c) dnl -Wno-extra-portability: @@ -21,8 +22,7 @@ dnl Testing the C compiler. AC_LANG_C dnl Testing for libtool support. -AC_PROG_RANLIB -AM_PROG_AR +AM_PROG_LIBTOOL AC_ARG_WITH([readline], [AS_HELP_STRING([--without-readline], [disable support for readline])], diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..e69de29 -- 2.20.1