From: levill_r <levill_r@4aad255d-cdde-0310-9447-f3009e2ae8c0> * data/Makefile.am (libdyn_function_la_LDFLAGS, libdyn_function_la_CPPFLAGS): Do not rely on the shell to set these variables. (BUILT_SOURCES, CLEANFILES, SUBDIRS): Remove. git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4648 4aad255d-cdde-0310-9447-f3009e2ae8c0 --- dynamic-use-of-static-c++/ChangeLog | 9 +++++++++ dynamic-use-of-static-c++/data/Makefile.am | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index 2b6f26c..4f40700 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,5 +1,14 @@ 2009-09-08 Roland Levillain <roland@lrde.epita.fr> + Various fixes in data/Makefile.am. + + * data/Makefile.am + (libdyn_function_la_LDFLAGS, libdyn_function_la_CPPFLAGS): + Do not rely on the shell to set these variables. + (BUILT_SOURCES, CLEANFILES, SUBDIRS): Remove. + +2009-09-08 Roland Levillain <roland@lrde.epita.fr> + Add GNU libiberty for Mac OS X Leopard (10.5). Careful, everything in lib/ should be removed ultimately (the diff --git a/dynamic-use-of-static-c++/data/Makefile.am b/dynamic-use-of-static-c++/data/Makefile.am index 61882d7..afdbe34 100644 --- a/dynamic-use-of-static-c++/data/Makefile.am +++ b/dynamic-use-of-static-c++/data/Makefile.am @@ -1,11 +1,11 @@ # Do not install me lib_LTLIBRARIES = libdyn_function.la -libdyn_function_la_LDFLAGS = `dyn-config --libtool-libs` -libdyn_function_la_CXXFLAGS = `dyn-config --cflags` +# FIXME: This is probably not portable! +# libdyn_function_la_LDFLAGS = `dyn-config --libtool-libs` +# libdyn_function_la_CXXFLAGS = `dyn-config --cflags` +libdyn_function_la_LDFLAGS = $(top_builddir)/src/libdyn.la -export-dynamic +libdyn_function_la_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src libdyn_function_la_SOURCES = function.cc -BUILT_SOURCES = function.cc -CLEANFILES = function.cc -SUBDIRS = pkgdata_DATA = Makefile.template Makefile.repository -- 1.6.5