view gui/src/Makefile.am @ 15139:bfc220d1de67 gui

include gui in default Octave binary * Makefile.am (GUIDIR): New variable. (SUBDIRS): Use it in the list instead of @GUIDIR@. List $(GUIDIR) before src. * gui/src/Makefile.am (bin_PROGRAMS): Delete. (octlib_LTLIBRARIES): New variable. (liboctgui_la_SOURCES): Rename from octave_gui_SOURCES. (liboctgui_la_CPPFLAGS): Rename from octave_gui_CPPFLAGS. (liboctgui_la_LIBADD): Rename from octave_gui_LDADD. Don't include Octave libraries in the list. Do include Qt libraries in the list. (liboctgui_la_LDFLAGS): Rename from octave_gui_LDFLAGS. Only include -L@QT_LIBDIR@ option in the list. (moc_%.cpp): Use $(liboctgui_la_CPPFLAGS) in rules, not $(octave_gui_CPPFLAGS). * octave-gui.h: New file. * octave-gui.cc: Include it. (dissociate_terminal): In parent, wait for child process and exit with exit status of child. (octave_start_gui): Rename from main. * run-octave.in: Start with GUI by default. Rename -gui option -cli to allow running octave-cli binary. * main.cc, main-cli.cc: New files. * main.c: Delete. * src/Makefile (bin_PROGRAMS): Include octave-cli in the list. (OCTAVE_CORE_LIBS): New variable. (octave_cli_SOURCES, octave_cli_LDADD, octave_cli_LDFLAGS): New variables. (octave_SOURCES): Define to main.cc, not main.c. (octave_CPPFLAGS): New variable. (octave_LDFLAGS): Include -DENABLE_GUI=1 in the list. (octave_LDADD): Use $(OCTAVE_CORE_LIBS) and link with GUI lib. * octave.cc (force_gui_option, no_gui_option): New static variables. (octave_starting_gui): New function. (usage_string): Update for new options. (FORCE_GUI_OPTION, NO_GUI_OPTION): New macros. (long_opts): Include "force-gui" and "no-gui" options in the list. (octave_main): Handle FORCE_GUI_OPTION and NO_GUI_OPTION cases. Error if both --force-gui and --no-gui are used. * octave.h (octave_starting_gui): Provide decl.
author John W. Eaton <jwe@octave.org>
date Fri, 10 Aug 2012 10:27:32 -0400
parents 3735a0e783cb
children 9e62d5a3a45e
line wrap: on
line source

SRCDIRS = m-editor qtinfo octave-adapter \
	  ../qterminal/libqterminal/unix ../qterminal/libqterminal/win32 ../qterminal/libqterminal ../qterminal

moc_%.cpp: %.h
	test -d $(@D) || mkdir -p $(@D)
	@MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liboctgui_la_CPPFLAGS) $<

ui_%.h: %.ui
	@UIC@ -o $@ $<

qrc_%.cpp: %.qrc
	@RCC@ -o $@ $<

octave_gui_MOC = \
		 moc_documentation-dockwidget.cpp \
		 moc_files-dockwidget.cpp \
		 moc_history-dockwidget.cpp \
		 moc_main-window.cpp \
		 moc_octave-qt-event-listener.cpp \
		 moc_settings-dialog.cpp \
		 moc_terminal-dockwidget.cpp \
		 moc_welcome-wizard.cpp \
		 moc_workspace-model.cpp \
		 moc_workspace-view.cpp \
		 m-editor/moc_file-editor.cpp \
		 m-editor/moc_file-editor-interface.cpp \
		 m-editor/moc_file-editor-tab.cpp \
		 m-editor/moc_find-dialog.cpp \
		 m-editor/moc_lexer-octave-gui.cpp \
		 octave-adapter/moc_octave-main-thread.cpp \
		 qtinfo/moc_parser.cpp \
		 qtinfo/moc_webinfo.cpp
octave_gui_UI = \
		settings-dialog.ui \
		welcome-wizard.ui
octave_gui_UI_H = $(patsubst %.ui,ui_%.h,$(octave_gui_UI))

octave_gui_RC = qrc_resource.cpp

octlib_LTLIBRARIES = liboctgui.la

liboctgui_la_SOURCES = \
		     documentation-dockwidget.cc \
		     files-dockwidget.cc \
		     history-dockwidget.cc \
		     main-window.cc \
		     octave-gui.cc \
		     octave-qt-event-listener.cc \
		     resource-manager.cc \
		     settings-dialog.cc \
		     terminal-dockwidget.cc \
		     welcome-wizard.cc \
		     workspace-model.cc \
		     workspace-view.cc \
		     m-editor/file-editor.cc \
		     m-editor/file-editor-tab.cc \
		     m-editor/find-dialog.cc \
		     m-editor/lexer-octave-gui.cc \
		     octave-adapter/octave-link.cc \
		     octave-adapter/octave-main-thread.cc \
		     qtinfo/parser.cc \
		     qtinfo/webinfo.cc

liboctgui_la_LIBADD = \
  libqterminal.la \
  -lQtCore \
  -lQtGui \
  -lQtNetwork \
  -lqscintilla2

nodist_liboctgui_la_SOURCES = $(octave_gui_MOC) $(octave_gui_RC)

liboctgui_la_CPPFLAGS = \
  -I@QT_INCDIR@ \
  -I@QT_INCDIR@/QtCore \
  -I@QT_INCDIR@/QtGui \
  -I@QT_INCDIR@/QtNetwork \
  -I$(srcdir)/../qterminal/libqterminal \
  -I$(srcdir)/m-editor \
  -I$(srcdir)/octave-adapter \
  -I$(srcdir)/qtinfo \
  -I$(srcdir)/../../libcruft/misc \
  -I../../liboctave \
  -I$(srcdir)/../../liboctave \
  -I../../src/interp-core \
  -I$(srcdir)/../../src \
  -I$(srcdir)/../../src/interp-core \
  -I$(srcdir)/../../src/interpfcn \
  -I$(srcdir)/../../src/octave-value \
  -I$(srcdir)/../../src/operators \
  -I$(srcdir)/../../src/parse-tree

liboctgui_la_LDFLAGS = -L@QT_LIBDIR@

noinst_HEADERS = \
		 documentation-dockwidget.h \
		 files-dockwidget.h \
		 history-dockwidget.h \
		 main-window.h \
		 octave-qt-event-listener.h \
		 resource-manager.h \
		 settings-dialog.h \
		 symbol-information.h \
		 terminal-dockwidget.h \
		 welcome-wizard.h \
		 workspace-model.h \
		 workspace-view.h \
		 m-editor/file-editor.h \
		 m-editor/file-editor-interface.h \
		 m-editor/file-editor-tab.h \
		 m-editor/find-dialog.h \
		 m-editor/lexer-octave-gui.h \
		 octave-adapter/octave-event.h \
		 octave-adapter/octave-event-observer.h \
		 octave-adapter/octave-event-listener.h \
		 octave-adapter/octave-link.h \
		 octave-adapter/octave-main-thread.h \
		 qtinfo/parser.h \
		 qtinfo/webinfo.h

CLEANFILES = $(octave_gui_MOC) $(octave_gui_UI_H) $(octave_gui_RC)

clean-local:
	-if test "$(srcdir)" != "."; then \
		for d in $(SRCDIRS); do test -d $$d && rmdir $$d; done \
	 fi

BUILT_SOURCES = $(octave_gui_UI_H)

EXTRA_DIST = $(octave_gui_UI) resource.qrc

noinst_LTLIBRARIES = libqterminal.la

noinst_HEADERS += ../qterminal/libqterminal/QTerminal.h \
		  ../qterminal/libqterminal/QTerminalInterface.h \
		  ../qterminal/libqterminal/win32/QTerminalColors.h \
		  ../qterminal/libqterminal/win32/QWinTerminalImpl.h \
		  ../qterminal/libqterminal/unix/BlockArray.h \
		  ../qterminal/libqterminal/unix/Character.h \
		  ../qterminal/libqterminal/unix/CharacterColor.h \
		  ../qterminal/libqterminal/unix/Emulation.h \
		  ../qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \
		  ../qterminal/libqterminal/unix/Filter.h \
		  ../qterminal/libqterminal/unix/History.h \
		  ../qterminal/libqterminal/unix/KeyboardTranslator.h \
		  ../qterminal/libqterminal/unix/konsole_wcwidth.h \
		  ../qterminal/libqterminal/unix/kpty.h \
		  ../qterminal/libqterminal/unix/kpty_p.h \
		  ../qterminal/libqterminal/unix/LineFont.h \
		  ../qterminal/libqterminal/unix/QUnixTerminalImpl.h \
		  ../qterminal/libqterminal/unix/Screen.h \
		  ../qterminal/libqterminal/unix/ScreenWindow.h \
		  ../qterminal/libqterminal/unix/TerminalCharacterDecoder.h \
		  ../qterminal/libqterminal/unix/Vt102Emulation.h \
		  ../qterminal/libqterminal/unix/SelfListener.h \
		  ../qterminal/libqterminal/unix/TerminalModel.h \
		  ../qterminal/libqterminal/unix/TerminalView.h

libqterminal_la_CPPFLAGS = $(DEFS)  \
			   -I@QT_INCDIR@ \
			   -I@QT_INCDIR@/QtCore \
			   -I@QT_INCDIR@/QtGui \
			   -I$(srcdir)/../qterminal/libqterminal

libqterminal_la_MOC = \
		      ../qterminal/libqterminal/moc_QTerminal.cpp \
		      ../qterminal/libqterminal/moc_QTerminalInterface.cpp

nodist_libqterminal_la_SOURCES = $(libqterminal_la_MOC)

if WIN32_TERMINAL
libqterminal_la_SOURCES = \
			  ../qterminal/libqterminal/win32/QTerminalColors.cpp \
			  ../qterminal/libqterminal/win32/QWinTerminalImpl.cpp
libqterminal_la_MOC += ../qterminal/libqterminal/win32/moc_QWinTerminalImpl.cpp
else
libqterminal_la_SOURCES = \
			  ../qterminal/libqterminal/unix/BlockArray.cpp \
			  ../qterminal/libqterminal/unix/Emulation.cpp \
			  ../qterminal/libqterminal/unix/Filter.cpp \
			  ../qterminal/libqterminal/unix/History.cpp \
			  ../qterminal/libqterminal/unix/KeyboardTranslator.cpp \
			  ../qterminal/libqterminal/unix/konsole_wcwidth.cpp \
			  ../qterminal/libqterminal/unix/kpty.cpp \
			  ../qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \
			  ../qterminal/libqterminal/unix/Screen.cpp \
			  ../qterminal/libqterminal/unix/ScreenWindow.cpp \
			  ../qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \
			  ../qterminal/libqterminal/unix/Vt102Emulation.cpp \
			  ../qterminal/libqterminal/unix/SelfListener.cpp \
			  ../qterminal/libqterminal/unix/TerminalModel.cpp \
			  ../qterminal/libqterminal/unix/TerminalView.cpp
libqterminal_la_MOC += \
		       ../qterminal/libqterminal/unix/moc_Emulation.cpp \
		       ../qterminal/libqterminal/unix/moc_Filter.cpp \
		       ../qterminal/libqterminal/unix/moc_QUnixTerminalImpl.cpp \
		       ../qterminal/libqterminal/unix/moc_ScreenWindow.cpp \
		       ../qterminal/libqterminal/unix/moc_SelfListener.cpp \
		       ../qterminal/libqterminal/unix/moc_TerminalModel.cpp \
		       ../qterminal/libqterminal/unix/moc_TerminalView.cpp \
		       ../qterminal/libqterminal/unix/moc_Vt102Emulation.cpp
endif

CLEANFILES += $(libqterminal_la_MOC)