--- a/.hgsub
+++ b/.hgsub
@@ -1,2 +1,2 @@
gnulib = [git]git://git.sv.gnu.org/gnulib
-gui/qterminal = [git]https://code.google.com/p/qterminal/
+libgui/qterminal = [git]https://code.google.com/p/qterminal/
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,2 +1,2 @@
0e3af50c9e20938bd1cea0182bf749ce61cb6782 gnulib
-0f7cc1d7ef5c34b146ff71207ada3ec87a24097c gui/qterminal
+0f7cc1d7ef5c34b146ff71207ada3ec87a24097c libgui/qterminal
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,7 @@
include m4/module.mk
if AMCOND_BUILD_GUI
-GUIDIR = gui
+GUIDIR = libgui
else
GUIDIR =
endif
--- a/configure.ac
+++ b/configure.ac
@@ -2396,11 +2396,11 @@
doc/liboctave/Makefile
doc/refcard/Makefile
examples/Makefile
- gui/Makefile
- gui/src/Makefile
libcruft/Makefile
libcruft/mkf77def
libgnu/Makefile
+ libgui/Makefile
+ libgui/src/Makefile
libinterp/Makefile
liboctave/Makefile
scripts/Makefile
--- a/doc/interpreter/Makefile.am
+++ b/doc/interpreter/Makefile.am
@@ -22,7 +22,7 @@
## Automake generated rules for documentation are not parallel-safe.
## Restrict current directory to run serially
-.NOTPARALLEL:
+## .NOTPARALLEL:
TEXINFO_TEX = ../texinfo.tex
@@ -159,16 +159,24 @@
contributors.texi \
$(MUNGED_TEXI_SRC)
-octave.info octave.dvi octave.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) $(srcdir)/images.mk
+octave.info octave.dvi octave.html/index.html octave.pdf: $(srcdir)/version.texi $(octave_TEXINFOS) $(EXAMPLE_FILES) $(srcdir)/images.mk
octave.info: $(IMAGES_TXT)
octave.dvi octave.ps: $(IMAGES_EPS) octave_logo.eps
-octave.html: $(IMAGES_PNG)
+octave.html/index.html: $(IMAGES_PNG)
+
+octave.html:
+ if [ -d octave.html ]; then true; else mkdir octave.html; fi
octave.pdf: $(IMAGES_PDF) octave_logo.pdf
+## The texi2dvi script (used to create both PDF and DVI output formats)
+## uses some fixed temporary file names, so wait for DVI file to be
+## generated before creating PDF file to avoid conflicts.
+octave.pdf: octave.dvi
+
all-local: dvi html pdf ps doc-cache $(HTMLDIR_IMAGES)
# Prevent packaging of distribution unless all libraries
--- a/doc/interpreter/images.awk
+++ b/doc/interpreter/images.awk
@@ -34,7 +34,7 @@
for (j = 2; j <= NF; j++) {
if (ext == "png") {
- printf ("octave.html/%s.png: %s.png octave.html/index.html\n", $j, $j);
+ printf ("octave.html/%s.png: %s.png octave.html\n", $j, $j);
printf ("\tcp $< $@\n");
}
printf ("%s.%s: %s\n", $j, ext, script);
rename from gui/Makefile.am
rename to libgui/Makefile.am
rename from gui/default-qt-settings
rename to libgui/default-qt-settings
rename from gui/gui.pro
rename to libgui/gui.pro
rename from gui/kb-layouts/default.keytab
rename to libgui/kb-layouts/default.keytab
rename from gui/kb-layouts/linux.keytab
rename to libgui/kb-layouts/linux.keytab
rename from gui/kb-layouts/vt420pc.keytab
rename to libgui/kb-layouts/vt420pc.keytab
rename from gui/languages/de-de.qm
rename to libgui/languages/de-de.qm
rename from gui/languages/de-de.ts
rename to libgui/languages/de-de.ts
rename from gui/languages/es-es.qm
rename to libgui/languages/es-es.qm
rename from gui/languages/es-es.ts
rename to libgui/languages/es-es.ts
rename from gui/languages/generic.qm
rename to libgui/languages/generic.qm
rename from gui/languages/generic.ts
rename to libgui/languages/generic.ts
rename from gui/languages/pt-br.qm
rename to libgui/languages/pt-br.qm
rename from gui/languages/pt-br.ts
rename to libgui/languages/pt-br.ts
rename from gui/languages/ru-ru.qm
rename to libgui/languages/ru-ru.qm
rename from gui/languages/ru-ru.ts
rename to libgui/languages/ru-ru.ts
rename from gui/languages/translators
rename to libgui/languages/translators
rename from gui/languages/uk-ua.qm
rename to libgui/languages/uk-ua.qm
rename from gui/languages/uk-ua.ts
rename to libgui/languages/uk-ua.ts
rename from gui/src/Makefile.am
rename to libgui/src/Makefile.am
rename from gui/src/documentation-dockwidget.cc
rename to libgui/src/documentation-dockwidget.cc
rename from gui/src/documentation-dockwidget.h
rename to libgui/src/documentation-dockwidget.h
rename from gui/src/files-dockwidget.cc
rename to libgui/src/files-dockwidget.cc
rename from gui/src/files-dockwidget.h
rename to libgui/src/files-dockwidget.h
rename from gui/src/history-dockwidget.cc
rename to libgui/src/history-dockwidget.cc
rename from gui/src/history-dockwidget.h
rename to libgui/src/history-dockwidget.h
rename from gui/src/icons/arrow_right.png
rename to libgui/src/icons/arrow_right.png
rename from gui/src/icons/artsbuilderexecute.png
rename to libgui/src/icons/artsbuilderexecute.png
rename from gui/src/icons/bookmark.png
rename to libgui/src/icons/bookmark.png
rename from gui/src/icons/bp_next.png
rename to libgui/src/icons/bp_next.png
rename from gui/src/icons/bp_prev.png
rename to libgui/src/icons/bp_prev.png
rename from gui/src/icons/bp_rm_all.png
rename to libgui/src/icons/bp_rm_all.png
rename from gui/src/icons/bp_toggle.png
rename to libgui/src/icons/bp_toggle.png
rename from gui/src/icons/chat.png
rename to libgui/src/icons/chat.png
rename from gui/src/icons/configure.png
rename to libgui/src/icons/configure.png
rename from gui/src/icons/db_cont.png
rename to libgui/src/icons/db_cont.png
rename from gui/src/icons/db_step.png
rename to libgui/src/icons/db_step.png
rename from gui/src/icons/db_step_in.png
rename to libgui/src/icons/db_step_in.png
rename from gui/src/icons/db_step_out.png
rename to libgui/src/icons/db_step_out.png
rename from gui/src/icons/db_stop.png
rename to libgui/src/icons/db_stop.png
rename from gui/src/icons/editcopy.png
rename to libgui/src/icons/editcopy.png
rename from gui/src/icons/editcut.png
rename to libgui/src/icons/editcut.png
rename from gui/src/icons/editpaste.png
rename to libgui/src/icons/editpaste.png
rename from gui/src/icons/filenew.png
rename to libgui/src/icons/filenew.png
rename from gui/src/icons/fileopen.png
rename to libgui/src/icons/fileopen.png
rename from gui/src/icons/filesave.png
rename to libgui/src/icons/filesave.png
rename from gui/src/icons/filesaveas.png
rename to libgui/src/icons/filesaveas.png
rename from gui/src/icons/find.png
rename to libgui/src/icons/find.png
rename from gui/src/icons/help_index.png
rename to libgui/src/icons/help_index.png
rename from gui/src/icons/icons_license
rename to libgui/src/icons/icons_license
rename from gui/src/icons/jabber_protocol.png
rename to libgui/src/icons/jabber_protocol.png
rename from gui/src/icons/logo.png
rename to libgui/src/icons/logo.png
rename from gui/src/icons/question.png
rename to libgui/src/icons/question.png
rename from gui/src/icons/redled.png
rename to libgui/src/icons/redled.png
rename from gui/src/icons/redo.png
rename to libgui/src/icons/redo.png
rename from gui/src/icons/search.png
rename to libgui/src/icons/search.png
rename from gui/src/icons/star.png
rename to libgui/src/icons/star.png
rename from gui/src/icons/stop.png
rename to libgui/src/icons/stop.png
rename from gui/src/icons/terminal.png
rename to libgui/src/icons/terminal.png
rename from gui/src/icons/undo.png
rename to libgui/src/icons/undo.png
rename from gui/src/icons/up.png
rename to libgui/src/icons/up.png
rename from gui/src/icons/zoom-in.png
rename to libgui/src/icons/zoom-in.png
rename from gui/src/icons/zoom-out.png
rename to libgui/src/icons/zoom-out.png
rename from gui/src/m-editor/file-editor-interface.h
rename to libgui/src/m-editor/file-editor-interface.h
rename from gui/src/m-editor/file-editor-tab.cc
rename to libgui/src/m-editor/file-editor-tab.cc
rename from gui/src/m-editor/file-editor-tab.h
rename to libgui/src/m-editor/file-editor-tab.h
rename from gui/src/m-editor/file-editor.cc
rename to libgui/src/m-editor/file-editor.cc
rename from gui/src/m-editor/file-editor.h
rename to libgui/src/m-editor/file-editor.h
rename from gui/src/m-editor/find-dialog.cc
rename to libgui/src/m-editor/find-dialog.cc
rename from gui/src/m-editor/find-dialog.h
rename to libgui/src/m-editor/find-dialog.h
rename from gui/src/m-editor/lexer-octave-gui.cc
rename to libgui/src/m-editor/lexer-octave-gui.cc
rename from gui/src/m-editor/lexer-octave-gui.h
rename to libgui/src/m-editor/lexer-octave-gui.h
rename from gui/src/main-window.cc
rename to libgui/src/main-window.cc
rename from gui/src/main-window.h
rename to libgui/src/main-window.h
rename from gui/src/msvc-debug.pri
rename to libgui/src/msvc-debug.pri
rename from gui/src/msvc.pri
rename to libgui/src/msvc.pri
rename from gui/src/octave-adapter/octave-event-listener.h
rename to libgui/src/octave-adapter/octave-event-listener.h
rename from gui/src/octave-adapter/octave-event-observer.h
rename to libgui/src/octave-adapter/octave-event-observer.h
rename from gui/src/octave-adapter/octave-event.cc
rename to libgui/src/octave-adapter/octave-event.cc
rename from gui/src/octave-adapter/octave-event.h
rename to libgui/src/octave-adapter/octave-event.h
rename from gui/src/octave-adapter/octave-link.cc
rename to libgui/src/octave-adapter/octave-link.cc
rename from gui/src/octave-adapter/octave-link.h
rename to libgui/src/octave-adapter/octave-link.h
rename from gui/src/octave-adapter/octave-main-thread.cc
rename to libgui/src/octave-adapter/octave-main-thread.cc
rename from gui/src/octave-adapter/octave-main-thread.h
rename to libgui/src/octave-adapter/octave-main-thread.h
rename from gui/src/octave-gui.cc
rename to libgui/src/octave-gui.cc
rename from gui/src/octave-gui.h
rename to libgui/src/octave-gui.h
rename from gui/src/octave-qt-event-listener.cc
rename to libgui/src/octave-qt-event-listener.cc
rename from gui/src/octave-qt-event-listener.h
rename to libgui/src/octave-qt-event-listener.h
rename from gui/src/qtinfo/parser.cc
rename to libgui/src/qtinfo/parser.cc
rename from gui/src/qtinfo/parser.h
rename to libgui/src/qtinfo/parser.h
rename from gui/src/qtinfo/webinfo.cc
rename to libgui/src/qtinfo/webinfo.cc
rename from gui/src/qtinfo/webinfo.h
rename to libgui/src/qtinfo/webinfo.h
rename from gui/src/resource-manager.cc
rename to libgui/src/resource-manager.cc
rename from gui/src/resource-manager.h
rename to libgui/src/resource-manager.h
rename from gui/src/resource.qrc
rename to libgui/src/resource.qrc
rename from gui/src/settings-dialog.cc
rename to libgui/src/settings-dialog.cc
rename from gui/src/settings-dialog.h
rename to libgui/src/settings-dialog.h
rename from gui/src/settings-dialog.ui
rename to libgui/src/settings-dialog.ui
rename from gui/src/src.pro
rename to libgui/src/src.pro
rename from gui/src/symbol-information.cc
rename to libgui/src/symbol-information.cc
rename from gui/src/symbol-information.h
rename to libgui/src/symbol-information.h
rename from gui/src/terminal-dockwidget.cc
rename to libgui/src/terminal-dockwidget.cc
rename from gui/src/terminal-dockwidget.h
rename to libgui/src/terminal-dockwidget.h
rename from gui/src/welcome-wizard.cc
rename to libgui/src/welcome-wizard.cc
rename from gui/src/welcome-wizard.h
rename to libgui/src/welcome-wizard.h
rename from gui/src/welcome-wizard.ui
rename to libgui/src/welcome-wizard.ui
rename from gui/src/workspace-model.cc
rename to libgui/src/workspace-model.cc
rename from gui/src/workspace-model.h
rename to libgui/src/workspace-model.h
rename from gui/src/workspace-view.cc
rename to libgui/src/workspace-view.cc
rename from gui/src/workspace-view.h
rename to libgui/src/workspace-view.h
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,8 +78,8 @@
if AMCOND_BUILD_GUI
octave_SOURCES = main.cc
- OCTAVE_GUI_LIBS = ../gui/src/liboctgui.la
- OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/gui/src
+ OCTAVE_GUI_LIBS = ../libgui/src/liboctgui.la
+ OCTAVE_GUI_CPPFLAGS = -I$(top_srcdir)/libgui/src
else
octave_SOURCES = main-cli.cc
OCTAVE_GUI_LIBS =
@@ -144,4 +144,4 @@
.PHONY: make-version-links remove-version-links
CLEANFILES = \
- $(bin_SCRIPTS) \
+ $(bin_SCRIPTS)
--- a/test/fntests.m
+++ b/test/fntests.m
@@ -41,7 +41,7 @@
testdirs = {currdir, srcdir};
endif
-src_tree = canonicalize_file_name (fullfile (topsrcdir, "src"));
+src_tree = canonicalize_file_name (fullfile (topsrcdir, "libinterp"));
liboctave_tree = canonicalize_file_name (fullfile (topsrcdir, "liboctave"));
script_tree = canonicalize_file_name (fullfile (topsrcdir, "scripts"));
local_script_tree = canonicalize_file_name (fullfile (currdir, "../scripts"));
