colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix distcheck when building settings specification XML

Browse Source 
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.
This commit is contained in:
Dan Williams
2013-02-05 15:23:07 -06:00
parent fbfb0fb947
commit a78d66bb38
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/api/Makefile.am
View File

@@ -20,9 +20,10 @@ spec.html: $(XMLS) $(OTHER_FILES) html-build.stamp
mkdir -p $(builddir)/html/ mkdir -p $(builddir)/html/
cp $@ $(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 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 $@
$(top_builddir)/tools/generate-settings-spec book $(builddir)/$@
all: $(GENERATED_FILES) all: $(GENERATED_FILES)
@@ -45,7 +46,6 @@ MKTMPL_OPTIONS=
# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE) # Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
content_files = \ content_files = \
version.xml \ version.xml \
settings-spec.xml \
migrating-to-09.xml \ migrating-to-09.xml \
$(NULL) $(NULL)
@@ -53,7 +53,7 @@ include $(top_srcdir)/gtk-doc.make
#################################### ####################################
EXTRA_DIST += $(GENERATED_FILES) EXTRA_DIST += spec.html
CLEANFILES += $(GENERATED_FILES) CLEANFILES += $(GENERATED_FILES)
else else