gtk-doc.make defines EXTRA_DIST for gtk-doc reference manuals. Including
the shared Makefile.decl in the same Makefile.am also initializes EXTRA_DIST, which causes duplicate definition warnings with newer Automake. Keep the global EXTRA_DIST initialization for ordinary Makefile.am files that append to it, but avoid including Makefile.decl in the gtk-doc reference Makefiles.
This commit is contained in:
parent
f49240f508
commit
0329bdbd7c
4 changed files with 4 additions and 4 deletions
|
|
@ -4,7 +4,7 @@ GTESTER = gtester # in $PATH for non-GLIB packages
|
|||
GTESTER_REPORT = gtester-report # in $PATH for non-GLIB packages
|
||||
|
||||
# initialize test variables for unconditional += appending
|
||||
#EXTRA_DIST = # already declared
|
||||
EXTRA_DIST =
|
||||
TEST_PROGS =
|
||||
|
||||
### testing rules
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
#include $(top_srcdir)/Makefile.decl
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.6
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
#include $(top_srcdir)/Makefile.decl
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.6
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
#include $(top_srcdir)/Makefile.decl
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.7
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue