diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-02-05 15:23:07 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-02-05 15:26:05 -0600 |
| commit | a78d66bb383b170cd47a852d7ae22b13b1110f6f (patch) | |
| tree | 9455b7c3953f191b7ec4c890d0ab2d32216c3dc9 /docs | |
| parent | fbfb0fb9476fbe5957c5a3a82639f710ef08874c (diff) | |
| download | NetworkManager-a78d66bb383b170cd47a852d7ae22b13b1110f6f.tar.gz | |
build: fix distcheck when building settings specification XML
The generated settings-spec.xml should not be DIST-ed because it's
regenerated every time libnm-util changes. That meants it gets
rebuilt during 'make' even from a dist tarball. Thus, it shouldn't
be part of the dist tarball itself.
In addition, settings-spec.html shouldn't be included in
$(content_files) becuase this is added to EXTRA_DIST by gtk-doc.make.
Since generate-settings-spec.c the move from docs/api/ to tools/,
this started breaking distcheck even though the original Makefile
rules were wrong too.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index ea860d8fdc..d98dc786af 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -20,9 +20,10 @@ spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp mkdir -p $(builddir)/html/ cp $@ $(builddir)/html/ +# settings-spec.xml should *not* be DISTed because it must be regenerated +# whenever the libnm-util source changes settings-spec.xml: $(top_builddir)/tools/generate-settings-spec $(top_builddir)/libnm-util/libnm-util.la - rm -f $(builddir)/$@ - $(top_builddir)/tools/generate-settings-spec book $(builddir)/$@ + $(top_builddir)/tools/generate-settings-spec book $@ all: $(GENERATED_FILES) @@ -45,7 +46,6 @@ MKTMPL_OPTIONS= # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) content_files = \ version.xml \ - settings-spec.xml \ migrating-to-09.xml \ $(NULL) @@ -53,7 +53,7 @@ include $(top_srcdir)/gtk-doc.make #################################### -EXTRA_DIST += $(GENERATED_FILES) +EXTRA_DIST += spec.html CLEANFILES += $(GENERATED_FILES) else |