* demo/review/Makefile.am: Make use of autotroll. * demo/review/src/mainwindow.cc: Remove useless includes. * demo/review/src/mainwindow.hh: Update include. * demo/review/review.pro: Remove since useless. --- scribo/ChangeLog | 12 +++++++++ scribo/demo/review/Makefile.am | 45 ++++++++++++++++++++++++++++----- scribo/demo/review/review.pro | 16 ------------ scribo/demo/review/src/mainwindow.cc | 7 +---- scribo/demo/review/src/mainwindow.hh | 2 +- 5 files changed, 53 insertions(+), 29 deletions(-) delete mode 100644 scribo/demo/review/review.pro diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 119f9f0..9379bf0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2010-08-26 Guillaume Lazzara <z@lrde.epita.fr> + Make use of autotroll in demo/review. + + * demo/review/Makefile.am: Make use of autotroll. + + * demo/review/src/mainwindow.cc: Remove useless includes. + + * demo/review/src/mainwindow.hh: Update include. + + * demo/review/review.pro: Remove since useless. + +2010-08-26 Guillaume Lazzara <z@lrde.epita.fr> + Install Scribo headers in include/scribo. * Makefile.am: Update call to generate_dist_headers.sh. diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index b51084e..cd793db 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -1,11 +1,42 @@ -## Process this file through Automake to create Makefile.in. +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). +# +# This file is part of Olena. +# +# Olena 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, version 2 of the License. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. -include $(top_srcdir)/scribo/scribo.mk +include $(top_srcdir)/build-aux/autotroll.mk -.PHONY : demo +bin_PROGRAMS = scribo-review +scribo_review_SOURCES = $(BUILT_SOURCES) \ + src/main.cc \ + src/mainwindow.cc -Makefile.demo: - qmake-qt4 $(srcdir)/demo/demo.pro -o Makefile.demo +scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ + -DNDEBUG \ + -I$(srcdir) \ + -I$(builddir)/ui +scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 +scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) +scribo_review_LDADD = $(QT_LIBS) $(LDADD) -demo: Makefile.demo - make -f Makefile.demo all +BUILT_SOURCES = src/mainwindow.moc.cc \ + ui/mainwindow.ui.h + +noinst_HEADERS = src/mainwindow.hh + + + +EXTRA_DIST = \ + README \ + review.qrc diff --git a/scribo/demo/review/review.pro b/scribo/demo/review/review.pro deleted file mode 100644 index 3ee66e9..0000000 --- a/scribo/demo/review/review.pro +++ /dev/null @@ -1,16 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Mon Jun 1 10:28:31 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . src ui -INCLUDEPATH += . src ../../../ ../../../milena -DEFINES += NDEBUG - -# Input -HEADERS += src/mainwindow.hh -FORMS += ui/mainwindow.ui -SOURCES += src/main.cc src/mainwindow.cc - -RESOURCES = review.qrc diff --git a/scribo/demo/review/src/mainwindow.cc b/scribo/demo/review/src/mainwindow.cc index f2d10a2..2f09ad7 100644 --- a/scribo/demo/review/src/mainwindow.cc +++ b/scribo/demo/review/src/mainwindow.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -26,10 +27,6 @@ #include <QtCore> #include <QtGui> -#include <mln/core/image/image2d.hh> -#include <mln/logical/not.hh> -#include <mln/io/pbm/all.hh> - #include <src/mainwindow.hh> diff --git a/scribo/demo/review/src/mainwindow.hh b/scribo/demo/review/src/mainwindow.hh index cb32e30..5f92d5a 100644 --- a/scribo/demo/review/src/mainwindow.hh +++ b/scribo/demo/review/src/mainwindow.hh @@ -31,7 +31,7 @@ # include <QProcess> # include <QtGui/QWidget> # include <QProgressDialog> -# include <ui_mainwindow.h> +# include <mainwindow.ui.h> namespace scribo { -- 1.5.6.5