Mercurial > octave-nkf

comparison src/Makefile.am @ 15278:f4b5304ee451

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dd794aa84232
children 48cb1a5bb64d
comparison
equal deleted inserted replaced
15277:e359158c917f 15278:f4b5304ee451
20 20
21 include $(top_srcdir)/build-aux/common.mk 21 include $(top_srcdir)/build-aux/common.mk
22 22
23 ## Search local directories before those specified by the user. 23 ## Search local directories before those specified by the user.
24 AM_CPPFLAGS = \ 24 AM_CPPFLAGS = \
25 -I$(srcdir)/../liboctave \ 25 -I$(top_srcdir)/liboctave/array \
26 -I$(srcdir)/../liboctave/array \ 26 -I$(top_srcdir)/liboctave/cruft/misc \
27 -I$(srcdir)/../liboctave/cruft/misc \ 27 -I$(top_srcdir)/liboctave/numeric \
28 -I$(srcdir)/../liboctave/numeric \ 28 -I$(top_srcdir)/liboctave/util \
29 -I$(srcdir)/../liboctave/util \ 29 -I$(top_srcdir)/libinterp \
30 -I$(srcdir)/../libinterp \
31 -I$(top_builddir)/libinterp/interpfcn \ 30 -I$(top_builddir)/libinterp/interpfcn \
32 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu 31 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
33 32
34 OCTAVE_BINARIES = \ 33 OCTAVE_BINARIES = \
35 octave \ 34 octave \
69 mkoctfile.in.sh \ 68 mkoctfile.in.sh \
70 octave-config.in.cc \ 69 octave-config.in.cc \
71 octave-config.in.sh 70 octave-config.in.sh
72 71
73 OCTAVE_CORE_LIBS = \ 72 OCTAVE_CORE_LIBS = \
74 ../libinterp/liboctinterp.la \ 73 $(top_builddir)/libinterp/liboctinterp.la \
75 ../liboctave/liboctave.la 74 $(top_builddir)/liboctave/liboctave.la
76 75
77 include ../libgui/src/link-deps.mk 76 include ../libgui/src/link-deps.mk
78 77
79 octave_cli_SOURCES = main-cli.cc 78 octave_cli_SOURCES = main-cli.cc
80 79
86 $(NO_UNDEFINED_LDFLAG) \ 85 $(NO_UNDEFINED_LDFLAG) \
87 $(OCTAVE_LINK_OPTS) 86 $(OCTAVE_LINK_OPTS)
88 87
89 if AMCOND_BUILD_GUI 88 if AMCOND_BUILD_GUI
90 octave_SOURCES = main.cc 89 octave_SOURCES = main.cc
91 OCTAVE_GUI_LIBS = ../libgui/src/liboctgui.la 90 OCTAVE_GUI_LIBS = $(top_builddir)/libgui/src/liboctgui.la
92 OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/libgui/src 91 OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/libgui/src
93 else 92 else
94 octave_SOURCES = main-cli.cc 93 octave_SOURCES = main-cli.cc
95 OCTAVE_GUI_LIBS = 94 OCTAVE_GUI_LIBS =
96 OCTAVE_GUI_CPPFLAGS = 95 OCTAVE_GUI_CPPFLAGS =