Mercurial > hg > octave-lojdl
changeset 15278:f4b5304ee451
build: Remove unnecessary -I includes from AM_CPPFLAGS.
* libinterp/Makefile.am: Remove unnecessary -I includes from AM_CPPFLAGS.
* src/Makefile.am: Remove unnecessary -I includes from AM_CPPFLAGS.
* liboctave/Makefile.am: Use $top_builddir to make list more readable.
* liboctave/cruft/Makefile.am: Replace tabs with spaces in file list.
* liboctave/cruft/slatec-fn/module.mk: Add blank line at end of file.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 02 Sep 2012 17:41:43 -0700 |
parents | e359158c917f |
children | 2b3eaec99a38 |
files | libinterp/Makefile.am liboctave/Makefile.am liboctave/cruft/Makefile.am liboctave/cruft/slatec-fn/module.mk src/Makefile.am |
diffstat | 5 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/Makefile.am +++ b/libinterp/Makefile.am @@ -25,12 +25,11 @@ ## Search local directories before those specified by the user. AM_CPPFLAGS = \ -I$(top_srcdir)/liboctave/cruft/misc \ - -I../liboctave/array -I$(top_srcdir)/liboctave/array \ - -I../liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ - -I../liboctave/operators -I$(top_srcdir)/liboctave/operators \ - -I../liboctave/system -I$(top_srcdir)/liboctave/system \ - -I../liboctave/util -I$(top_srcdir)/liboctave/util \ - -I../liboctave -I$(top_srcdir)/liboctave \ + -I$(top_srcdir)/liboctave/array \ + -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ + -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ + -I$(top_srcdir)/liboctave/system \ + -I$(top_srcdir)/liboctave/util \ -I$(srcdir)/octave-value \ -I$(srcdir)/operators \ -Iparse-tree -I$(srcdir)/parse-tree \ @@ -170,7 +169,7 @@ interp-core/libinterp-core.la \ interpfcn/libinterpfcn.la \ corefcn/libcorefcn.la \ - ../liboctave/liboctave.la \ + $(top_builddir)/liboctave/liboctave.la \ $(LIBOCTINTERP_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual: @@ -227,9 +226,10 @@ ## Special rules: ## Mostly for sources which must be built before rest of compilation. -## oct-conf.h must depend on Makefile. Calling configure -## may change default/config values. However, calling configure will also -## regenerate the Makefiles from Makefile.am and trigger the rules below. +## oct-conf.h must depend on Makefile. +## Calling configure may change default/config values. +## However, calling configure will also regenerate the Makefiles from +## Makefile.am and trigger the rules below. oct-conf.h: oct-conf.in.h Makefile @$(do_subst_config_vals)
--- a/liboctave/Makefile.am +++ b/liboctave/Makefile.am @@ -100,7 +100,7 @@ operators/liboperators.la \ system/libsystem.la \ util/libutil.la \ - ../libgnu/libgnu.la \ + $(top_builddir)/libgnu/libgnu.la \ $(LIBOCTAVE_LINK_DEPS) # Increment these as needed and according to the rules in the libtool manual:
--- a/liboctave/cruft/Makefile.am +++ b/liboctave/cruft/Makefile.am @@ -67,6 +67,6 @@ DISTCLEANFILES = \ cruft.def \ - ranlib/ranlib.def - $(nodist_libcruft_la_SOURCES) + ranlib/ranlib.def \ + $(nodist_libcruft_la_SOURCES)
--- a/liboctave/cruft/slatec-fn/module.mk +++ b/liboctave/cruft/slatec-fn/module.mk @@ -78,3 +78,4 @@ slatec-fn/derfc.f: slatec-fn/derfc.in.f Makefile $(SED) -e "${F77_ISNAN_MACRO}" < $< > $@-t mv $@-t $@ +
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,12 +22,11 @@ ## Search local directories before those specified by the user. AM_CPPFLAGS = \ - -I$(srcdir)/../liboctave \ - -I$(srcdir)/../liboctave/array \ - -I$(srcdir)/../liboctave/cruft/misc \ - -I$(srcdir)/../liboctave/numeric \ - -I$(srcdir)/../liboctave/util \ - -I$(srcdir)/../libinterp \ + -I$(top_srcdir)/liboctave/array \ + -I$(top_srcdir)/liboctave/cruft/misc \ + -I$(top_srcdir)/liboctave/numeric \ + -I$(top_srcdir)/liboctave/util \ + -I$(top_srcdir)/libinterp \ -I$(top_builddir)/libinterp/interpfcn \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu @@ -71,8 +70,8 @@ octave-config.in.sh OCTAVE_CORE_LIBS = \ - ../libinterp/liboctinterp.la \ - ../liboctave/liboctave.la + $(top_builddir)/libinterp/liboctinterp.la \ + $(top_builddir)/liboctave/liboctave.la include ../libgui/src/link-deps.mk @@ -88,7 +87,7 @@ if AMCOND_BUILD_GUI octave_SOURCES = main.cc - OCTAVE_GUI_LIBS = ../libgui/src/liboctgui.la + OCTAVE_GUI_LIBS = $(top_builddir)/libgui/src/liboctgui.la OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/libgui/src else octave_SOURCES = main-cli.cc