2004-03-16 David Young <dyoung@pobox.com>

	* (many) reference <lib/version.h> rather than "version.h",
	because version.h is a generated file and not present in the
	source tree when using objdir builds.

(committed by gdt)
works fine with normal builds; didn't try objdir

diff --git a/ChangeLog b/ChangeLog
index b90f093c7746b9e751e94e2332e0c98f23582d71..59a3bffbc5ae551c73a139b5b78adefcf500e4e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-16 David Young <dyoung@pobox.com>
+
+       * (many) reference <lib/version.h> rather than "version.h",
+       because version.h is a generated file and not present in the
+       source tree when using objdir builds.
+
 2004-03-03 PC Drew <pc@superiorcomm.net>
 
        * lib/keychain.c: typecast time_t function to long, fixes compile

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index bb1a61072a61a846dec9e4fcc14c506f476e8b90..e6f64312aae2a88c35f434dce28f868ba758d9ef 100644 (file)
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -20,7 +20,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "prefix.h"
 #include "linklist.h"
 #include "stream.h"

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index effddddb7584788fc473d836823c2e59efbbaeb9..0ba19c2ff7c52254d88e8e4d45b36eca2baf7e8c 100644 (file)
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -25,7 +25,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "command.h"
 #include "getopt.h"
 #include "thread.h"
-#include "version.h"
+#include <lib/version.h>
 #include "memory.h"
 #include "prefix.h"
 #include "log.h"

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index b952c00cf6be7537e193faa1bd4be437fee78ba0..120075067173996adeb0dea141cdebed45dd0de4 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -27,7 +27,7 @@
 #include "getopt.h"
 #include "thread.h"
 #include "log.h"
-#include "version.h"
+#include <lib/version.h>
 #include "command.h"
 #include "vty.h"
 #include "memory.h"

diff --git a/lib/command.c b/lib/command.c
index 24113062a6cb26026375ed17be82c03b3e85607f..8b6ae3d0fd8157fb7ba631bbcd83326e8f53358c 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "memory.h"
 #include "log.h"
-#include "version.h"
+#include <lib/version.h>
 #include "thread.h"
 #include "vector.h"
 #include "vty.h"

diff --git a/lib/print_version.c b/lib/print_version.c
index 4c9be04704e5524f0bf897f9554e4bed7481f638..1873faaffed27f21467c4222d8db35a3c9536459 100644 (file)
--- a/lib/print_version.c
+++ b/lib/print_version.c
@@ -21,7 +21,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 
 void
 print_version (char *progname)

diff --git a/lib/smux.c b/lib/smux.c
index ddb8bfecaf7309b4ea26428cb84d9b54b42aeebb..7e0a2ecf650b21ad6720469dd4752697886503a4 100644 (file)
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -33,7 +33,7 @@
 #include "thread.h"
 #include "linklist.h"
 #include "command.h"
-#include "version.h"
+#include <lib/version.h>
 #include "memory.h"
 #include "sockunion.h"
 #include "smux.h"

diff --git a/lib/vty.c b/lib/vty.c
index 2b823e0dd432e7836e4812861ac473c0a0aa66af..831660d980d5c4a8d394d1887fefbfcc0cc7687d 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -25,7 +25,7 @@
 #include "linklist.h"
 #include "thread.h"
 #include "buffer.h"
-#include "version.h"
+#include <lib/version.h>
 #include "command.h"
 #include "sockunion.h"
 #include "memory.h"

diff --git a/ospf6d/ospf6_lsa.c b/ospf6d/ospf6_lsa.c
index b14979ffa27a503887a7b8cc3ef64a2aa1966025..712aa6866e151d90242c58fb53db544c86872994 100644 (file)
--- a/ospf6d/ospf6_lsa.c
+++ b/ospf6d/ospf6_lsa.c
@@ -23,7 +23,7 @@
 #include <zebra.h>
 
 /* Include other stuffs */
-#include "version.h"
+#include <lib/version.h>
 #include "log.h"
 #include "getopt.h"
 #include "linklist.h"

diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index f0a23ebc237b978cb1b609781e971277bfdeaaaf..3b7cfc9ad8c5046b2d2121eeafd892798f5c15b1 100644 (file)
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -23,7 +23,7 @@
 #include "getopt.h"
 #include "thread.h"
 #include "log.h"
-#include "version.h"
+#include <lib/version.h>
 #include "command.h"
 #include "vty.h"
 #include "memory.h"

diff --git a/ospf6d/ospf6d.h b/ospf6d/ospf6d.h
index 8c7af99e1958d04a94ed6cf4c9263b1054d85026..e867b1c1beeb8703472083146a40d2134e15b0ee 100644 (file)
--- a/ospf6d/ospf6d.h
+++ b/ospf6d/ospf6d.h
@@ -27,7 +27,7 @@
 
 #ifndef HEADER_DEPENDENCY
 /* Include other stuffs */
-#include "version.h"
+#include <lib/version.h>
 #include "log.h"
 #include "getopt.h"
 #include "thread.h"

diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index 3a62a4236819b80ac93b90fd6341ce9101aab487..96ccb8b44c379f6a398261ae057a21ea1ed756b1 100644 (file)
--- a/ospfclient/ospf_apiclient.c
+++ b/ospfclient/ospf_apiclient.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "thread.h"
 #include "prefix.h"

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 3f1e4fda3684b73cd1224215865f182a0bba90fc..43aa5a4fd1832620cc985b03814d75688a261fff 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "thread.h"
 #include "prefix.h"

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 8b0d216296231d6be5075a186d0594f4e3d7e90c..5d6b0ad42469303630e15cd3c61799f6189e826a 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -21,7 +21,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "thread.h"
 #include "command.h"

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 3beb2279efe162ff35ec26a0bce8c672e2d44703..d21ca307a8609b2259816c3450aaf37e5bf05c35 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -22,7 +22,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "vector.h"
 #include "vty.h"

diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index f30aba43d93db73c17f77725bdc3d8ebadb290cf..ee0924586b9cd8a80288a4f9f83ac6b1c938f91c 100644 (file)
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -29,7 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "command.h"
 

diff --git a/zebra/main.c b/zebra/main.c
index a66734ccd4d42dadf5922f791d700c44b17a444c..07467bea15cb02d100d2b9b947369d1656259df4 100644 (file)
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -21,7 +21,7 @@
 
 #include <zebra.h>
 
-#include "version.h"
+#include <lib/version.h>
 #include "getopt.h"
 #include "command.h"
 #include "thread.h"