Mercurial > octave-nkf
comparison libinterp/Makefile.am @ 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 | 648dabbb4c6b |
children | 03ef3a183129 |
comparison
equal
deleted
inserted
replaced
15277:e359158c917f | 15278:f4b5304ee451 |
---|---|
23 AUTOMAKE_OPTIONS = subdir-objects | 23 AUTOMAKE_OPTIONS = subdir-objects |
24 | 24 |
25 ## Search local directories before those specified by the user. | 25 ## Search local directories before those specified by the user. |
26 AM_CPPFLAGS = \ | 26 AM_CPPFLAGS = \ |
27 -I$(top_srcdir)/liboctave/cruft/misc \ | 27 -I$(top_srcdir)/liboctave/cruft/misc \ |
28 -I../liboctave/array -I$(top_srcdir)/liboctave/array \ | 28 -I$(top_srcdir)/liboctave/array \ |
29 -I../liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ | 29 -I$(top_builddir)/liboctave/numeric -I$(top_srcdir)/liboctave/numeric \ |
30 -I../liboctave/operators -I$(top_srcdir)/liboctave/operators \ | 30 -I$(top_builddir)/liboctave/operators -I$(top_srcdir)/liboctave/operators \ |
31 -I../liboctave/system -I$(top_srcdir)/liboctave/system \ | 31 -I$(top_srcdir)/liboctave/system \ |
32 -I../liboctave/util -I$(top_srcdir)/liboctave/util \ | 32 -I$(top_srcdir)/liboctave/util \ |
33 -I../liboctave -I$(top_srcdir)/liboctave \ | |
34 -I$(srcdir)/octave-value \ | 33 -I$(srcdir)/octave-value \ |
35 -I$(srcdir)/operators \ | 34 -I$(srcdir)/operators \ |
36 -Iparse-tree -I$(srcdir)/parse-tree \ | 35 -Iparse-tree -I$(srcdir)/parse-tree \ |
37 -Iinterp-core -I$(srcdir)/interp-core \ | 36 -Iinterp-core -I$(srcdir)/interp-core \ |
38 -Iinterpfcn -I$(srcdir)/interpfcn \ | 37 -Iinterpfcn -I$(srcdir)/interpfcn \ |
168 octave-value/liboctave-value.la \ | 167 octave-value/liboctave-value.la \ |
169 parse-tree/libparse-tree.la \ | 168 parse-tree/libparse-tree.la \ |
170 interp-core/libinterp-core.la \ | 169 interp-core/libinterp-core.la \ |
171 interpfcn/libinterpfcn.la \ | 170 interpfcn/libinterpfcn.la \ |
172 corefcn/libcorefcn.la \ | 171 corefcn/libcorefcn.la \ |
173 ../liboctave/liboctave.la \ | 172 $(top_builddir)/liboctave/liboctave.la \ |
174 $(LIBOCTINTERP_LINK_DEPS) | 173 $(LIBOCTINTERP_LINK_DEPS) |
175 | 174 |
176 # Increment these as needed and according to the rules in the libtool manual: | 175 # Increment these as needed and according to the rules in the libtool manual: |
177 liboctinterp_current = 1 | 176 liboctinterp_current = 1 |
178 liboctinterp_revision = 1 | 177 liboctinterp_revision = 1 |
225 $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) | 224 $(am__skipyacc) $(SHELL) $(YLWRAP) $< y.tab.c $@ y.tab.h $*.h y.output $*.output -- $(YACCCOMPILE) |
226 | 225 |
227 ## Special rules: | 226 ## Special rules: |
228 ## Mostly for sources which must be built before rest of compilation. | 227 ## Mostly for sources which must be built before rest of compilation. |
229 | 228 |
230 ## oct-conf.h must depend on Makefile. Calling configure | 229 ## oct-conf.h must depend on Makefile. |
231 ## may change default/config values. However, calling configure will also | 230 ## Calling configure may change default/config values. |
232 ## regenerate the Makefiles from Makefile.am and trigger the rules below. | 231 ## However, calling configure will also regenerate the Makefiles from |
232 ## Makefile.am and trigger the rules below. | |
233 oct-conf.h: oct-conf.in.h Makefile | 233 oct-conf.h: oct-conf.in.h Makefile |
234 @$(do_subst_config_vals) | 234 @$(do_subst_config_vals) |
235 | 235 |
236 version.h: version.in.h Makefile | 236 version.h: version.in.h Makefile |
237 $(SED) < $< \ | 237 $(SED) < $< \ |