* scribo.mk, * tests/tests.mk: Here, as Automake 1.11+ already takes care of this. --- scribo/ChangeLog | 8 ++++++++ scribo/scribo.mk | 3 +-- scribo/tests/tests.mk | 16 ---------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4b9d587..96def1c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2013-09-10 Roland Levillain <roland(a)lrde.epita.fr> + + Scribo: Remove lines `VARIABLE = @VARIABLE@' from Makefile.am's. + + * scribo.mk, + * tests/tests.mk: + Here, as Automake 1.11+ already takes care of this. + 2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> Scribo: Do not look for headers in the build tree uselessly. diff --git a/scribo/scribo.mk b/scribo/scribo.mk index 0d97440..4151f6e 100644 --- a/scribo/scribo.mk +++ b/scribo/scribo.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -17,7 +17,6 @@ include $(top_srcdir)/scribo/common.mk -SCRIBO_CXXFLAGS = @SCRIBO_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_CXXFLAGS) utilexecdir = $(libexecdir)/scribo diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index 422601d..2e876a6 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -21,23 +21,7 @@ include $(top_srcdir)/scribo/common.mk -SCRIBO_TESTS_CXXFLAGS = @SCRIBO_TESTS_CXXFLAGS@ AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) -# Flags for optional dependencies. - -MAGICKXX_CPPFLAGS = @MAGICKXX_CPPFLAGS@ -MAGICKXX_LDFLAGS = @MAGICKXX_LDFLAGS@ - -TIFF_CPPFLAGS = @TIFF_CPPFLAGS@ -TIFF_LDFLAGS = @TIFF_LDFLAGS@ - -QT_CPPFLAGS = @QT_CPPFLAGS@ -QT_LDFLAGS = @QT_LDFLAGS@ @QT_LIBS@ - -TESSERACT_CPPFLAGS = @TESSERACT_CPPFLAGS@ -TESSERACT_LDFLAGS = @TESSERACT_LDFLAGS@ - - # Inject rules to compile tests (recursively), without running them. include $(top_srcdir)/build-aux/tests-recursive.mk -- 1.7.10.4