Mercurial > octave
changeset 15206:38d8306e7df1
* libgui/Makefile.am, libgui/src/Makefile.am: Style fixes.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 20 Aug 2012 14:09:47 -0400 |
| parents | e2c6c914667b |
| children | 2f2fb099ac3a |
| files | libgui/Makefile.am libgui/src/Makefile.am |
| diffstat | 2 files changed, 78 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/Makefile.am Mon Aug 20 14:04:45 2012 -0400 +++ b/libgui/Makefile.am Mon Aug 20 14:09:47 2012 -0400 @@ -1,3 +1,21 @@ +# Copyright (C) 2012 John W. Eaton +# +# This file is part of Octave. +# +# Octave is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# Octave is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with Octave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. + SUBDIRS = src octetc_DATA = default-qt-settings
--- a/libgui/src/Makefile.am Mon Aug 20 14:04:45 2012 -0400 +++ b/libgui/src/Makefile.am Mon Aug 20 14:09:47 2012 -0400 @@ -1,3 +1,21 @@ +# Copyright (C) 2012 John W. Eaton +# +# This file is part of Octave. +# +# Octave is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# Octave is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with Octave; see the file COPYING. If not, see +# <http://www.gnu.org/licenses/>. + include $(top_srcdir)/build-aux/common.mk SRCDIRS = \ @@ -9,16 +27,6 @@ ../qterminal/libqterminal \ ../qterminal -moc-%.cc: %.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-%.cc: %.qrc - @RCC@ -o $@ $< - octave_gui_MOC = \ m-editor/moc-file-editor-interface.cc \ m-editor/moc-file-editor-tab.cc \ @@ -138,7 +146,7 @@ clean-local: -if test "$(srcdir)" != "."; then \ - for d in $(SRCDIRS); do test -d $$d && rmdir $$d; done \ + for d in $(SRCDIRS); do test -d $$d && rmdir $$d; done \ fi BUILT_SOURCES = $(octave_gui_UI_H) @@ -189,36 +197,38 @@ 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 +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_CPPFLAGS = \ + $(DEFS) \ + -I@QT_INCDIR@ \ + -I@QT_INCDIR@/QtCore \ + -I@QT_INCDIR@/QtGui \ + -I$(srcdir)/../qterminal/libqterminal libqterminal_la_MOC = \ ../qterminal/libqterminal/moc-QTerminal.cc \ @@ -265,4 +275,14 @@ endif +moc-%.cc: %.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-%.cc: %.qrc + @RCC@ -o $@ $< + CLEANFILES += $(libqterminal_la_MOC)