# HG changeset patch # User John Donoghue # Date 1416938067 18000 # Node ID 00217ce0d15ed4d3f92b6d8c22efd4bf08e5029e # Parent 6dc67bfb5958b93ef11a6de7ae6322475b985184 Add OCTAVE_FORGE_DEPS variable * Makefile.in: add OCTAVE_FORGE_DEPS to build of-XXXXX package dependancies diff -r 6dc67bfb5958 -r 00217ce0d15e Makefile.in --- a/Makefile.in Tue Nov 25 12:54:23 2014 -0500 +++ b/Makefile.in Tue Nov 25 12:54:27 2014 -0500 @@ -391,6 +391,8 @@ OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' 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) +# get ALL deps for all of- packages, regardless of whethe building the actual forge package in the installer +OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(wildcard $(TOP_DIR)/src/of-*.mk),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p))) BLAS_PACKAGES := blas ifeq ($(ENABLE_OPENBLAS),yes) @@ -472,7 +474,7 @@ msys-base-sources: $(MSYS_BASE_SOURCES) .PHONY: octave-forge-packages -octave-forge-packages: $(OCTAVE_FORGE_PACKAGES) +octave-forge-packages: $(OCTAVE_FORGE_DEPS) $(OCTAVE_FORGE_PACKAGES) .PHONY: blas-packages blas-packages: $(BLAS_PACKAGES)