Skip to content

Commit cf3ba38

Browse files
committed
* Makefile: separate --no-gui from octave command
1 parent fe7de45 commit cf3ba38

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ HTML_TARBALL := $(TARGET_DIR)/$(PACKAGE)-html.tar.gz
7272

7373
## Octave binaries
7474
MKOCTFILE ?= mkoctfile
75-
OCTAVE ?= octave --no-gui
75+
OCTAVE ?= octave
7676

7777
## Targets that are not filenames.
7878
## https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html
@@ -176,7 +176,7 @@ html_options = --eval 'options = get_html_options ("octave-forge");' \
176176
$(HTML_DIR): install
177177
@echo "Generating HTML documentation. This may take a while ..."
178178
$(RM) -r "$@"
179-
$(OCTAVE) --no-window-system --silent \
179+
$(OCTAVE) --no-gui --no-window-system --silent \
180180
--eval "pkg load generate_html; " \
181181
--eval "pkg load $(PACKAGE);" \
182182
$(html_options) \
@@ -192,7 +192,7 @@ release: dist html
192192

193193
install: $(RELEASE_TARBALL)
194194
@echo "Installing package locally ..."
195-
$(OCTAVE) --silent --eval 'pkg ("install", "-verbose", "$(RELEASE_TARBALL)")'
195+
$(OCTAVE) --no-gui --silent --eval 'pkg ("install", "-verbose", "$(RELEASE_TARBALL)")'
196196

197197
clean: cleandocs
198198
$(RM) -r $(RELEASE_DIR) $(RELEASE_TARBALL) $(HTML_TARBALL) $(HTML_DIR)
@@ -208,7 +208,7 @@ all:
208208
# Start an Octave session with the package directories on the path for
209209
# interactice test of development sources.
210210
run: all
211-
$(OCTAVE) --silent --persist --path "$(TOPDIR)/inst/" \
211+
$(OCTAVE) --no-gui --silent --persist --path "$(TOPDIR)/inst/" \
212212
--eval 'if(!isempty("$(DEPENDS)")); pkg load $(DEPENDS); endif;'
213213

214214
rungui: all
@@ -218,14 +218,14 @@ rungui: all
218218
# Test example blocks in the documentation. Needs doctest package
219219
# http://octave.sourceforge.net/doctest/index.html
220220
doctest: all
221-
$(OCTAVE) --path "$(TOPDIR)/inst/" \
221+
$(OCTAVE) --no-gui --path "$(TOPDIR)/inst/" \
222222
--eval 'if(!isempty("$(DEPENDS)")); pkg load $(DEPENDS); endif;' \
223223
--eval 'pkg load doctest;' \
224224
--eval 'doctest ("$(TOPDIR)/inst/");'
225225

226226
# Note "doctest" as prerequesite. When testing the package, also check
227227
# the documentation.
228228
check: all
229-
$(OCTAVE) --silent --path "$(TOPDIR)/inst/" \
229+
$(OCTAVE) --no-gui --silent --path "$(TOPDIR)/inst/" \
230230
--eval 'if(!isempty("$(DEPENDS)")); pkg load $(DEPENDS); endif;' \
231231
--eval "__run_test_suite__ ({'$(TOPDIR)/inst'}, {})"

0 commit comments

Comments
 (0)