From: John Lindgren Date: Mon, 8 Mar 2021 15:27:23 +0000 (-0500) Subject: Fix relative include paths to be more correct and portable. X-Git-Tag: 1.0.9~21 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fd81d8953ad78da9e3ef2ba712830354593111a;p=thirdparty%2Flldpd.git 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 4a14ff0a..31b4cce9 100644 --- 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 bda77786..8d91475e 100644 --- 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 a74556a2..f1e6465f 100644 --- 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 #include diff --git a/src/daemon/protocols/sonmp.c b/src/daemon/protocols/sonmp.c index d2eed157..41dcf6aa 100644 --- 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 006996fc..f0012df7 100644 --- a/src/lib/atoms/chassis.c +++ b/src/lib/atoms/chassis.c @@ -20,10 +20,10 @@ #include #include -#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 f8216648..ebe8a36a 100644 --- a/src/lib/atoms/config.c +++ b/src/lib/atoms/config.c @@ -21,9 +21,9 @@ #include #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 71800d23..457a047d 100644 --- a/src/lib/atoms/custom.c +++ b/src/lib/atoms/custom.c @@ -21,10 +21,10 @@ #include #include -#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 6a2af2ec..66f76f5f 100644 --- a/src/lib/atoms/dot1.c +++ b/src/lib/atoms/dot1.c @@ -20,10 +20,10 @@ #include #include -#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 6f3a759c..798659c7 100644 --- a/src/lib/atoms/dot3.c +++ b/src/lib/atoms/dot3.c @@ -20,10 +20,10 @@ #include #include -#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 d51c0ee6..54a040d8 100644 --- a/src/lib/atoms/interface.c +++ b/src/lib/atoms/interface.c @@ -20,10 +20,10 @@ #include #include -#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 595dba44..1ebafc5b 100644 --- a/src/lib/atoms/med.c +++ b/src/lib/atoms/med.c @@ -20,11 +20,11 @@ #include #include -#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 702d9457..3d3ec9b8 100644 --- a/src/lib/atoms/mgmt.c +++ b/src/lib/atoms/mgmt.c @@ -20,10 +20,10 @@ #include #include -#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 b316ac4b..57adf48a 100644 --- a/src/lib/atoms/port.c +++ b/src/lib/atoms/port.c @@ -20,10 +20,10 @@ #include #include -#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,