* demo/review/ui/mainwindow.ui: Move...
* demo/review/mainwindow.ui: ... here.
* demo/review/src/mainwindow.cc,
* demo/review/src/mainwindow.hh: Fix includes.
* demo/review/Makefile.am,
* demo/viewer/Makefile.am,
* demo/xml2doc/Makefile.am: Do not distribute generated files.
---
scribo/ChangeLog | 14 ++++++++++++++
scribo/demo/review/Makefile.am | 13 ++++++-------
scribo/demo/review/{ui => }/mainwindow.ui | 0
scribo/demo/review/src/mainwindow.cc | 2 +-
scribo/demo/review/src/mainwindow.hh | 5 +++--
scribo/demo/viewer/Makefile.am | 5 +++--
scribo/demo/xml2doc/Makefile.am | 18 ++++++++++--------
7 files changed, 37 insertions(+), 20 deletions(-)
rename scribo/demo/review/{ui => }/mainwindow.ui (100%)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 2e7ed8c..4423f0b 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,5 +1,19 @@
2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Do not distribute files generated by Qt.
+
+ * demo/review/ui/mainwindow.ui: Move...
+ * demo/review/mainwindow.ui: ... here.
+
+ * demo/review/src/mainwindow.cc,
+ * demo/review/src/mainwindow.hh: Fix includes.
+
+ * demo/review/Makefile.am,
+ * demo/viewer/Makefile.am,
+ * demo/xml2doc/Makefile.am: Do not distribute generated files.
+
+2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr>
+
* NEWS: Add content.
2011-01-13 Guillaume Lazzara <z(a)lrde.epita.fr>
diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am
index 30291ab..d451f88 100644
--- a/scribo/demo/review/Makefile.am
+++ b/scribo/demo/review/Makefile.am
@@ -20,18 +20,17 @@ include $(top_srcdir)/build-aux/autotroll.mk
bin_PROGRAMS = scribo-review
BUILT_SOURCES = src/mainwindow.moc.cc \
- ui/mainwindow.ui.h
+ mainwindow.ui.h
scribo_review_SOURCES = src/main.cc \
- src/mainwindow.cc \
- $(BUILT_SOURCES)
+ src/mainwindow.cc
+
+nodist_scribo_review_SOURCES = $(BUILT_SOURCES)
scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \
-DNDEBUG \
- -I$(srcdir) \
- -I$(builddir)/ui \
- -I$(srcdir)/ui
+ -I$(srcdir)
scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3
scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS)
scribo_review_LDADD = $(QT_LIBS) $(LDADD)
@@ -54,4 +53,4 @@ EXTRA_DIST = \
icons/view-refresh.png \
icons/x-office-spreadsheet.png\
review.qrc \
- ui/mainwindow.ui
+ mainwindow.ui
diff --git a/scribo/demo/review/ui/mainwindow.ui b/scribo/demo/review/mainwindow.ui
similarity index 100%
rename from scribo/demo/review/ui/mainwindow.ui
rename to scribo/demo/review/mainwindow.ui
diff --git a/scribo/demo/review/src/mainwindow.cc b/scribo/demo/review/src/mainwindow.cc
index 2f09ad7..0a4ee65 100644
--- a/scribo/demo/review/src/mainwindow.cc
+++ b/scribo/demo/review/src/mainwindow.cc
@@ -27,7 +27,7 @@
#include <QtCore>
#include <QtGui>
-#include <src/mainwindow.hh>
+#include "src/mainwindow.hh"
const char * modes[][4] = {
diff --git a/scribo/demo/review/src/mainwindow.hh b/scribo/demo/review/src/mainwindow.hh
index 5f92d5a..60257f8 100644
--- a/scribo/demo/review/src/mainwindow.hh
+++ b/scribo/demo/review/src/mainwindow.hh
@@ -1,4 +1,5 @@
-// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2009, 2011 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of Olena.
//
@@ -31,7 +32,7 @@
# include <QProcess>
# include <QtGui/QWidget>
# include <QProgressDialog>
-# include <mainwindow.ui.h>
+# include "mainwindow.ui.h"
namespace scribo
{
diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am
index e73caab..5033d9b 100644
--- a/scribo/demo/viewer/Makefile.am
+++ b/scribo/demo/viewer/Makefile.am
@@ -19,8 +19,7 @@ include $(top_srcdir)/build-aux/autotroll.mk
bin_PROGRAMS = scribo-viewer
-scribo_viewer_SOURCES = $(BUILT_SOURCES) \
- viewer.cc \
+scribo_viewer_SOURCES = viewer.cc \
main.cc \
image_widget.cc \
xml_widget.cc \
@@ -40,6 +39,8 @@ scribo_viewer_SOURCES = $(BUILT_SOURCES) \
option_widget.cc \
config.cc
+nodist_scribo_viewer_SOURCES = $(BUILT_SOURCES)
+
scribo_viewer_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) -I$(srcdir) \
-I$(top_srcdir)/milena \
-I$(top_srcdir)/scribo \
diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am
index 946b208..ca8c578 100644
--- a/scribo/demo/xml2doc/Makefile.am
+++ b/scribo/demo/xml2doc/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory
+# (LRDE).
#
# This file is part of Olena.
#
@@ -15,15 +16,16 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/build-aux/autotroll.mk
+include $(top_srcdir)/scribo/scribo.mk
+utilexec_PROGRAMS = scribo-xml2doc
+scribo_xml2doc_SOURCES = common.cc \
+ image_crop.cc \
+ loader.cc \
+ main.cc \
+ xml_transform.cc
-bin_PROGRAMS = scribo-xml2doc
-scribo_xml2doc_SOURCES = $(BUILT_SOURCES) \
- common.cc \
- image_crop.cc \
- loader.cc \
- main.cc \
- xml_transform.cc
+nodist_scribo_xml2doc_SOURCES = $(BUILT_SOURCES)
scribo_xml2doc_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \
$(MAGICKXX_CPPFLAGS) \
--
1.5.6.5