Mercurial > octave-nkf
annotate gui/Makefile.am @ 15159:098546e95a5e gui
allow location of default settings file to be configurable
* gui/default-qt-settings: Rename from default-settings.
* gui/Makefile.am (octetc_DATA): New variable.
* resource-manager.cc (default_qt_settings_file): New function.
(resource_manager::reload_settings): Call default_qt_settings_file to
find default settings file.
* run-octave.in: Set OCTAVE_DEFAULT_QT_SETTINGS in the environment for
running octave.
* gui/src/Makefile.am (liboctgui_la_CPPFLAGS): Include -I../../src,
-I../../src/interpfcn, and -I../../src/parse-tree in the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 11 Aug 2012 17:58:12 -0400 |
parents | 4f6e058e4161 |
children |
rev | line source |
---|---|
15110
4f6e058e4161
Integrate GUI building with regular octave build system.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
1 SUBDIRS = src |
15159
098546e95a5e
allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents:
15110
diff
changeset
|
2 |
098546e95a5e
allow location of default settings file to be configurable
John W. Eaton <jwe@octave.org>
parents:
15110
diff
changeset
|
3 octetc_DATA = default-qt-settings |