From: levill_r <levill_r@4aad255d-cdde-0310-9447-f3009e2ae8c0> * src/Makefile.am (libdyn_la_LIBADD): Add $(top_builddir)/libmd5/libmd5.la. (libdyn_la_CPPFLAGS): Add -I$(top_srcdir)/libmd5. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4663 4aad255d-cdde-0310-9447-f3009e2ae8c0 --- dynamic-use-of-static-c++/ChangeLog | 8 ++++++++ dynamic-use-of-static-c++/src/Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index c5493fb..cd807af 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,5 +1,13 @@ 2009-10-22 Roland Levillain <roland@lrde.epita.fr> + Have libdyn depend on libmd5. + + * src/Makefile.am (libdyn_la_LIBADD): Add + $(top_builddir)/libmd5/libmd5.la. + (libdyn_la_CPPFLAGS): Add -I$(top_srcdir)/libmd5. + +2009-10-22 Roland Levillain <roland@lrde.epita.fr> + Provide a C++ implementation of the compile-at-runtime routine. * src/function_loader.cc (dyn::function_loader_t::cxx_compile): diff --git a/dynamic-use-of-static-c++/src/Makefile.am b/dynamic-use-of-static-c++/src/Makefile.am index c6f975c..00504b7 100644 --- a/dynamic-use-of-static-c++/src/Makefile.am +++ b/dynamic-use-of-static-c++/src/Makefile.am @@ -46,12 +46,12 @@ libdyn_la_SOURCES = \ ansidecl.h demangle.h config.hh libdyn_la_LIBADD = @LIBERTYARG@ @RUBY_LIBRUBYARG_SHARED@ $(LIBLTDL) \ - $(BOOST_FILESYSTEM_LIBS) + $(top_builddir)/libmd5/libmd5.la $(BOOST_FILESYSTEM_LIBS) libdyn_la_DEPENDENCIES = $(LTDLDEPS) libdyn_la_CPPFLAGS = \ $(LTDLINCL) $(BOOST_CPPFLAGS) \ - -I$(top_builddir) -I$(srcdir) -I. -I@RUBY_topdir@ + -I$(top_builddir) -I$(srcdir) -I. -I$(top_srcdir)/libmd5 -I@RUBY_topdir@ libdyn_la_CXXFLAGS = $(WARNING_CXXFLAGS) libdyn_la_LDFLAGS = -version-info 0:1:0 $(BOOST_FILESYSTEM_LDFLAGS) -- 1.6.5