Mercurial > octave-dspies
view libinterp/link-deps.mk @ 17821:82c94987abc6
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rename REGEX to PCRE to accurately name the library.
* configure.ac: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS.
Rename REGEX to PCRE to accurately name the library.
* build-aux/common.mk: Add PCRE_LIBS, PCRE_CPPFLAGS macro substitutions.
Delete REGEX_LIBS.
* liboctave/util/module.mk: Add PCRE_CPPFLAGS to util convenience library.
* liboctave/link-deps.mk: Rename REGEX_LIBS to PCRE_LIBS.
libinterp/link-deps.mk: : Remove REGEX_LIBS which was never required for
libinterp.
* libinterp/corefcn/toplev.cc, libinterp/oct-conf.in.h:
Rename REGEX to PCRE to accurately name the library.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 31 Oct 2013 21:15:00 -0700 |
parents | a07d5b21606e |
children |
line wrap: on
line source
include $(top_srcdir)/liboctave/link-deps.mk if AMCOND_ENABLE_DYNAMIC_LINKING LIBOCTINTERP_LINK_DEPS = else LIBOCTINTERP_LINK_DEPS = $(DLDFCN_LIBS) endif LIBOCTINTERP_LINK_DEPS += \ $(FT2_LIBS) \ $(HDF5_LIBS) \ $(Z_LIBS) \ $(FFTW_XLIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) \ $(GL2PS_LIBS) \ $(LLVM_LIBS) \ $(JAVA_LIBS) \ $(LAPACK_LIBS) LIBOCTINTERP_LINK_OPTS = \ $(FT2_LDFLAGS) \ $(HDF5_LDFLAGS) \ $(Z_LDFLAGS) \ $(FFTW_XLDFLAGS) \ $(LLVM_LDFLAGS) OCT_LINK_DEPS = OCT_LINK_OPTS = $(LDFLAGS) if AMCOND_LINK_ALL_DEPS LIBOCTINTERP_LINK_DEPS += $(LIBOCTAVE_LINK_DEPS) LIBOCTINTERP_LINK_OPTS += $(LIBOCTAVE_LINK_OPTS) OCTAVE_LINK_DEPS = $(LIBOCTINTERP_LINK_DEPS) OCTAVE_LINK_OPTS = $(LIBOCTINTERP_LINK_OPTS) OCT_LINK_DEPS += $(LIBOCTINTERP_LINK_DEPS) OCT_LINK_OPTS += $(LIBOCTINTERP_LINK_OPTS) endif