From 16bc2c63d9e5cc7c3d9df5c3580c571ad657b928 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Tue, 29 Apr 2003 14:07:04 +0000 Subject: [PATCH] * configure.ac: Call AC_PROG_LIBTOOL. * src/ltlast/Makefile.am, src/ltlenv/Makefile.am, src/ltlparse/Makefile.am, src/ltltest/Makefile.am, src/ltlvisit/Makefile.am: Adust to build libtool libraries. --- ChangeLog | 5 +++++ configure.ac | 3 ++- src/ltlast/Makefile.am | 4 ++-- src/ltlenv/Makefile.am | 4 ++-- src/ltlparse/Makefile.am | 4 ++-- src/ltltest/Makefile.am | 8 ++++---- src/ltlvisit/Makefile.am | 4 ++-- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 105ae6a0c..bfe16b0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-04-29 Alexandre DURET-LUTZ + * configure.ac: Call AC_PROG_LIBTOOL. + * src/ltlast/Makefile.am, src/ltlenv/Makefile.am, + src/ltlparse/Makefile.am, src/ltltest/Makefile.am, + src/ltlvisit/Makefile.am: Adust to build libtool libraries. + * src/ltlenv/defaultenv.hh: Do not include atomic_prop.hh here... * src/ltlenv/defaultenv.cc: ... but here. diff --git a/configure.ac b/configure.ac index 4345f1c51..19586cbc2 100644 --- a/configure.ac +++ b/configure.ac @@ -5,10 +5,11 @@ AM_INIT_AUTOMAKE([foreign nostdinc 1.7.3]) AC_PROG_CXX -AC_PROG_RANLIB AM_PROG_LEX AC_PROG_YACC +AC_PROG_LIBTOOL + AC_LANG(C++) CF_GXX_WARNINGS diff --git a/src/ltlast/Makefile.am b/src/ltlast/Makefile.am index 99e5ab76a..7a0fd94a3 100644 --- a/src/ltlast/Makefile.am +++ b/src/ltlast/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LIBRARIES = libltlast.a -libltlast_a_SOURCES = \ +lib_LTLIBRARIES = libltlast.la +libltlast_la_SOURCES = \ allnodes.hh \ atomic_prop.cc \ atomic_prop.hh \ diff --git a/src/ltlenv/Makefile.am b/src/ltlenv/Makefile.am index 6d97fa371..0e5d28e41 100644 --- a/src/ltlenv/Makefile.am +++ b/src/ltlenv/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LIBRARIES = libltlenv.a -libltlenv_a_SOURCES = \ +lib_LTLIBRARIES = libltlenv.la +libltlenv_la_SOURCES = \ defaultenv.cc \ defaultenv.hh \ environment.hh \ No newline at end of file diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am index 082b710a7..9783564d5 100644 --- a/src/ltlparse/Makefile.am +++ b/src/ltlparse/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LIBRARIES = libltlparse.a +lib_LTLIBRARIES = libltlparse.la LTLPARSE_YY = ltlparse.yy FROM_LTLPARSE_YY_MAIN = ltlparse.cc @@ -23,7 +23,7 @@ $(FROM_LTLPARSE_YY_OTHERS): $(LTLPARSE_YY) EXTRA_DIST = $(LTLPARSE_YY) -libltlparse_a_SOURCES = \ +libltlparse_la_SOURCES = \ fmterror.cc \ $(FROM_LTLPARSE_YY) \ ltlscan.ll \ diff --git a/src/ltltest/Makefile.am b/src/ltltest/Makefile.am index ffcd690f3..37154e47a 100644 --- a/src/ltltest/Makefile.am +++ b/src/ltltest/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS = -I$(srcdir)/.. -LDADD = ../ltlparse/libltlparse.a \ - ../ltlvisit/libltlvisit.a \ - ../ltlast/libltlast.a \ - ../ltlenv/libltlenv.a +LDADD = ../ltlparse/libltlparse.la \ + ../ltlvisit/libltlvisit.la \ + ../ltlast/libltlast.la \ + ../ltlenv/libltlenv.la check_SCRIPTS = defs # Keep this sorted alphabetically. diff --git a/src/ltlvisit/Makefile.am b/src/ltlvisit/Makefile.am index 7ee553574..d03d11787 100644 --- a/src/ltlvisit/Makefile.am +++ b/src/ltlvisit/Makefile.am @@ -1,8 +1,8 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LIBRARIES = libltlvisit.a -libltlvisit_a_SOURCES = \ +lib_LTLIBRARIES = libltlvisit.la +libltlvisit_la_SOURCES = \ clone.cc \ clone.hh \ dotty.cc \