Mercurial > hg > octave-nkf
changeset 17376:f0e3d3de5c22
build: Enable subdir-objects Automake option project-wide
* configure.ac (AM_INIT_AUTOMAKE): Add subdir-objects option to enable it
project-wide to simplify and anticipate future Automake defaults.
* libgui/Makefile.am, libinterp/Makefile.am, liboctave/Makefile.am,
liboctave/cruft/Makefile.am, scripts/Makefile.am (AUTOMAKE_OPTIONS): Delete.
author | Mike Miller <mtmiller@ieee.org> |
---|---|
date | Thu, 05 Sep 2013 01:49:29 -0400 |
parents | bc018154e46a |
children | 15e2ad6372f7 |
files | configure.ac libgui/Makefile.am libinterp/Makefile.am liboctave/Makefile.am liboctave/cruft/Makefile.am scripts/Makefile.am |
diffstat | 6 files changed, 1 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac +++ b/configure.ac @@ -41,7 +41,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 tar-ustar]) +AM_INIT_AUTOMAKE([1.11 tar-ustar subdir-objects]) ## Add the option to enable silent rules, available since Automake 1.11 ## and included by default starting with Automake 1.13.
--- a/libgui/Makefile.am +++ b/libgui/Makefile.am @@ -20,8 +20,6 @@ include $(top_srcdir)/build-aux/common.mk -AUTOMAKE_OPTIONS = subdir-objects - MOC_CPPFLAGS = octlib_LTLIBRARIES = liboctgui.la
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -20,8 +20,6 @@ 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)/liboctave/cruft/misc \
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -20,8 +20,6 @@ include $(top_srcdir)/build-aux/common.mk -AUTOMAKE_OPTIONS = subdir-objects - ## Run cruft dir with stand-alone Makefile. ## Eventually this will use module.mk syntax. SUBDIRS = cruft