Mercurial > octave

comparison Makefile.am @ 21384:ad1dbbd23f1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.am: Add libgnu.la to BUILT_SOURCES to generate it early (partial fix bug #45578). * Makefile.am: Add libgnu.la to BUILT_SOURCES. Add a rule for libgnu.la to that enters directory and runs 'make all'.
author Rik <rik@octave.org>
date Tue, 01 Mar 2016 09:53:59 -0800
parents eb7287db3da9
children 4f994c3f88fc
comparison
equal deleted inserted replaced
21383:c9f967cfe7c1 21384:ad1dbbd23f1d
105 105
106 DIST_SRC = 106 DIST_SRC =
107 107
108 ALL_LOCAL_TARGETS = 108 ALL_LOCAL_TARGETS =
109 109
110 # Subdirectories in which to run make recursively.
111 # Other directories are handled directly from this Makefile,
112 # but also review the included module.mk makefile fragments.
113
114 SUBDIRS = libgnu
115
116 # All of build depends on having libgnu.
117 # Add the library to BUILT_SOURCES so it is created early in the build process
118 # This is only a partial solution which works when 'make all' is used.
119 # See bug #45578.
120 BUILT_SOURCES += libgnu/libgnu.la
121
122 libgnu/libgnu.la:
123 cd libgnu; $(MAKE) all
124
110 include liboctave/module.mk 125 include liboctave/module.mk
111 include liboctave/link-deps.mk 126 include liboctave/link-deps.mk
112 include libinterp/module.mk 127 include libinterp/module.mk
113 include libinterp/link-deps.mk 128 include libinterp/link-deps.mk
114 include libgui/module.mk 129 include libgui/module.mk
120 include etc/module.mk 135 include etc/module.mk
121 include examples/module.mk 136 include examples/module.mk
122 include m4/module.mk 137 include m4/module.mk
123 include test/module.mk 138 include test/module.mk
124 139
125 # Subdirectories in which to run make recursively. Other
126 # directories are handled directly from this Makefile (see also the
127 # included makefile fragments).
128
129 SUBDIRS = libgnu
130
131 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook scripts-dist-hook 140 dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook scripts-dist-hook
132 141
133 if AMCOND_BUILD_DOCS 142 if AMCOND_BUILD_DOCS
134 docs-dist-hook: 143 docs-dist-hook:
135 else 144 else