Parcourir la source

Remove rrclass.h and rrtype.h from libdns_la_SOURCES. These two
files are generated. I noticed that these two files were placed
in the original source tree and also later in the build tree --
the rrclass.h was identical but the rrtype.h files were different.

For the tests look in the top_srcdir for includes also.
This should fix the problem I saw on FreeBSD when it was building
tests using a tarball from source and building in a different location
than the source:

In file included from ../../../../../src/lib/dns/tests/unittest_util.cc:29:
../../../../../src/lib/dns/tests/unittest_util.h:77: error: expected unqualified-id before '::' token


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1653 e5f2f494-b856-4b98-b285-d166d9295462

Jeremy C. Reed il y a 15 ans
Parent
commit
193067be0a
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 2 2
      src/lib/dns/Makefile.am
  2. 1 1
      src/lib/dns/tests/Makefile.am

+ 2 - 2
src/lib/dns/Makefile.am

@@ -69,12 +69,12 @@ libdns_la_SOURCES += message.h message.cc
 libdns_la_SOURCES += messagerenderer.h messagerenderer.cc
 libdns_la_SOURCES += name.h name.cc
 libdns_la_SOURCES += rdata.h rdata.cc
-libdns_la_SOURCES += rrclass.h rrclass.cc
+libdns_la_SOURCES += rrclass.cc
 libdns_la_SOURCES += rrparamregistry.h
 libdns_la_SOURCES += rrset.h rrset.cc
 libdns_la_SOURCES += rrsetlist.h rrsetlist.cc
 libdns_la_SOURCES += rrttl.h rrttl.cc
-libdns_la_SOURCES += rrtype.h rrtype.cc
+libdns_la_SOURCES += rrtype.cc
 libdns_la_SOURCES += question.h question.cc
 libdns_la_SOURCES += sha1.h sha1.cc
 libdns_la_SOURCES += tsig.h tsig.cc

+ 1 - 1
src/lib/dns/tests/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src/lib
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 
 CLEANFILES = *.gcno *.gcda