Fix relative include paths to be more correct and portable.

Some relative include paths in subdirectories (src/daemon/protocols
and src/lib/atoms) were written relative to the parent directories
(src/daemon and src/lib).  This was okay in automake builds but
caused errors when porting to other build systems (for example,
Android make).

diff --git a/src/daemon/protocols/cdp.c b/src/daemon/protocols/cdp.c
index 4a14ff0ab4556bc2ceb8d267bbb6f5a63b5fce57..31b4cce9a652c92bdf9d8d1ee8fe7e3693dd7ed3 100644 (file)
--- a/src/daemon/protocols/cdp.c
+++ b/src/daemon/protocols/cdp.c
@@ -16,8 +16,8 @@
  */
 
 /* We also supports FDP which is very similar to CDPv1 */
-#include "lldpd.h"
-#include "frame.h"
+#include "../lldpd.h"
+#include "../frame.h"
 
 /*
  * CDP Requests Power at the switch output and therefore has to take into

diff --git a/src/daemon/protocols/edp.c b/src/daemon/protocols/edp.c
index bda77786ebbeb097c08492fcec616e8ce73d1598..8d91475eea714a3432d0bd50e2a2bedbab46a928 100644 (file)
--- a/src/daemon/protocols/edp.c
+++ b/src/daemon/protocols/edp.c
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "lldpd.h"
-#include "frame.h"
+#include "../lldpd.h"
+#include "../frame.h"
 
 #ifdef ENABLE_EDP
 

diff --git a/src/daemon/protocols/lldp.c b/src/daemon/protocols/lldp.c
index a74556a29857100c42af7fe3c85ea2e2bd72f97f..f1e6465f9e0698f6b9ba4584d0243385ccb3f7c5 100644 (file)
--- a/src/daemon/protocols/lldp.c
+++ b/src/daemon/protocols/lldp.c
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "lldpd.h"
-#include "frame.h"
+#include "../lldpd.h"
+#include "../frame.h"
 
 #include <unistd.h>
 #include <errno.h>

diff --git a/src/daemon/protocols/sonmp.c b/src/daemon/protocols/sonmp.c
index d2eed157063d3c6d9cfe2cf1a2313b801456f0a7..41dcf6aa412ddcfc248a35e6c437e30ca93c9dbf 100644 (file)
--- a/src/daemon/protocols/sonmp.c
+++ b/src/daemon/protocols/sonmp.c
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "lldpd.h"
-#include "frame.h"
+#include "../lldpd.h"
+#include "../frame.h"
 
 #ifdef ENABLE_SONMP
 

diff --git a/src/lib/atoms/chassis.c b/src/lib/atoms/chassis.c
index 006996fce68fc8c6ed77d814968e5bdb9862db4d..f0012df70b837e4644218bc97deca71a52eb0e5b 100644 (file)
--- a/src/lib/atoms/chassis.c
+++ b/src/lib/atoms/chassis.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 static lldpctl_map_t chassis_id_subtype_map[] = {
        { LLDP_CHASSISID_SUBTYPE_IFNAME,  "ifname"},

diff --git a/src/lib/atoms/config.c b/src/lib/atoms/config.c
index f82166489df05661a3dddbdcb6b2c391b3c79919..ebe8a36a630164c87b510928d977ec4f0203bd5b 100644 (file)
--- a/src/lib/atoms/config.c
+++ b/src/lib/atoms/config.c
@@ -21,9 +21,9 @@
 #include <arpa/inet.h>
 
 #include "../lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 static struct atom_map bond_slave_src_mac_map = {
        .key = lldpctl_k_config_bond_slave_src_mac_type,

diff --git a/src/lib/atoms/custom.c b/src/lib/atoms/custom.c
index 71800d237c56502b8be915ce62fbaacdbc4b1f4c..457a047d738c727f7702f65250f7b242ea30efa0 100644 (file)
--- a/src/lib/atoms/custom.c
+++ b/src/lib/atoms/custom.c
@@ -21,10 +21,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 #ifdef ENABLE_CUSTOM
 

diff --git a/src/lib/atoms/dot1.c b/src/lib/atoms/dot1.c
index 6a2af2ec38ea36505bfd0be57b13833b5e1b7086..66f76f5f5bef45b44b0c53a4164f7a3be9da16df 100644 (file)
--- a/src/lib/atoms/dot1.c
+++ b/src/lib/atoms/dot1.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 #ifdef ENABLE_DOT1
 

diff --git a/src/lib/atoms/dot3.c b/src/lib/atoms/dot3.c
index 6f3a759cefbbfbfbdd929742cca3fbf610caabbd..798659c7206b35ec07d7d64fbc4678c1cacd5dcf 100644 (file)
--- a/src/lib/atoms/dot3.c
+++ b/src/lib/atoms/dot3.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 #ifdef ENABLE_DOT3
 

diff --git a/src/lib/atoms/interface.c b/src/lib/atoms/interface.c
index d51c0ee605e78216afc6c7761d6a8d9d01e7aba3..54a040d89e877e568a334a87ab45aa527a34bd32 100644 (file)
--- a/src/lib/atoms/interface.c
+++ b/src/lib/atoms/interface.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 static int
 _lldpctl_atom_new_interfaces_list(lldpctl_atom_t *atom, va_list ap)

diff --git a/src/lib/atoms/med.c b/src/lib/atoms/med.c
index 595dba447395892d71b18d4f25dcb0e03de2ea1f..1ebafc5bc009784ff8911091529f102abcef3bad 100644 (file)
--- a/src/lib/atoms/med.c
+++ b/src/lib/atoms/med.c
@@ -20,11 +20,11 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
-#include "fixedpoint.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
+#include "../fixedpoint.h"
 
 #ifdef ENABLE_LLDPMED
 

diff --git a/src/lib/atoms/mgmt.c b/src/lib/atoms/mgmt.c
index 702d9457be77d357bd423b790ace3bb653f91b69..3d3ec9b8c7afbe0b478bc98bdd65a234873d8c82 100644 (file)
--- a/src/lib/atoms/mgmt.c
+++ b/src/lib/atoms/mgmt.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 static int
 _lldpctl_atom_new_mgmts_list(lldpctl_atom_t *atom, va_list ap)

diff --git a/src/lib/atoms/port.c b/src/lib/atoms/port.c
index b316ac4b81f12ccb31fce979c69dce502bcb790d..57adf48a0ad5f23b91ed46206792e3033d07e822 100644 (file)
--- a/src/lib/atoms/port.c
+++ b/src/lib/atoms/port.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "lldpctl.h"
-#include "../log.h"
-#include "atom.h"
-#include "helpers.h"
+#include "../lldpctl.h"
+#include "../../log.h"
+#include "../atom.h"
+#include "../helpers.h"
 
 static struct atom_map lldpd_protocol_map = {
        .key = lldpctl_k_port_protocol,