Mercurial > octave-nkf

changeset 7927:0487e46da18e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/Makefile.in: simplify with target-specific variable settings
author John W. Eaton <jwe@octave.org>
date Mon, 14 Jul 2008 17:03:12 -0400
parents d74f996e005d
children f728089c9543
files src/ChangeLog src/Makefile.in
diffstat 2 files changed, 11 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jul 14 16:00:09 2008 -0400
+++ b/src/ChangeLog	Mon Jul 14 17:03:12 2008 -0400
@@ -1,5 +1,9 @@
 2008-07-14  John W. Eaton  <jwe@octave.org>
 
+	* Makefile.in (convhulln.oct, __delaunayn__.oct, __voronoi__.oct, 
+	regexp.oct, urlwrite.oct, __glpk__.oct, fltk_backend.oct):
+	Simplify with target-specific settings for DL_LDFLAGS.
+
 	* DLD-FUNCTIONS/__magick_read__.cc: Delete "using namespace std"
 	and "using namespace Magick" directives.  Style fixes.
 
--- a/src/Makefile.in	Mon Jul 14 16:00:09 2008 -0400
+++ b/src/Makefile.in	Mon Jul 14 17:03:12 2008 -0400
@@ -629,41 +629,13 @@
 __magick_read__.o pic/__magick_read__.o: CPPFLAGS += $(MAGICK_INCFLAGS)
 __magick_read__.oct: DL_LDFLAGS += $(MAGICK_LIBS)
 
-# How to make a .oct file from a .o file:
-
-ifeq ($(ENABLE_DYNAMIC_LINKING), true)
-  ifdef CXXPICFLAG
-    convhulln.oct : pic/convhulln.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(QHULL_LIBS)
-    __delaunayn__.oct : pic/__delaunayn__.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(QHULL_LIBS)
-    __voronoi__.oct : pic/__voronoi__.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(QHULL_LIBS)
-    regexp.oct : pic/regexp.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(REGEX_LIBS)
-    urlwrite.oct : pic/urlwrite.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(CURL_LIBS)
-    __glpk__.oct : pic/__glpk__.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(GLPK_LIBS)
-    fltk_backend.oct : pic/fltk_backend.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(GRAPHICS_LIBS) $(FT2_LIBS)
-  else
-    convhulln.oct : convhulln.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(QHULL_LIBS)
-    __delaunayn__.oct : __delaunayn__.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(QHULL_LIBS)
-    __voronoi__.oct : __voronoi__.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(QHULL_LIBS)
-    regexp.oct : regexp.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(REGEX_LIBS)
-    urlwrite.oct : urlwrite.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(CURL_LIBS)
-    __glpk__.oct : __glpk__.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(GLPK_LIBS)
-    fltk_backend.oct : fltk_backend.o octave$(EXEEXT)
-	  $(DL_LD) $(DL_LDFLAGS) -o $@ $< $(OCT_LINK_DEPS) $(GRAPHICS_LIBS) $(FT2_LIBS)
-  endif
-endif
+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)
 
 check: all
 .PHONY: check