Commit 58f86251 authored by Jelte Jansen's avatar Jelte Jansen
Browse files

- 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
parent c51d6c7b
...@@ -39,6 +39,7 @@ pyshared: ...@@ -39,6 +39,7 @@ pyshared:
include: include:
mkdir 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/cc/cpp include/cc
ln -s ${abs_top_srcdir}/src/lib/config/cpp include/config ln -s ${abs_top_srcdir}/src/lib/config/cpp include/config
ln -s ${abs_top_srcdir}/src/lib/dns/cpp include/dns ln -s ${abs_top_srcdir}/src/lib/dns/cpp include/dns
......
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 bin_PROGRAMS = b10-auth
b10_auth_SOURCES = auth_srv.cc auth_srv.h b10_auth_SOURCES = auth_srv.cc auth_srv.h
......
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
#include <set> #include <set>
#include <iostream> #include <iostream>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/messagerenderer.h> #include <dns/messagerenderer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/question.h> #include <dns/question.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/rrttl.h> #include <dns/rrttl.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include "common.h" #include "common.h"
#include "auth_srv.h" #include "auth_srv.h"
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#ifndef __AUTH_SRV_H #ifndef __AUTH_SRV_H
#define __AUTH_SRV_H 1 #define __AUTH_SRV_H 1
#include <cc/cpp/data.h> #include <cc/data.h>
#include <auth/cpp/data_source_static.h> #include <auth/data_source_static.h>
class AuthSrv { class AuthSrv {
public: public:
......
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/session.h> #include <cc/session.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include <config/cpp/ccsession.h> #include <config/ccsession.h>
#include "common.h" #include "common.h"
#include "config.h" #include "config.h"
......
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 bin_PROGRAMS = host
host_SOURCES = host.cc host_SOURCES = host.cc
......
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@ pkglibexecdir = $(libexecdir)/@PACKAGE@
......
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
#include <set> #include <set>
#include <iostream> #include <iostream>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/messagerenderer.h> #include <dns/messagerenderer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/question.h> #include <dns/question.h>
#include <dns/cpp/rdataclass.h> #include <dns/rdataclass.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/rrttl.h> #include <dns/rrttl.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include "common.h" #include "common.h"
#include "builtin.h" #include "builtin.h"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define __PARKINGLOT_H 1 #define __PARKINGLOT_H 1
#include "zoneset.h" #include "zoneset.h"
#include <cc/cpp/data.h> #include <cc/data.h>
#include "data_source_plot.h" #include "data_source_plot.h"
class ParkingLot { class ParkingLot {
......
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/messagerenderer.h> #include <dns/messagerenderer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rdata.h> #include <dns/rdata.h>
#include <dns/cpp/rrclass.h> #include <dns/rrclass.h>
#include <dns/cpp/rrtype.h> #include <dns/rrtype.h>
#include <dns/cpp/rrttl.h> #include <dns/rrttl.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include "builtin.h" #include "builtin.h"
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
struct BuiltinRRsetsImpl; struct BuiltinRRsetsImpl;
......
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/messagerenderer.h> #include <dns/messagerenderer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rdata.h> #include <dns/rdata.h>
#include <dns/cpp/rdataclass.h> #include <dns/rdataclass.h>
#include <dns/cpp/rrclass.h> #include <dns/rrclass.h>
#include <dns/cpp/rrtype.h> #include <dns/rrtype.h>
#include <dns/cpp/rrttl.h> #include <dns/rrttl.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include "builtin.h" #include "builtin.h"
......
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include "data_source.h" #include "data_source.h"
......
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#ifndef __DATA_SOURCE_H #ifndef __DATA_SOURCE_H
#define __DATA_SOURCE_H #define __DATA_SOURCE_H
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
namespace isc { namespace isc {
namespace dns { namespace dns {
......
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <dns/cpp/rdataclass.h> #include <dns/rdataclass.h>
#include <dns/cpp/rrttl.h> #include <dns/rrttl.h>
#include "data_source_plot.h" #include "data_source_plot.h"
......
...@@ -18,15 +18,15 @@ ...@@ -18,15 +18,15 @@
#ifndef __DATA_SOURCE_SIMPLE_H #ifndef __DATA_SOURCE_SIMPLE_H
#define __DATA_SOURCE_SIMPLE_H #define __DATA_SOURCE_SIMPLE_H
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rdata.h> #include <dns/rdata.h>
#include <dns/cpp/rrclass.h> #include <dns/rrclass.h>
#include <dns/cpp/rrtype.h> #include <dns/rrtype.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include "common.h" #include "common.h"
......
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/session.h> #include <cc/session.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include <config/cpp/ccsession.h> #include <config/ccsession.h>
#include "zoneset.h" #include "zoneset.h"
#include "b10-parkinglot.h" #include "b10-parkinglot.h"
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
#define __ZONESET_H 1 #define __ZONESET_H 1
#include <set> #include <set>
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
class ZoneSet { class ZoneSet {
public: public:
......
AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/ext AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/ext
CLEANFILES = *.gcno *.gcda CLEANFILES = *.gcno *.gcda
......
#include <dns/cpp/buffer.h> #include <dns/buffer.h>
#include <dns/cpp/name.h> #include <dns/name.h>
#include <dns/cpp/rrset.h> #include <dns/rrset.h>
#include <dns/cpp/message.h> #include <dns/message.h>
#include <cc/cpp/data.h> #include <cc/data.h>
#include "data_source.h" #include "data_source.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment