diff --git a/openair2/RRC/LITE/MESSAGES/Makefile.inc b/openair2/RRC/LITE/MESSAGES/Makefile.inc
index 8f48e34101a229fa26d47e9a391aa0fa522cbb62..18c72cf8409a10cb15b1e3cfc447611a16b3c39f 100644
--- a/openair2/RRC/LITE/MESSAGES/Makefile.inc
+++ b/openair2/RRC/LITE/MESSAGES/Makefile.inc
@@ -1,7 +1,15 @@
-export IS_REL10_CBA=$(shell if [ -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ] ; then echo "1" ; else echo "0" ; fi)
-export IS_REL10=$(shell if [ -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ] ; then echo "1" ; else echo "0" ; fi)
-export IS_REL8=$(shell if [ -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ] ; then echo "1" ; else echo "0" ; fi)
+export IS_REL10_CBA=$(shell \
+ if [ -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ] ; then \
+ echo "1" ; else echo "0" ; fi)
+
+export IS_REL10=$(shell \
+ if [ -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ] ; then \
+ echo "1" ; else echo "0" ; fi)
+
+export IS_REL8=$(shell \
+ if [ -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ] ; then \
+ echo "1" ; else echo "0" ; fi)
print-%:
@echo '$*=$($*)'
@@ -9,33 +17,88 @@ print-%:
ifdef CBA
CFLAGS += -DRel10
CFLAGS += -DCBA
-ifeq ($(IS_REL10_CBA), 0)
-tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d )
-tmp2:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ; rm EUTRA-RRC-Definitions.asn ; ln -s EUTRA-RRC-Definitions-a20-lola.asn EUTRA-RRC-Definitions.asn ; cd $(OPENAIR_TARGETS)/SIMU/USER/ ; rm -f $(ASN1_MSG_OBJS1) ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.am.sample ; rm -f $(L2_OBJS) ; rm -f *.o ; rm -f oaisim ; touch $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ; /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash )
-tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated )
-endif
+
+ ifeq ($(IS_REL10_CBA), 0)
+ tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d )
+ tmp2:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ; \
+ rm EUTRA-RRC-Definitions.asn ; \
+ ln -s EUTRA-RRC-Definitions-a20-lola.asn EUTRA-RRC-Definitions.asn ; \
+ cd $(OPENAIR_TARGETS)/SIMU/USER/ ; \
+ rm -f $(ASN1_MSG_OBJS1) ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.am.sample ; \
+ rm -f $(L2_OBJS) ; \
+ rm -f *.o ; \
+ rm -f oaisim ; \
+ touch $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ; \
+ /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash \
+ )
+ tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated )
+ endif
else ifdef Rel10
-CFLAGS += -DRel10
-ifeq ($(IS_REL10), 0)
-tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d )
-tmp2:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ; rm EUTRA-RRC-Definitions.asn ; ln -s EUTRA-RRC-Definitions-a20.asn EUTRA-RRC-Definitions.asn ; cd $(OPENAIR_TARGETS)/SIMU/USER/ ; rm -f $(ASN1_MSG_OBJS1) ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.am.sample ; rm -f $(L2_OBJS) ; rm -f *.o ; rm -f oaisim ; touch $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ; /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash )
-tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated )
-endif
+ CFLAGS += -DRel10
+ ifeq ($(IS_REL10), 0)
+ tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d )
+ tmp2:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ; \
+ rm EUTRA-RRC-Definitions.asn ; \
+ ln -s EUTRA-RRC-Definitions-a20.asn EUTRA-RRC-Definitions.asn ; \
+ cd $(OPENAIR_TARGETS)/SIMU/USER/ ; \
+ rm -f $(ASN1_MSG_OBJS1) ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.am.sample ; \
+ rm -f $(L2_OBJS) ; \
+ rm -f *.o ; \
+ rm -f oaisim ; \
+ touch $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ; \
+ /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash \
+ )
+ tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated )
+ endif
else # default is rel 8
-CFLAGS += -DRel8
-ifeq ($(IS_REL8), 0)
-tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d )
-tmp2:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ; rm EUTRA-RRC-Definitions.asn ; ln -s EUTRA-RRC-Definitions-86.asn EUTRA-RRC-Definitions.asn ; cd $(OPENAIR_TARGETS)/SIMU/USER/ ; rm -f $(ASN1_MSG_OBJS1) ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.am.sample ; rm -f $(L2_OBJS); rm -f *.o ; rm -f oaisim ; touch $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ; rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ; /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash )
-tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated )
-endif
+ CFLAGS += -DRel8
+ ifeq ($(IS_REL8), 0)
+ tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d )
+ tmp2:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ; \
+ rm EUTRA-RRC-Definitions.asn ; \
+ ln -s EUTRA-RRC-Definitions-86.asn EUTRA-RRC-Definitions.asn ; \
+ cd $(OPENAIR_TARGETS)/SIMU/USER/ ; \
+ rm -f $(ASN1_MSG_OBJS1) ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.am.sample ; \
+ rm -f $(L2_OBJS); \
+ rm -f *.o ; \
+ rm -f oaisim ; \
+ touch $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel8 ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10 ; \
+ rm -f $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-rel10-cba ; \
+ /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash \
+ )
+ tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated )
+ endif
endif
-tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; if [ ! -s Makefile.am.sample ] ; then /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash ; fi; if [ ! -s Makefile.inc.generated ] ; then awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated ; fi )
+tmp:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ; \
+ if [ ! -s Makefile.am.sample ] ; then \
+ /bin/bash $(OPENAIR_TARGETS)/SCRIPTS/asn1_generate_rrc_messaging_c_code.bash ;\
+ fi; \
+ if [ ! -s Makefile.inc.generated ] ; then \
+ awk '/converter-sample.c/ {exit} // {print}' Makefile.am.sample > Makefile.inc.generated ; \
+ fi )
include $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated
@@ -47,5 +110,4 @@ EXTRA_CFLAGS += -I. -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES
ASN1_MODULE_OBJS=${ASN_MODULE_SOURCES:.c=.o}
ASN1_CONVERTER_OBJS=${ASN_CONVERTER_SOURCES:.c=.o}
-ASN1_MSG_OBJS=$(ASN1_MODULE_OBJS) $(ASN1_CONVERTER_OBJS)
-
+ASN1_MSG_OBJS=$(ASN1_MODULE_OBJS) $(ASN1_CONVERTER_OBJS)
\ No newline at end of file