fixeria submitted this change.

View Change

virt_phy: fix make distcheck: access l1ctl_proto.h via symlink

Accessing a header file from outside of the sub-project requires
using the relative path ("-I$(top_srcdir)/../layer23/include"),
which does not resolve properly during make distcheck.

The '../layer23/include/l1ctl_proto.h' is actually a symlink too.

Change-Id: Id64ab161a17d53f5e93cdd100e81d4fb8acfb97a
---
M src/host/virt_phy/include/Makefile.am
A src/host/virt_phy/include/virtphy/l1ctl_proto.h
M src/host/virt_phy/include/virtphy/l1ctl_sap.h
M src/host/virt_phy/src/Makefile.am
M src/host/virt_phy/src/gsmtapl1_if.c
M src/host/virt_phy/src/l1ctl_sap.c
M src/host/virt_phy/src/virt_prim_data.c
M src/host/virt_phy/src/virt_prim_fbsb.c
M src/host/virt_phy/src/virt_prim_pm.c
M src/host/virt_phy/src/virt_prim_rach.c
M src/host/virt_phy/src/virt_prim_traffic.c
11 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/host/virt_phy/include/Makefile.am b/src/host/virt_phy/include/Makefile.am
index 6048a4b..ff3e8cb 100644
--- a/src/host/virt_phy/include/Makefile.am
+++ b/src/host/virt_phy/include/Makefile.am
@@ -1,6 +1,7 @@
 noinst_HEADERS = \
 	virtphy/logging.h \
 	virtphy/osmo_mcast_sock.h \
+	virtphy/l1ctl_proto.h \
 	virtphy/l1ctl_sock.h \
 	virtphy/virtual_um.h \
 	virtphy/gsmtapl1_if.h \
diff --git a/src/host/virt_phy/include/virtphy/l1ctl_proto.h b/src/host/virt_phy/include/virtphy/l1ctl_proto.h
new file mode 120000
index 0000000..95d4161
--- /dev/null
+++ b/src/host/virt_phy/include/virtphy/l1ctl_proto.h
@@ -0,0 +1 @@
+../../../../../include/l1ctl_proto.h
\ No newline at end of file
diff --git a/src/host/virt_phy/include/virtphy/l1ctl_sap.h b/src/host/virt_phy/include/virtphy/l1ctl_sap.h
index d3562a1..6306eeb 100644
--- a/src/host/virt_phy/include/virtphy/l1ctl_sap.h
+++ b/src/host/virt_phy/include/virtphy/l1ctl_sap.h
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <osmocom/core/msgb.h>
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 #include <virtphy/virtual_um.h>
 #include <virtphy/l1ctl_sock.h>
 #include <virtphy/virt_l1_model.h>
diff --git a/src/host/virt_phy/src/Makefile.am b/src/host/virt_phy/src/Makefile.am
index bfd0dfa..66e70cb 100644
--- a/src/host/virt_phy/src/Makefile.am
+++ b/src/host/virt_phy/src/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include  -I$(top_srcdir)/../layer23/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
 
 bin_PROGRAMS = virtphy
 virtphy_SOURCES = virtphy.c l1ctl_sock.c gsmtapl1_if.c l1ctl_sap.c virt_prim_pm.c virt_prim_fbsb.c virt_prim_rach.c virt_prim_data.c virt_prim_traffic.c virt_l1_sched_simple.c logging.c virt_l1_model.c shared/virtual_um.c shared/osmo_mcast_sock.c
diff --git a/src/host/virt_phy/src/gsmtapl1_if.c b/src/host/virt_phy/src/gsmtapl1_if.c
index 83b01fe..1496ee9 100644
--- a/src/host/virt_phy/src/gsmtapl1_if.c
+++ b/src/host/virt_phy/src/gsmtapl1_if.c
@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 #include <virtphy/virtual_um.h>
 #include <virtphy/l1ctl_sock.h>
 #include <virtphy/virt_l1_model.h>
diff --git a/src/host/virt_phy/src/l1ctl_sap.c b/src/host/virt_phy/src/l1ctl_sap.c
index 35370f0..ffe94ac 100644
--- a/src/host/virt_phy/src/l1ctl_sap.c
+++ b/src/host/virt_phy/src/l1ctl_sap.c
@@ -29,7 +29,7 @@
 #include <osmocom/gsm/rsl.h>
 #include <osmocom/gprs/gprs_rlc.h>
 #include <stdio.h>
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 #include <netinet/in.h>
 #include <string.h>
 #include <virtphy/virtual_um.h>
diff --git a/src/host/virt_phy/src/virt_prim_data.c b/src/host/virt_phy/src/virt_prim_data.c
index f74a9fa..51f7585 100644
--- a/src/host/virt_phy/src/virt_prim_data.c
+++ b/src/host/virt_phy/src/virt_prim_data.c
@@ -32,7 +32,7 @@
 #include <virtphy/logging.h>
 #include <virtphy/gsmtapl1_if.h>
 
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 
 /**
  * @brief Handler callback function for DATA request.
diff --git a/src/host/virt_phy/src/virt_prim_fbsb.c b/src/host/virt_phy/src/virt_prim_fbsb.c
index 9637ed9..7c634cb 100644
--- a/src/host/virt_phy/src/virt_prim_fbsb.c
+++ b/src/host/virt_phy/src/virt_prim_fbsb.c
@@ -29,7 +29,7 @@
 #include <virtphy/virt_l1_sched.h>
 #include <osmocom/core/gsmtap.h>
 #include <virtphy/logging.h>
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 
 static uint16_t sync_count = 0;
 
diff --git a/src/host/virt_phy/src/virt_prim_pm.c b/src/host/virt_phy/src/virt_prim_pm.c
index 5a9a664..bb7875d 100644
--- a/src/host/virt_phy/src/virt_prim_pm.c
+++ b/src/host/virt_phy/src/virt_prim_pm.c
@@ -29,7 +29,7 @@
 #include <virtphy/virt_l1_sched.h>
 #include <osmocom/core/gsmtap.h>
 #include <virtphy/logging.h>
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 
 /**
  * @brief Change the signal strength for a given arfcn.
diff --git a/src/host/virt_phy/src/virt_prim_rach.c b/src/host/virt_phy/src/virt_prim_rach.c
index 2813458..a8a8ffa 100644
--- a/src/host/virt_phy/src/virt_prim_rach.c
+++ b/src/host/virt_phy/src/virt_prim_rach.c
@@ -32,7 +32,7 @@
 #include <virtphy/logging.h>
 #include <virtphy/gsmtapl1_if.h>
 
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 
 /* use if we have a combined uplink (RACH, SDCCH, ...) (see
  * http://www.rfwireless-world.com/Terminology/GSM-combined-channel-configuration.html)
diff --git a/src/host/virt_phy/src/virt_prim_traffic.c b/src/host/virt_phy/src/virt_prim_traffic.c
index 1686ce9..ae87ad6 100644
--- a/src/host/virt_phy/src/virt_prim_traffic.c
+++ b/src/host/virt_phy/src/virt_prim_traffic.c
@@ -32,7 +32,7 @@
 #include <virtphy/logging.h>
 #include <virtphy/gsmtapl1_if.h>
 
-#include <l1ctl_proto.h>
+#include <virtphy/l1ctl_proto.h>
 
 /**
  * @brief Handler callback function for TRAFFIC request.

To view, visit change 30817. To unsubscribe, or for help writing mail filters, visit settings.