- use <builddir>/include (the one with the symlinks) for all includes

  so that we do not have to add /cpp/ to every #include line
- removed /cpp/ from every include line


git-svn-id: svn://bind10.isc.org/svn/bind10/branches/parkinglot@700 e5f2f494-b856-4b98-b285-d166d9295462

Makefile.am

@@ -39,6 +39,7 @@ pyshared:
 
 include:
 	mkdir include
+	ln -s ${abs_top_srcdir}/src/lib/auth/cpp include/auth
 	ln -s ${abs_top_srcdir}/src/lib/cc/cpp include/cc
 	ln -s ${abs_top_srcdir}/src/lib/config/cpp include/config
 	ln -s ${abs_top_srcdir}/src/lib/dns/cpp include/dns

src/bin/auth/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_srcdir)/src/lib/dns/cpp -I$(top_srcdir)/src/lib -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
 
 bin_PROGRAMS = b10-auth
 b10_auth_SOURCES = auth_srv.cc auth_srv.h

src/bin/auth/auth_srv.cc

@@ -25,15 +25,15 @@
 #include <set>
 #include <iostream>
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/messagerenderer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/question.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/rrttl.h>
-#include <dns/cpp/message.h>
-
-#include <cc/cpp/data.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rrset.h>
+#include <dns/rrttl.h>
+#include <dns/message.h>
+
+#include <cc/data.h>
 
 #include "common.h"
 #include "auth_srv.h"

src/bin/auth/auth_srv.h

@@ -17,8 +17,8 @@
 #ifndef __AUTH_SRV_H
 #define __AUTH_SRV_H 1
 
-#include <cc/cpp/data.h>
-#include <auth/cpp/data_source_static.h>
+#include <cc/data.h>
+#include <auth/data_source_static.h>
 
 class AuthSrv {
 public:

src/bin/auth/main.cc

@@ -25,14 +25,14 @@
 
 #include <boost/foreach.hpp>
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
-
-#include <cc/cpp/session.h>
-#include <cc/cpp/data.h>
-#include <config/cpp/ccsession.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
+
+#include <cc/session.h>
+#include <cc/data.h>
+#include <config/ccsession.h>
 
 #include "common.h"
 #include "config.h"

src/bin/host/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS =  -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_srcdir)/src/lib/dns/cpp -I$(top_srcdir)/src/lib -I$(top_srcdir)/ext
+AM_CPPFLAGS =  -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
 
 bin_PROGRAMS = host
 host_SOURCES = host.cc

src/bin/parkinglot/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_srcdir)/src/lib/dns/cpp -I$(top_srcdir)/src/lib -I$(top_srcdir)/ext
+AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_builddir)/src/lib/dns/cpp -I$(top_builddir)/include/dns/cpp -I$(top_builddir)/include -I$(top_srcdir)/ext
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 

src/bin/parkinglot/b10-parkinglot.cc

@@ -25,16 +25,16 @@
 #include <set>
 #include <iostream>
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/messagerenderer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/question.h>
-#include <dns/cpp/rdataclass.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/rrttl.h>
-#include <dns/cpp/message.h>
-
-#include <cc/cpp/data.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/question.h>
+#include <dns/rdataclass.h>
+#include <dns/rrset.h>
+#include <dns/rrttl.h>
+#include <dns/message.h>
+
+#include <cc/data.h>
 
 #include "common.h"
 #include "builtin.h"

src/bin/parkinglot/b10-parkinglot.h

@@ -18,7 +18,7 @@
 #define __PARKINGLOT_H 1
 
 #include "zoneset.h"
-#include <cc/cpp/data.h>
+#include <cc/data.h>
 #include "data_source_plot.h"
 
 class ParkingLot {

src/bin/parkinglot/builtin.cc

@@ -17,14 +17,14 @@
 #include <string>
 #include <vector>
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/messagerenderer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rdata.h>
-#include <dns/cpp/rrclass.h>
-#include <dns/cpp/rrtype.h>
-#include <dns/cpp/rrttl.h>
-#include <dns/cpp/rrset.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 #include "builtin.h"
 

src/bin/parkinglot/builtin.h

@@ -19,8 +19,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
 
 struct BuiltinRRsetsImpl;
 

src/bin/parkinglot/builtin_bench.cc

@@ -21,15 +21,15 @@
 #include <sstream>
 #include <vector>
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/messagerenderer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rdata.h>
-#include <dns/cpp/rdataclass.h>
-#include <dns/cpp/rrclass.h>
-#include <dns/cpp/rrtype.h>
-#include <dns/cpp/rrttl.h>
-#include <dns/cpp/rrset.h>
+#include <dns/buffer.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rrset.h>
 
 #include "builtin.h"
 

src/bin/parkinglot/data_source.cc

@@ -1,9 +1,9 @@
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
 
-#include <cc/cpp/data.h>
+#include <cc/data.h>
 
 #include "data_source.h"
 

src/bin/parkinglot/data_source.h

@@ -17,8 +17,8 @@
 #ifndef __DATA_SOURCE_H
 #define __DATA_SOURCE_H
 
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
 
 namespace isc {
 namespace dns {

src/bin/parkinglot/data_source_plot.cc

@@ -1,8 +1,8 @@
 
 #include <boost/foreach.hpp>
 
-#include <dns/cpp/rdataclass.h>
-#include <dns/cpp/rrttl.h>
+#include <dns/rdataclass.h>
+#include <dns/rrttl.h>
 
 #include "data_source_plot.h"
 

src/bin/parkinglot/data_source_plot.h

@@ -18,15 +18,15 @@
 #ifndef __DATA_SOURCE_SIMPLE_H
 #define __DATA_SOURCE_SIMPLE_H
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rdata.h>
-#include <dns/cpp/rrclass.h>
-#include <dns/cpp/rrtype.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
-
-#include <cc/cpp/data.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
+
+#include <cc/data.h>
 
 #include "common.h"
 

src/bin/parkinglot/main.cc

@@ -25,14 +25,14 @@
 
 #include <boost/foreach.hpp>
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
-
-#include <cc/cpp/session.h>
-#include <cc/cpp/data.h>
-#include <config/cpp/ccsession.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
+
+#include <cc/session.h>
+#include <cc/data.h>
+#include <config/ccsession.h>
 
 #include "zoneset.h"
 #include "b10-parkinglot.h"

src/bin/parkinglot/zoneset.h

@@ -18,8 +18,8 @@
 #define __ZONESET_H 1
 
 #include <set>
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
 
 class ZoneSet {
 public:

src/lib/auth/cpp/Makefile.am

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

src/lib/auth/cpp/data_source.cc

@@ -1,9 +1,9 @@
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
 
-#include <cc/cpp/data.h>
+#include <cc/data.h>
 
 #include "data_source.h"
 

src/lib/auth/cpp/data_source.h

@@ -18,9 +18,9 @@
 #define __DATA_SOURCE_H
 
 #include <boost/foreach.hpp>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
-#include <auth/cpp/query.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
+#include <auth/query.h>
 
 namespace isc {
 namespace dns {

src/lib/auth/cpp/data_source_plot.cc

@@ -1,7 +1,7 @@
 
 #include <boost/foreach.hpp>
 
-#include <dns/cpp/rrttl.h>
+#include <dns/rrttl.h>
 
 #include "data_source_plot.h"
 

src/lib/auth/cpp/data_source_plot.h

@@ -18,15 +18,15 @@
 #ifndef __DATA_SOURCE_SIMPLE_H
 #define __DATA_SOURCE_SIMPLE_H
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rdata.h>
-#include <dns/cpp/rrclass.h>
-#include <dns/cpp/rrtype.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
-
-#include <cc/cpp/data.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
+
+#include <cc/data.h>
 
 #include "common.h"
 

src/lib/auth/cpp/data_source_static.cc

@@ -2,13 +2,13 @@
 
 #include "data_source_static.h"
 
-#include <dns/cpp/name.h>
-#include <dns/cpp/rdata.h>
-#include <dns/cpp/rdataclass.h>
-#include <dns/cpp/rrclass.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/rrtype.h>
-#include <dns/cpp/rrttl.h>
+#include <dns/name.h>
+#include <dns/rdata.h>
+#include <dns/rdataclass.h>
+#include <dns/rrclass.h>
+#include <dns/rrset.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
 
 #include <iostream>
 

src/lib/auth/cpp/query.cc

@@ -14,12 +14,12 @@
 
 // $Id$
 
-#include <dns/cpp/buffer.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/message.h>
+#include <dns/buffer.h>
+#include <dns/name.h>
+#include <dns/rrset.h>
+#include <dns/message.h>
 
-#include <cc/cpp/data.h>
+#include <cc/data.h>
 
 #include "query.h"
 

src/lib/auth/cpp/query.h

@@ -19,12 +19,12 @@
 
 #include <queue>
 
-#include <dns/cpp/exceptions.h>
-#include <dns/cpp/name.h>
-#include <dns/cpp/message.h>
-#include <dns/cpp/rrset.h>
-#include <dns/cpp/rrclass.h>
-#include <dns/cpp/rrtype.h>
+#include <dns/exceptions.h>
+#include <dns/name.h>
+#include <dns/message.h>
+#include <dns/rrset.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
 
 namespace isc {
 namespace dns {

src/lib/cc/cpp/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/ext -Wall -Werror
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext -Wall -Werror
 
 lib_LIBRARIES = libcc.a
 libcc_a_SOURCES = data.cc data.h session.cc session.h

src/lib/cc/cpp/data.h

@@ -22,7 +22,7 @@
 #include <map>
 #include <boost/shared_ptr.hpp>
 #include <stdexcept>
-#include <dns/cpp/exceptions.h>
+#include <dns/exceptions.h>
 
 namespace isc { namespace data {
 

src/lib/config/cpp/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/ext -Wall -Werror
+AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext -Wall -Werror
 
 lib_LIBRARIES = libclient.a
 libclient_a_SOURCES = data_def.h data_def.cc ccsession.cc ccsession.h

src/lib/config/cpp/ccsession.cc

@@ -33,9 +33,9 @@
 
 #include <boost/foreach.hpp>
 
-#include <cc/cpp/data.h>
+#include <cc/data.h>
 #include <data_def.h>
-#include <cc/cpp/session.h>
+#include <cc/session.h>
 
 //#include "common.h"
 #include "ccsession.h"

src/lib/config/cpp/ccsession.h

@@ -19,9 +19,9 @@
 
 #include <string>
 
-#include <config/cpp/data_def.h>
-#include <cc/cpp/session.h>
-#include <cc/cpp/data.h>
+#include <config/data_def.h>
+#include <cc/session.h>
+#include <cc/data.h>
 
 class CommandSession {
 public:

src/lib/config/cpp/data_def.h

@@ -1,7 +1,7 @@
 #ifndef _DATA_DEF_H
 #define _DATA_DEF_H 1
 
-#include <cc/cpp/data.h>
+#include <cc/data.h>
 
 #include <sstream>