Mercurial > hg > octave-max

changeset 15133:3e5b00d964ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use $(top_builddir)/libgnu for parallelism with $(top_srcdir)/libgnu * libcruft/Makefile.am, liboctave/Makefile.am, src/Makefile.am: Use $(top_builddir)/libgnu for parallelism with $(top_srcdir)/libgnu
author Rik <rik@octave.org>
date Wed, 08 Aug 2012 15:33:52 -0700
parents 9087c2816136
children f91eac1bc66d
files libcruft/Makefile.am liboctave/Makefile.am src/Makefile.am
diffstat 3 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libcruft/Makefile.am
+++ b/libcruft/Makefile.am
@@ -20,11 +20,11 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  -I../libgnu -I$(top_srcdir)/libgnu
-
-AUTOMAKE_OPTIONS = subdir-objects
+  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
 octlib_LTLIBRARIES = libcruft.la
 
@@ -42,7 +42,7 @@
 
 libcruft_la_LIBADD = \
   libranlib.la \
-  ../libgnu/libgnu.la \
+  $(top_builddir)/libgnu/libgnu.la \
   $(LIBCRUFT_LINK_DEPS)
 
 # Increment these as needed and according to the rules in the libtool
--- a/liboctave/Makefile.am
+++ b/liboctave/Makefile.am
@@ -22,7 +22,7 @@
 
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
-  -I../libgnu -I$(top_srcdir)/libgnu \
+  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu \
   -I$(top_srcdir)/libcruft/misc
 
 EXTRA_DIST = \
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,8 @@
 
 include $(top_srcdir)/build-aux/common.mk
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 ## Search local directories before those specified by the user.
 AM_CPPFLAGS = \
   -I$(top_srcdir)/libcruft/misc \
@@ -30,9 +32,7 @@
   -Iinterp-core -I$(srcdir)/interp-core \
   -Iinterpfcn -I$(srcdir)/interpfcn \
   -Icorefcn \
-  -I../libgnu -I$(top_srcdir)/libgnu
-
-AUTOMAKE_OPTIONS = subdir-objects
+  -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
 
 octlib_LTLIBRARIES = liboctinterp.la
 
@@ -44,11 +44,14 @@
 
 mkoctfile_SOURCES =
 nodist_mkoctfile_SOURCES = mkoctfile.cc
-mkoctfile_LDADD = ../libgnu/libgnu.la $(LIBS)
+mkoctfile_LDADD = $(top_builddir)/libgnu/libgnu.la $(LIBS)
 
 octave_config_SOURCES =
 nodist_octave_config_SOURCES = octave-config.cc
-octave_config_LDADD = corefcn/libcorefcn.la ../libgnu/libgnu.la $(LIBS)
+octave_config_LDADD = \
+  corefcn/libcorefcn.la \
+	$(top_builddir)/libgnu/libgnu.la \
+	$(LIBS)
 
 BUILT_SOURCES_EXTRA = \
   mkoctfile.cc \