From 05b0074f7205ecba39a6a1b552df62ea45ac900e Mon Sep 17 00:00:00 2001 From: Cedric Roux <cedric.roux@eurecom.fr> Date: Tue, 26 Nov 2013 14:12:58 +0000 Subject: [PATCH] - Fix dependencies git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4528 818b1a75-f10b-46b9-bf7c-635c3b92a50f --- common/utils/itti/Makefile.am | 10 ++++++---- openair-cn/OAISIM_MME/Makefile.am | 2 +- openair-cn/OAI_EPC/Makefile.am | 4 ++-- openair-cn/OAI_SGW/Makefile.am | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/common/utils/itti/Makefile.am b/common/utils/itti/Makefile.am index ced16999df..93f5704603 100644 --- a/common/utils/itti/Makefile.am +++ b/common/utils/itti/Makefile.am @@ -6,10 +6,12 @@ AM_CFLAGS = @ADD_CFLAGS@ \ noinst_LTLIBRARIES = libitti.la -$(abs_builddir)/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a: - @if [ ! -d $(abs_builddir)/UTIL/LFDS/liblfds6.1.1/liblfds611/bin ]; then mkdir -p $(abs_builddir)/UTIL/LFDS/liblfds6.1.1/liblfds611/bin; fi; - @if [ ! -d $(abs_builddir)/UTIL/LFDS/liblfds6.1.1/liblfds611/obj ]; then mkdir -p $(abs_builddir)/UTIL/LFDS/liblfds6.1.1/liblfds611/obj; fi; - @$(MAKE) -C $(OPENAIR2_DIR)/UTIL/LFDS/liblfds6.1.1/liblfds611/ -f makefile.linux OUTDIR=$(abs_builddir)/UTIL/LFDS/liblfds6.1.1/liblfds611 +BUILT_SOURCES = $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a + +$(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a: + @if [ ! -d $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin ]; then mkdir -p $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin; fi; + @if [ ! -d $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/obj ]; then mkdir -p $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/obj; fi; + @$(MAKE) -C $(OPENAIR2_DIR)/UTIL/LFDS/liblfds6.1.1/liblfds611/ -f makefile.linux OUTDIR=$(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611 libitti_la_LDFLAGS = -all-static libitti_la_SOURCES = \ diff --git a/openair-cn/OAISIM_MME/Makefile.am b/openair-cn/OAISIM_MME/Makefile.am index 4b13c687bf..d8c19ac574 100644 --- a/openair-cn/OAISIM_MME/Makefile.am +++ b/openair-cn/OAISIM_MME/Makefile.am @@ -34,7 +34,7 @@ oaisim_mme_LDADD = \ $(top_builddir)/SECU/libsecu.la \ $(top_builddir)/UTILS/libutils.la \ $(top_builddir)/GTPV2-C/nwgtpv2c-0.11/src/libNwGtpv2c.a \ - $(top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a + $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a oaisim_mme_SOURCES = \ oai_mme_log.c \ diff --git a/openair-cn/OAI_EPC/Makefile.am b/openair-cn/OAI_EPC/Makefile.am index 566f0c52ff..8b8f6e6ce8 100644 --- a/openair-cn/OAI_EPC/Makefile.am +++ b/openair-cn/OAI_EPC/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = @ADD_CFLAGS@ \ -I$(top_srcdir)/COMMON \ -I$(top_srcdir)/GTPV1-U \ -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/include \ - -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared \ + -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared \ -I$(top_srcdir)/SCTP \ -I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network \ -I$(top_srcdir)/NAS/EURECOM-NAS/src/include \ @@ -36,7 +36,7 @@ oai_epc_LDADD = \ $(top_builddir)/SECU/libsecu.la \ $(top_builddir)/UTILS/libutils.la \ $(top_builddir)/S1AP/libs1ap.la \ - $(top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a + $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a oai_epc_SOURCES = \ oai_epc_log.c \ diff --git a/openair-cn/OAI_SGW/Makefile.am b/openair-cn/OAI_SGW/Makefile.am index d84af09bbd..11b889010e 100644 --- a/openair-cn/OAI_SGW/Makefile.am +++ b/openair-cn/OAI_SGW/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = @ADD_CFLAGS@ \ -I$(top_srcdir)/COMMON \ -I$(top_srcdir)/GTPV1-U \ -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/include \ - -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared \ + -I$(top_srcdir)/GTPV1-U/nw-gtpv1u/shared \ -I$(top_srcdir)/NAS/EURECOM-NAS/src/api/network \ -I$(top_srcdir)/NAS/EURECOM-NAS/src/include \ -I$(top_srcdir)/INTERTASK_INTERFACE \ @@ -25,7 +25,7 @@ oai_sgw_LDADD = \ $(top_builddir)/UDP/libudpserver.la \ $(top_builddir)/SECU/libsecu.la \ $(top_builddir)/UTILS/libutils.la \ - $(top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a + $(abs_top_builddir)/INTERTASK_INTERFACE/UTIL/LFDS/liblfds6.1.1/liblfds611/bin/liblfds611.a oai_sgw_SOURCES = \ oai_sgw_log.c \ -- GitLab