# HG changeset patch # User John W. Eaton # Date 1250527105 14400 # Node ID a822193ba08a6500e6fc81ea11c6eae7e562f34e # Parent c4179ff88cf3c57e69064ee9082ec309e5edc9ea more library-specific flags for various .oct files. diff -r c4179ff88cf3 -r a822193ba08a src/ChangeLog --- a/src/ChangeLog Mon Aug 17 12:25:34 2009 -0400 +++ b/src/ChangeLog Mon Aug 17 12:38:25 2009 -0400 @@ -1,3 +1,9 @@ +2009-08-17 John W. Eaton + + * Makefile.in (eigs.oct, chol.oct, qr.oct): Add library-specific + CPPFLAGS and LDFLAGS variables to CPPFLAGS and LDFLAGS. + From Benjamin Lindner . + 2009-08-17 John W. Eaton * Makefile.in (OCTINTERP_LINK_DEPS): List $(LIBS) last. diff -r c4179ff88cf3 -r a822193ba08a src/Makefile.in --- a/src/Makefile.in Mon Aug 17 12:25:34 2009 -0400 +++ b/src/Makefile.in Mon Aug 17 12:38:25 2009 -0400 @@ -662,17 +662,26 @@ CPPFLAGS += $(QHULL_CPPFLAGS) __voronoi__.oct: OCT_LINK_DEPS += $(QHULL_LDFLAGS) $(QHULL_LIBS) -eigs.d eigs.df eigs.o pic/eigs.o: CPPFLAGS += $(ARPACK_CPPFLAGS) -eigs.oct: OCT_LINK_DEPS += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) $(BLAS_LIBS) +eigs.d eigs.df eigs.o pic/eigs.o: + CPPFLAGS += $(ARPACK_CPPFLAGS) $(SPARSE_CPPFLAGS) +eigs.oct: \ + OCT_LINK_DEPS += $(ARPACK_LDFLAGS) $(ARPACK_LIBS) \ + $(SPARSE_LDFLAGS) $(SPARSE_LIBS) $(BLAS_LIBS) qz.d qz.df qz.o pic/qz.o: qz.oct: OCT_LINK_DEPS += $(BLAS_LIBS) -qr.d qr.df qr.o pic/qr.o: CPPFLAGS += $(QRUPDATE_CPPFLAGS) -qr.oct: OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) +qr.d qr.df qr.o pic/qr.o: \ + CPPFLAGS += $(QRUPDATE_CPPFLAGS) $(SPARSE_CPPFLAGS) +qr.oct: \ + OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \ + $(SPARSE_LDFLAGS) $(SPARSE_LIBS) -chol.d chol.df chol.o pic/chol.o: CPPFLAGS += $(QRUPDATE_CPPFLAGS) -chol.oct: OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) +chol.d chol.df chol.o pic/chol.o: + CPPFLAGS += $(QRUPDATE_CPPFLAGS) $(SPARSE_CPPFLAGS) +chol.oct: \ + OCT_LINK_DEPS += $(QRUPDATE_LDFLAGS) $(QRUPDATE_LIBS) \ + $(SPARSE_LDFLAGS) $(SPARSE_LIBS) regexp.d regexp.df regexp.o pic/regexp.o: CPPFLAGS += $(REGEX_CPPFLAGS) regexp.oct: OCT_LINK_DEPS += $(REGEX_LDFLAGS) $(REGEX_LIBS) @@ -686,7 +695,8 @@ fltk_backend.d fltk_backend.df fltk_backend.o pic/fltk_backend.o: \ CPPFLAGS += $(GRAPHICS_CPPFLAGS) $(FT2_CPPFLAGS) fltk_backend.oct: \ - OCT_LINK_DEPS += $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) $(FT2_LDFLAGS) $(FT2_LIBS) + OCT_LINK_DEPS += $(GRAPHICS_LDFLAGS) $(GRAPHICS_LIBS) \ + $(FT2_LDFLAGS) $(FT2_LIBS) amd.d amd.df pic/amd.o amd.o: CPPFLAGS += $(SPARSE_CPPFLAGS) amd.oct: OCT_LINK_DEPS += $(SPARSE_LDFLAGS) $(SPARSE_LIBS)