--- scribo/ChangeLog | 4 ++++ scribo/demo/review/Makefile.am | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d163b69..766291a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-01-04 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/review/Makefile.am: Add srcdir as include path. + +2011-01-04 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce "export as" functionality. * demo/viewer/Makefile.am, diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index 0aafc90..30291ab 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -19,20 +19,19 @@ include $(top_srcdir)/build-aux/autotroll.mk bin_PROGRAMS = scribo-review -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_SOURCES = src/main.cc \ + src/mainwindow.cc \ + $(BUILT_SOURCES) scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ -DNDEBUG \ -I$(srcdir) \ - -I$(builddir)/ui + -I$(builddir)/ui \ + -I$(srcdir)/ui scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) scribo_review_LDADD = $(QT_LIBS) $(LDADD) -- 1.5.6.5