comparison Makefile.in @ 3740:00217ce0d15e

Add OCTAVE_FORGE_DEPS variable * Makefile.in: add OCTAVE_FORGE_DEPS to build of-XXXXX package dependancies
author John Donoghue
date Tue, 25 Nov 2014 12:54:27 -0500
parents 6dc67bfb5958
children 14869a85249d
comparison
equal deleted inserted replaced
3739:6dc67bfb5958 3740:00217ce0d15e
389 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll --msvc --libprefix '$(LIBRARY_PREFIX)' --libsuffix '$(LIBRARY_SUFFIX)' 389 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll --msvc --libprefix '$(LIBRARY_PREFIX)' --libsuffix '$(LIBRARY_SUFFIX)'
390 endif 390 endif
391 391
392 OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' 392 OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases'
393 OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat) 393 OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat)
394 # get ALL deps for all of- packages, regardless of whethe building the actual forge package in the installer
395 OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(wildcard $(TOP_DIR)/src/of-*.mk),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
394 396
395 BLAS_PACKAGES := blas 397 BLAS_PACKAGES := blas
396 ifeq ($(ENABLE_OPENBLAS),yes) 398 ifeq ($(ENABLE_OPENBLAS),yes)
397 BLAS_PACKAGES += openblas 399 BLAS_PACKAGES += openblas
398 endif 400 endif
470 472
471 .PHONY: msys-base-sources 473 .PHONY: msys-base-sources
472 msys-base-sources: $(MSYS_BASE_SOURCES) 474 msys-base-sources: $(MSYS_BASE_SOURCES)
473 475
474 .PHONY: octave-forge-packages 476 .PHONY: octave-forge-packages
475 octave-forge-packages: $(OCTAVE_FORGE_PACKAGES) 477 octave-forge-packages: $(OCTAVE_FORGE_DEPS) $(OCTAVE_FORGE_PACKAGES)
476 478
477 .PHONY: blas-packages 479 .PHONY: blas-packages
478 blas-packages: $(BLAS_PACKAGES) 480 blas-packages: $(BLAS_PACKAGES)
479 481
480 configure: configure.ac 482 configure: configure.ac