Browse Source

[master] add missing rdata files and change some generated headers to nodist

Add missing libdns++ rdata files for the distribution (this
fixes distcheck error). Change three generated libdns++
headers to "nodist" so they aren't included in the distribution
(they were mistakenly included in last tarball).

This fixes two immediate problems:

If you do a distcheck build or create a tarball it would mistakenly
include the rdataclass.h, rrclass.h, and rrtype.h headers.
They are supposed to be generated at build time.

Also the rp_17 rdata files were not included in the distribution,
so building would fail because rdataclass didn't define the RP class.

This update also includes the nsec_bitmap rdata files. (I didn't
see any problem related to this, but I assume they were meant to
be shipped.)

I added two generated files to BUILT_SOURCES. Not necessarily
required, but this implies that the target for these should be
done before the regular build (so this makes sure the generated
files are created).

Discussed a little on jabber on Friday.

This should fix the existing distcheck autobuilder failures.
Jeremy C. Reed 14 years ago
parent
commit
9e183cb052
2 changed files with 13 additions and 6 deletions
  1. 6 0
      ChangeLog
  2. 7 6
      src/lib/dns/Makefile.am

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+227.	[build]		jreed
+	Add missing libdns++ rdata files for the distribution (this
+	fixes distcheck error). Change three generated libdns++
+	headers to "nodist" so they aren't included in the distribution
+	(they were mistakenly included in last tarball).
+
 226.	[func]*		jelte
 	Introduced an API for cryptographic operations. Currently it only
 	supports HMAC, intended for use with TSIG. The current

+ 7 - 6
src/lib/dns/Makefile.am

@@ -21,6 +21,8 @@ EXTRA_DIST += rdata/ch_3/a_1.cc
 EXTRA_DIST += rdata/ch_3/a_1.h
 EXTRA_DIST += rdata/generic/cname_5.cc
 EXTRA_DIST += rdata/generic/cname_5.h
+EXTRA_DIST += rdata/generic/detail/nsec_bitmap.cc
+EXTRA_DIST += rdata/generic/detail/nsec_bitmap.h
 EXTRA_DIST += rdata/generic/dname_39.cc
 EXTRA_DIST += rdata/generic/dname_39.h
 EXTRA_DIST += rdata/generic/dnskey_48.cc
@@ -41,6 +43,8 @@ EXTRA_DIST += rdata/generic/opt_41.cc
 EXTRA_DIST += rdata/generic/opt_41.h
 EXTRA_DIST += rdata/generic/ptr_12.cc
 EXTRA_DIST += rdata/generic/ptr_12.h
+EXTRA_DIST += rdata/generic/rp_17.cc
+EXTRA_DIST += rdata/generic/rp_17.h
 EXTRA_DIST += rdata/generic/rrsig_46.cc
 EXTRA_DIST += rdata/generic/rrsig_46.h
 EXTRA_DIST += rdata/generic/soa_6.cc
@@ -58,7 +62,7 @@ EXTRA_DIST += rdata/in_1/aaaa_28.h
 
 # auto-generate by gen-rdatacode.py:
 BUILT_SOURCES = rrclass.h rrtype.h rrparamregistry.cc
-#TODO: check this###BUILT_SOURCES = rdataclass.h rdataclass.cc
+BUILT_SOURCES += rdataclass.h rdataclass.cc
 
 lib_LTLIBRARIES = libdns++.la
 
@@ -93,8 +97,8 @@ libdns___la_CPPFLAGS = $(AM_CPPFLAGS)
 libdns___la_LIBADD = $(top_builddir)/src/lib/cryptolink/libcryptolink.la
 libdns___la_LIBADD += $(top_builddir)/src/lib/util/libutil.la
 
-nodist_libdns___la_SOURCES = rdataclass.cc rrclass.h rrtype.h
-nodist_libdns___la_SOURCES += rrparamregistry.cc
+nodist_libdns___include_HEADERS = rdataclass.h rrclass.h rrtype.h
+nodist_libdns___la_SOURCES = rdataclass.cc rrparamregistry.cc
 
 rrclass.h: rrclass-placeholder.h
 rrtype.h: rrtype-placeholder.h
@@ -112,13 +116,10 @@ libdns___include_HEADERS = \
 	question.h \
 	rcode.h \
 	rdata.h \
-	rdataclass.h \
-	rrclass.h \
 	rrparamregistry.h \
 	rrset.h \
 	rrsetlist.h \
 	rrttl.h \
-	rrtype.h \
 	tsigkey.h
 # Purposely not installing these headers:
 # util/*.h: used only internally, and not actually DNS specific