Mercurial > hg > octave-nkf

changeset 7938:bf4a04ebff21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[mq]: makefix
author Jaroslav Hajek <highegg@gmail.com>
date Thu, 17 Jul 2008 11:56:36 +0200
parents 6661387827d6
children 18d7171759ff
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 20 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2008-07-17  Jaroslav Hajek <highegg@gmail.com>
+
+	* Makefile.in (convhulln.oct, __delaunayn__.oct, __voronoi__.oct, 
+	regexp.oct, urlwrite.oct, __glpk__.oct, fltk_backend.oct):
+	Use OCT_LINK_DEPS instead of DL_LDFLAGS for target-specific
+	dependencies.
+
+2008-07-17  David Bateman  <dbateman@free.fr>
+
+	* DLD-FUNCTION/__magick_read__.cc (F__magick_read__): Allow build
+	without GraphicsMagick++ installed.
+
 2008-07-16  John W. Eaton  <jwe@octave.org>
 
 	* graphics.h.in (gh_manager::autolock): Delete copy constructor
@@ -48,11 +60,6 @@
 	(GO_BODY): Likewise.
 	(Fdrawnow): Support single "expose" argument.
 
-2008-07-17  David Bateman  <dbateman@free.fr>
-
-	* DLD-FUNCTION/__magick_read__.cc (F__magick_read__): Allow build
-	without GraphicsMagick++ installed.
-
 2008-07-15  John W. Eaton  <jwe@octave.org>
 
 	* DLD-FUNCTIONS/__convn__.cc (convn): Cast second arg to
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -627,15 +627,15 @@
 
 __magick_read__.d: CPPFLAGS += $(MAGICK_INCFLAGS)
 __magick_read__.o pic/__magick_read__.o: CPPFLAGS += $(MAGICK_INCFLAGS)
-__magick_read__.oct: DL_LDFLAGS += $(MAGICK_LIBS)
+__magick_read__.oct: OCT_LINK_DEPS += $(MAGICK_LIBS)
 
-convhulln.oct: DL_LDFLAGS += $(QHULL_LIBS)
-__delaunayn__.oct: DL_LDFLAGS += $(QHULL_LIBS)
-__voronoi__.oct: DL_LDFLAGS += $(QHULL_LIBS)
-regexp.oct: DL_LDFLAGS += $(REGEX_LIBS)
-urlwrite.oct: DL_LDFLAGS += $(CURL_LIBS)
-__glpk__.oct: DL_LDFLAGS += $(GLPK_LIBS)
-fltk_backend.oct: DL_LDFLAGS += $(GRAPHICS_LIBS) $(FT2_LIBS)
+convhulln.oct: OCT_LINK_DEPS += $(QHULL_LIBS)
+__delaunayn__.oct: OCT_LINK_DEPS += $(QHULL_LIBS)
+__voronoi__.oct: OCT_LINK_DEPS += $(QHULL_LIBS)
+regexp.oct: OCT_LINK_DEPS += $(REGEX_LIBS)
+urlwrite.oct: OCT_LINK_DEPS += $(CURL_LIBS)
+__glpk__.oct: OCT_LINK_DEPS += $(GLPK_LIBS)
+fltk_backend.oct: OCT_LINK_DEPS += $(GRAPHICS_LIBS) $(FT2_LIBS)
 
 check: all
 .PHONY: check