Mercurial > hg > octave-terminal
changeset 15277:e359158c917f
build: Place ranlib build rules in ranlib directory's module.mk.
* cruft/Makefile.am: Remove ranlib specific rules.
* cruft/ranlib/module.mk: Add rules for building ranlib convenience library.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 02 Sep 2012 15:57:56 -0700 |
parents | 329f088cbdf7 |
children | f4b5304ee451 |
files | liboctave/cruft/Makefile.am liboctave/cruft/ranlib/module.mk |
diffstat | 2 files changed, 21 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/cruft/Makefile.am +++ b/liboctave/cruft/Makefile.am @@ -26,6 +26,8 @@ AM_CPPFLAGS = \ -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu +EXTRA_DIST = mkf77def.in + noinst_LTLIBRARIES = libcruft.la libcruft_la_SOURCES = @@ -40,16 +42,8 @@ libcruft_la_DEPENDENCIES = cruft.def -noinst_LTLIBRARIES += ranlib/libranlib.la - -ranlib_libranlib_la_SOURCES = - -ranlib_libranlib_la_DEPENDENCIES = ranlib.def - octinclude_HEADERS = -EXTRA_DIST = - include amos/module.mk include blas-xtra/module.mk include daspk/module.mk @@ -65,17 +59,14 @@ include slatec-err/module.mk include slatec-fn/module.mk +## Special rules for files which must be built before compilation cruft.def: $(libcruft_la_SOURCES) mkf77def chmod a+rx mkf77def ./mkf77def $(srcdir) $(libcruft_la_SOURCES) > $@-t mv $@-t $@ -ranlib.def: $(libranlib_la_SOURCES) mkf77def - chmod a+rx mkf77def - ./mkf77def $(srcdir) $(libranlib_la_SOURCES) > $@-t - mv $@-t $@ +DISTCLEANFILES = \ + cruft.def \ + ranlib/ranlib.def + $(nodist_libcruft_la_SOURCES) -EXTRA_DIST += mkf77def.in - -DISTCLEANFILES = cruft.def ranlib.def $(nodist_libcruft_la_SOURCES) -
--- a/liboctave/cruft/ranlib/module.mk +++ b/liboctave/cruft/ranlib/module.mk @@ -9,7 +9,7 @@ ranlib/tstgmn.for \ ranlib/tstmid.for -ranlib_libranlib_la_SOURCES += \ +RANLIB_SRC = \ ranlib/advnst.f \ ranlib/genbet.f \ ranlib/genchi.f \ @@ -45,3 +45,16 @@ ranlib/sgamma.f \ ranlib/snorm.f \ ranlib/wrap.f + +noinst_LTLIBRARIES += ranlib/libranlib.la + +ranlib_libranlib_la_SOURCES = $(RANLIB_SRC) + +ranlib_libranlib_la_DEPENDENCIES = ranlib/ranlib.def + +## Special rules for files which must be built before compilation +ranlib/ranlib.def: $(RANLIB_SRC) mkf77def + chmod a+rx mkf77def + ./mkf77def $(srcdir) $(RANLIB_SRC) > $@-t + mv $@-t $@ +