Mercurial > octave-nkf
comparison src/Makefile.am @ 14295:21572e9bd365
make --disable-dl work again
* src/DLD-FUNCTIONS/config-module.awk: Emit $(DLD_LIBOCTINTERP_LIBADD)
instead of liboctinterp.la.
* src/Makefile.am (DLD_LIBOCTINTERP_LIBADD): Only define if
AMCOND_ENABLE_DYNAMIC_LINKING is true.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 31 Jan 2012 00:03:37 -0500 |
parents | 5d5400bd1f62 |
children | 8d1ae996c122 |
comparison
equal
deleted
inserted
replaced
14294:9e3983c8963c | 14295:21572e9bd365 |
---|---|
482 include TEMPLATE-INST/module.mk | 482 include TEMPLATE-INST/module.mk |
483 | 483 |
484 if AMCOND_ENABLE_DYNAMIC_LINKING | 484 if AMCOND_ENABLE_DYNAMIC_LINKING |
485 OCT_FILES = $(DLD_FUNCTIONS_LIBS:.la=.oct) | 485 OCT_FILES = $(DLD_FUNCTIONS_LIBS:.la=.oct) |
486 OCT_STAMP_FILES = $(subst DLD-FUNCTIONS/,DLD-FUNCTIONS/$(am__leading_dot),$(DLD_FUNCTIONS_LIBS:.la=.oct-stamp)) | 486 OCT_STAMP_FILES = $(subst DLD-FUNCTIONS/,DLD-FUNCTIONS/$(am__leading_dot),$(DLD_FUNCTIONS_LIBS:.la=.oct-stamp)) |
487 DLD_LIBOCTINTERP_LIBADD = liboctinterp.la | |
487 else | 488 else |
488 OCT_FILES = | 489 OCT_FILES = |
489 OCT_STAMP_FILES = | 490 OCT_STAMP_FILES = |
491 DLD_LIBOCTINTERP_LIBADD = | |
490 endif | 492 endif |
491 | 493 |
492 liboctinterp_la_SOURCES = \ | 494 liboctinterp_la_SOURCES = \ |
493 $(DIST_SRC) \ | 495 $(DIST_SRC) \ |
494 $(OPERATORS_SRC) \ | 496 $(OPERATORS_SRC) \ |