* src/Makefile.am (RUBY_LIBRUBYARG_SHARED): New variable.
Use it...
(libdyn_la_LIBADD): ...here.
(RUBY_topdir): New variable.
Use it...
(libdyn_la_CPPFLAGS): ...here.
---
extatica/ChangeLog | 11 +++++++++++
extatica/src/Makefile.am | 25 +++++++++++++++++++------
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/extatica/ChangeLog b/extatica/ChangeLog
index 1cdaa81..2a07f08 100644
--- a/extatica/ChangeLog
+++ b/extatica/ChangeLog
@@ -1,5 +1,16 @@
2010-11-02 Roland Levillain <roland(a)lrde.epita.fr>
+ Use intermediate variables in src/Makefile.am.
+
+ * src/Makefile.am (RUBY_LIBRUBYARG_SHARED): New variable.
+ Use it...
+ (libdyn_la_LIBADD): ...here.
+ (RUBY_topdir): New variable.
+ Use it...
+ (libdyn_la_CPPFLAGS): ...here.
+
+2010-11-02 Roland Levillain <roland(a)lrde.epita.fr>
+
* INSTALL: New (generated by Automake).
2010-11-05 Roland Levillain <roland(a)lrde.epita.fr>
diff --git a/extatica/src/Makefile.am b/extatica/src/Makefile.am
index 0f5fd9b..5f91f40 100644
--- a/extatica/src/Makefile.am
+++ b/extatica/src/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2005, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -70,13 +71,25 @@ if DARWIN
libdyn_la_SOURCES += libiberty-fix.c
endif DARWIN
-libdyn_la_LIBADD = @RUBY_LIBRUBYARG_SHARED@ $(LIBLTDL) \
- $(top_builddir)/libmd5/libmd5.la $(BOOST_FILESYSTEM_LIBS)
+RUBY_LIBRUBYARG_SHARED = @RUBY_LIBRUBYARG_SHARED@
+
+libdyn_la_LIBADD = \
+ $(RUBY_LIBRUBYARG_SHARED) \
+ $(LIBLTDL) \
+ $(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$(top_srcdir)/libmd5 -I@RUBY_topdir@
+RUBY_topdir = @RUBY_topdir@
+
+libdyn_la_CPPFLAGS = \
+ $(LTDLINCL) \
+ $(BOOST_CPPFLAGS) \
+ -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.5.6.5
Show replies by date