* demo/review/Makefile.am, * demo/viewer/Makefile.am (EXTRA_DIST): Add new files. * demo/viewer/demodir.hh.in: New. --- scribo/ChangeLog | 9 ++++++ scribo/demo/review/Makefile.am | 19 ++++++++++--- scribo/demo/viewer/Makefile.am | 31 ++++++++++++++++++--- scribo/demo/viewer/{viewer.hxx => demodir.hh.in} | 15 ++++------ 4 files changed, 56 insertions(+), 18 deletions(-) copy scribo/demo/viewer/{viewer.hxx => demodir.hh.in} (85%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc51033..9185148 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-01-03 Guillaume Lazzara <z@lrde.epita.fr> + Add new files in EXTRA_DIST. + + * demo/review/Makefile.am, + * demo/viewer/Makefile.am (EXTRA_DIST): Add new files. + + * demo/viewer/demodir.hh.in: New. + +2011-01-03 Guillaume Lazzara <z@lrde.epita.fr> + * demo/review/Makefile.am: Do not distribute generated files. 2010-12-14 Guillaume Lazzara <z@lrde.epita.fr> diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index bea214a..0aafc90 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -43,5 +43,16 @@ noinst_HEADERS = src/mainwindow.hh CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = \ - review.qrc +EXTRA_DIST = \ + icons/document-open.png \ + icons/edit-find.png \ + icons/format-indent-more.png \ + icons/go-next.png \ + icons/image-x-generic.png \ + icons/list-add.png \ + icons/ocr.png \ + icons/text-x-generic.png \ + icons/view-refresh.png \ + icons/x-office-spreadsheet.png\ + review.qrc \ + ui/mainwindow.ui diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index 2e0afec..d5fffbf 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -70,7 +70,8 @@ BUILT_SOURCES = viewer.moc.cc \ preferences_dialog.moc.cc \ preferences_dialog.ui.h \ general_options.moc.cc \ - general_options.ui.h + general_options.ui.h \ + demodir.hh noinst_HEADERS = viewer.hh \ @@ -95,6 +96,26 @@ noinst_HEADERS = viewer.hh \ option_widget.hh \ config.hh -EXTRA_DIST = README -CLEANFILES = $(BUILT_SOURCES) \ No newline at end of file +# Generated files +do_subst = sed \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' + +demodir.hh: $(srcdir)/demodir.hh.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(do_subst) $${srcdir}$@.in >$@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = $(BUILT_SOURCES) + +EXTRA_DIST = \ + general_options.ui \ + preferences_dialog.ui \ + README \ + toolchain_options.ui \ + demodir.hh.in + diff --git a/scribo/demo/viewer/viewer.hxx b/scribo/demo/viewer/demodir.hh.in similarity index 85% copy from scribo/demo/viewer/viewer.hxx copy to scribo/demo/viewer/demodir.hh.in index cba59f3..59149b9 100644 --- a/scribo/demo/viewer/viewer.hxx +++ b/scribo/demo/viewer/demodir.hh.in @@ -23,16 +23,13 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef VIEWER_HXX_ -# define VIEWER_HXX_ +#ifndef SCRIBO_DEMO_DEMODIR_HH +# define SCRIBO_DEMO_DEMODIR_HH -# include "viewer.hh" -inline Viewer* Viewer::Instance(int &argc, char** argv) -{ - static Viewer viewer(argc, argv); +# define SCRIBO_PREFIX_BINDIR "@bindir@" - return &viewer; -} +# define SCRIBO_LOCAL_DEMODIR "@abs_srcdir@" -#endif /* !VIEWER_HXX_ */ + +#endif // !SCRIBO_DEMO_DEMODIR_HH -- 1.5.6.5