https://svn.lrde.epita.fr/svn/nolimips/trunk

ChangeLog | 17 ++++++++++++++++- configure.ac | 9 +++++++-- src/Makefile.am | 24 +++++++++++++++--------- src/inst/Makefile.am | 6 +++--- src/misc/Makefile.am | 8 ++++---- src/parse/Makefile.am | 6 +++--- src/shell/Makefile.am | 6 +++--- src/task/Makefile.am | 6 +++--- src/vm/Makefile.am | 6 +++--- 9 files changed, 57 insertions(+), 31 deletions(-)

Index: ChangeLog from Benoît Perrot benoit@nostromo.lrde.epita.fr 2005-12-23 Benoît Perrot benoit@lrde.epita.fr

Use libtool to pack librairies * configure.ac: Check for libtool's presence. * src/vm/Makefile.am, * src/misc/Makefile.am, * src/task/Makefile.am, * src/shell/Makefile.am, * src/parse/Makefile.am, * src/inst/Makefile.am, * src/Makefile.am: Generate libtool libraries. 2005-12-23 Benoît Perrot benoit@lrde.epita.fr

Index: src/vm/Makefile.am --- src/vm/Makefile.am (revision 202) +++ src/vm/Makefile.am (working copy) @@ -1,7 +1,7 @@ -noinst_LIBRARIES = libvm.a +noinst_LTLIBRARIES = libvm.la

-libvm_a_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src -libvm_a_SOURCES = \ +libvm_la_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src +libvm_la_SOURCES = \ mmu.hh \ cp0.hh \ cpu.hh cpu.cc \ Index: src/misc/Makefile.am --- src/misc/Makefile.am (revision 202) +++ src/misc/Makefile.am (working copy) @@ -1,7 +1,7 @@ -noinst_LIBRARIES = libmisc.a +noinst_LTLIBRARIES = libmisc.la

-libmisc_a_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src -libmisc_a_SOURCES = \ +libmisc_la_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src +libmisc_la_SOURCES = \ contract.hh \ lockable.hh \ deref.hh \ @@ -18,6 +18,6 @@

test_unique_string_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src test_unique_string_SOURCES = test-unique_string.cc -test_unique_string_LDADD = libmisc.a +test_unique_string_LDADD = libmisc.la

TESTS = $(check_PROGRAMS) Index: src/task/Makefile.am --- src/task/Makefile.am (revision 202) +++ src/task/Makefile.am (working copy) @@ -1,7 +1,7 @@ -noinst_LIBRARIES = libtask.a +noinst_LTLIBRARIES = libtask.la

-libtask_a_CPPFLAGS = -I$(top_srcdir)/src -I $(top_builddir)/src -libtask_a_SOURCES = \ +libtask_la_CPPFLAGS = -I$(top_srcdir)/src -I $(top_builddir)/src +libtask_la_SOURCES = \ task.hh task.cc \ function_task.hh function_task.cc \ boolean_task.hh boolean_task.cc \ Index: src/shell/Makefile.am --- src/shell/Makefile.am (revision 202) +++ src/shell/Makefile.am (working copy) @@ -1,6 +1,6 @@ -noinst_LIBRARIES = libshell.a +noinst_LTLIBRARIES = libshell.la

-libshell_a_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src @READLINE_CPPFLAGS@ -libshell_a_SOURCES = \ +libshell_la_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src @READLINE_CPPFLAGS@ +libshell_la_SOURCES = \ cmd.hh \ shell.hh shell.cc Index: src/Makefile.am --- src/Makefile.am (revision 202) +++ src/Makefile.am (working copy) @@ -12,9 +12,16 @@

nolimips_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src nolimips_SOURCES = \ + nolimips.cc + +nolimips_LDFLAGS = $(AM_LDFLAGS) @READLINE_LDFLAGS@ +nolimips_LDADD = libnolimips.la + +## +lib_LTLIBRARIES = libnolimips.la +libnolimips_la_SOURCES = \ common.hh \ modules.hh \ - nolimips.cc \ nolimips-tasks.hh nolimips-tasks.cc \ task-tasks.hh task-tasks.cc \ parse-tasks.hh parse-tasks.cc \ @@ -22,12 +29,11 @@ vm-tasks.hh vm-tasks.cc \ shell-tasks.hh shell-tasks.cc

-nolimips_LDFLAGS = $(AM_LDFLAGS) @READLINE_LDFLAGS@ -nolimips_LDADD = \ - parse/libparse.a \ - vm/libvm.a \ - inst/libinst.a \ - shell/libshell.a \ - task/libtask.a \ - misc/libmisc.a \ +libnolimips_la_LIBADD = \ + parse/libparse.la \ + vm/libvm.la \ + inst/libinst.la \ + shell/libshell.la \ + task/libtask.la \ + misc/libmisc.la \ @READLINE_LIBS@ Index: src/parse/Makefile.am --- src/parse/Makefile.am (revision 202) +++ src/parse/Makefile.am (working copy) @@ -54,10 +54,10 @@

MAINTAINERCLEANFILES = asm-scan.ll asm-scan.yy $(FROM_ASM_PARSE_YY)

-noinst_LIBRARIES = libparse.a +noinst_LTLIBRARIES = libparse.la

-libparse_a_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src -libparse_a_SOURCES = \ +libparse_la_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src +libparse_la_SOURCES = \ asm-parse.cc asm-parse.yy.stamp \ $(FROM_ASM_PARSE_YY) \ asm-scan.ll asm-scan.hh asm-scan.ll.stamp \ Index: src/inst/Makefile.am --- src/inst/Makefile.am (revision 202) +++ src/inst/Makefile.am (working copy) @@ -43,10 +43,10 @@ program_builder.hh \ program_solver.hh program_solver.cc

-noinst_LIBRARIES = libinst.a +noinst_LTLIBRARIES = libinst.la

-libinst_a_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src -libinst_a_SOURCES = \ +libinst_la_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src +libinst_la_SOURCES = \ $(FROM_NODES_GEN_PY) nodes.stamp \ register.hh \ exp.hh exp.cc \ Index: configure.ac --- configure.ac (revision 202) +++ configure.ac (working copy) @@ -25,8 +25,8 @@ # Look for a C++ compiler. AC_PROG_CXX

-# Look for ran lib. -AC_PROG_RANLIB +# +AC_PROG_LIBTOOL

# Look for readline library. AC_CHECK_READLINE @@ -36,7 +36,12 @@

## Development environment ------------- + CXXFLAGS="${CXXFLAGS} -ansi -Wall -W -D__STDC_LIMIT_MACROS" +# Speed the compilation up +if test "$GXX" = yes; then + CXXFLAGS="$CXXFLAGS -pipe" +fi

# gnulib modules nolimips_GNULIB