--- scribo/ChangeLog | 4 ++++ scribo/demo/review/Makefile.am | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8097faf..bc51033 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +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> * NEWS: First draft of Scribo NEWS file. diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index 323647f..bea214a 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -18,10 +18,17 @@ include $(top_srcdir)/build-aux/autotroll.mk bin_PROGRAMS = scribo-review -scribo_review_SOURCES = $(BUILT_SOURCES) \ - src/main.cc \ + +scribo_review_SOURCES = src/main.cc \ src/mainwindow.cc +BUILT_SOURCES = src/mainwindow.moc.cc \ + ui/mainwindow.ui.h + +# Make sure generated files are not distributed. +nodist_scribo_review_SOURCES = $(BUILT_SOURCES) + + scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ -DNDEBUG \ -I$(srcdir) \ @@ -30,12 +37,11 @@ scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) scribo_review_LDADD = $(QT_LIBS) $(LDADD) -BUILT_SOURCES = src/mainwindow.moc.cc \ - ui/mainwindow.ui.h noinst_HEADERS = src/mainwindow.hh +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ review.qrc -- 1.5.6.5