From 4e965abe340e6cbb89ad93e9f1354eb5ce7534a5 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Wed, 30 Apr 2003 12:46:12 +0000 Subject: [PATCH] * src/ltlvisit/Makefile.am (lib_LTLIBRARIES): Rename as ... (noinst_LTLIBRARIES): ... this. * src/ltlenv/Makefile.am, src/ltlast/Makefile.am, src/ltlparse/Makefile.am: Likewise. * src/Makefile.am (lib_LTLIBRARIES, libspot_la_SOURCES, libspot_la_LIBADD): New variable. Build a libspot.la library from all the sub-libraries. --- ChangeLog | 8 ++++++++ src/.cvsignore | 2 ++ src/Makefile.am | 8 ++++++++ src/ltlast/Makefile.am | 2 +- src/ltlenv/Makefile.am | 2 +- src/ltlparse/Makefile.am | 2 +- src/ltlvisit/Makefile.am | 2 +- wrap/Makefile.am | 6 +----- 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9bdf0827..ab1936dc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2003-04-30 Alexandre DURET-LUTZ + * src/ltlvisit/Makefile.am (lib_LTLIBRARIES): Rename as ... + (noinst_LTLIBRARIES): ... this. + * src/ltlenv/Makefile.am, src/ltlast/Makefile.am, + src/ltlparse/Makefile.am: Likewise. + * src/Makefile.am (lib_LTLIBRARIES, libspot_la_SOURCES, + libspot_la_LIBADD): New variable. Build a libspot.la library + from all the sub-libraries. + * m4/pypath.m4: New file. * Makefile.am (SUBDIRS): Add wrap. * wrap/Makefile.am: New file. diff --git a/src/.cvsignore b/src/.cvsignore index e99558847..6a5900caf 100644 --- a/src/.cvsignore +++ b/src/.cvsignore @@ -1,3 +1,5 @@ .deps Makefile Makefile.in +.libs +libspot.la diff --git a/src/Makefile.am b/src/Makefile.am index ca2c21a03..51a4e9328 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,3 +2,11 @@ AUTOMAKE_OPTIONS = subdir-objects # List directories in the order they must be built. SUBDIRS = misc ltlenv ltlast ltlvisit ltlparse ltltest + +lib_LTLIBRARIES = libspot.la +libspot_la_SOURCES = +libspot_la_LIBADD = \ + ltlenv/libltlenv.la \ + ltlparse/libltlparse.la \ + ltlvisit/libltlvisit.la \ + ltlast/libltlast.la diff --git a/src/ltlast/Makefile.am b/src/ltlast/Makefile.am index 7a0fd94a3..57251bf3e 100644 --- a/src/ltlast/Makefile.am +++ b/src/ltlast/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LTLIBRARIES = libltlast.la +noinst_LTLIBRARIES = libltlast.la libltlast_la_SOURCES = \ allnodes.hh \ atomic_prop.cc \ diff --git a/src/ltlenv/Makefile.am b/src/ltlenv/Makefile.am index 0e5d28e41..539da1e32 100644 --- a/src/ltlenv/Makefile.am +++ b/src/ltlenv/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LTLIBRARIES = libltlenv.la +noinst_LTLIBRARIES = libltlenv.la libltlenv_la_SOURCES = \ defaultenv.cc \ defaultenv.hh \ diff --git a/src/ltlparse/Makefile.am b/src/ltlparse/Makefile.am index 9783564d5..480841865 100644 --- a/src/ltlparse/Makefile.am +++ b/src/ltlparse/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LTLIBRARIES = libltlparse.la +noinst_LTLIBRARIES = libltlparse.la LTLPARSE_YY = ltlparse.yy FROM_LTLPARSE_YY_MAIN = ltlparse.cc diff --git a/src/ltlvisit/Makefile.am b/src/ltlvisit/Makefile.am index d03d11787..cf1f119bb 100644 --- a/src/ltlvisit/Makefile.am +++ b/src/ltlvisit/Makefile.am @@ -1,7 +1,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. AM_CXXFLAGS = $(WARNING_CXXFLAGS) -lib_LTLIBRARIES = libltlvisit.la +noinst_LTLIBRARIES = libltlvisit.la libltlvisit_la_SOURCES = \ clone.cc \ clone.hh \ diff --git a/wrap/Makefile.am b/wrap/Makefile.am index 2d7902ec2..5cb6f2c03 100644 --- a/wrap/Makefile.am +++ b/wrap/Makefile.am @@ -6,11 +6,7 @@ pyexec_LTLIBRARIES = _spot.la _spot_la_SOURCES = spot_wrap.cxx _spot_la_LDFLAGS = -avoid-version -module -_spot_la_LIBADD = \ - ../src/ltlenv/libltlenv.la \ - ../src/ltlparse/libltlparse.la \ - ../src/ltlvisit/libltlvisit.la \ - ../src/ltlast/libltlast.la +_spot_la_LIBADD = ../src/libspot.la EXTRA_DIST = spot.i spot_wrap.cxx: spot.i