Mercurial > octave-dspies

comparison build-aux/common.mk @ 17821:82c94987abc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e6317049225b
children 23f680301f65 b6b6e0dc700e
comparison
equal deleted inserted replaced
17820:3488d987eb50 17821:82c94987abc6
264 MAGICK_LDFLAGS = @MAGICK_LDFLAGS@ 264 MAGICK_LDFLAGS = @MAGICK_LDFLAGS@
265 MAGICK_LIBS = @MAGICK_LIBS@ 265 MAGICK_LIBS = @MAGICK_LIBS@
266 266
267 OPENGL_LIBS = @OPENGL_LIBS@ 267 OPENGL_LIBS = @OPENGL_LIBS@
268 268
269 PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
270 PCRE_LIBS = @PCRE_LIBS@
271
269 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ 272 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
270 PTHREAD_LIBS = @PTHREAD_LIBS@ 273 PTHREAD_LIBS = @PTHREAD_LIBS@
271 274
272 QHULL_CPPFLAGS = @QHULL_CPPFLAGS@ 275 QHULL_CPPFLAGS = @QHULL_CPPFLAGS@
273 QHULL_LDFLAGS = @QHULL_LDFLAGS@ 276 QHULL_LDFLAGS = @QHULL_LDFLAGS@
274 QHULL_LIBS = @QHULL_LIBS@ 277 QHULL_LIBS = @QHULL_LIBS@
275 278
276 QRUPDATE_CPPFLAGS = @QRUPDATE_CPPFLAGS@ 279 QRUPDATE_CPPFLAGS = @QRUPDATE_CPPFLAGS@
277 QRUPDATE_LDFLAGS = @QRUPDATE_LDFLAGS@ 280 QRUPDATE_LDFLAGS = @QRUPDATE_LDFLAGS@
278 QRUPDATE_LIBS = @QRUPDATE_LIBS@ 281 QRUPDATE_LIBS = @QRUPDATE_LIBS@
279
280 REGEX_LIBS = @REGEX_LIBS@
281 282
282 READLINE_LIBS = @READLINE_LIBS@ 283 READLINE_LIBS = @READLINE_LIBS@
283 284
284 SPARSE_XCPPFLAGS = \ 285 SPARSE_XCPPFLAGS = \
285 $(CHOLMOD_CPPFLAGS) $(UMFPACK_CPPFLAGS) \ 286 $(CHOLMOD_CPPFLAGS) $(UMFPACK_CPPFLAGS) \
609 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ 610 -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
610 -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \ 611 -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \
611 -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \ 612 -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \
612 -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \ 613 -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \
613 -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \ 614 -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
615 -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \
616 -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \
614 -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \ 617 -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
615 -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \ 618 -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \
616 -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \ 619 -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \
617 -e "s|%OCTAVE_CONF_QHULL_CPPFLAGS%|\"${QHULL_CPPFLAGSS}\"|" \ 620 -e "s|%OCTAVE_CONF_QHULL_CPPFLAGS%|\"${QHULL_CPPFLAGSS}\"|" \
618 -e "s|%OCTAVE_CONF_QHULL_LDFLAGS%|\"${QHULL_LDFLAGSS}\"|" \ 621 -e "s|%OCTAVE_CONF_QHULL_LDFLAGS%|\"${QHULL_LDFLAGSS}\"|" \
624 -e "s|%OCTAVE_CONF_QT_LDFLAGS%|\"${QT_LDFLAGS}\"|" \ 627 -e "s|%OCTAVE_CONF_QT_LDFLAGS%|\"${QT_LDFLAGS}\"|" \
625 -e "s|%OCTAVE_CONF_QT_LIBS%|\"${QT_LIBS}\"|" \ 628 -e "s|%OCTAVE_CONF_QT_LIBS%|\"${QT_LIBS}\"|" \
626 -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \ 629 -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \
627 -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \ 630 -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \
628 -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \ 631 -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
629 -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \
630 -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ 632 -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
631 -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ 633 -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
632 -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \ 634 -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \
633 -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \ 635 -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \
634 -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \ 636 -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \