From 2c9e12f85783e2bbe50b1f01d3c424e466ce0022 Mon Sep 17 00:00:00 2001
From: winckel <winckel@eurecom.fr>
Date: Thu, 24 Oct 2013 12:17:58 +0000
Subject: [PATCH] Added autodependencies generation for "messages.xml". Added
 rules to use autodependencies for top level objects.

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4270 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
 targets/SIMU/USER/Makefile | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/targets/SIMU/USER/Makefile b/targets/SIMU/USER/Makefile
index 71f96e3e86..8bf08bc125 100644
--- a/targets/SIMU/USER/Makefile
+++ b/targets/SIMU/USER/Makefile
@@ -215,13 +215,6 @@ ITTI_MESSAGES_H = messages_xml.h
 ITTI_MESSAGES_XML = messages.xml
 
 ITTI_MESSAGES_FILE =  $(ITTI_DIR)/intertask_interface_types.h
-
-ITTI_MESSAGES_FILES =  $(ITTI_DIR)/intertask_messages_def.h
-ITTI_MESSAGES_FILES += $(ITTI_DIR)/timer_messages_def.h
-ITTI_MESSAGES_FILES += $(ITTI_DIR)/timer_messages_types.h
-ITTI_MESSAGES_FILES += $(OPENAIR2_DIR)/COMMON/tasks_def.h
-ITTI_MESSAGES_FILES += $(OPENAIR2_DIR)/COMMON/messages_def.h
-ITTI_MESSAGES_FILES += $(OPENAIR2_DIR)/COMMON/messages_types.h
 endif
 
 SIMULATION_OBJS  = $(TOP_DIR)/SIMULATION/TOOLS/gauss.o
@@ -318,14 +311,6 @@ printvars:
 	@echo CFLAGS: $(CFLAGS)
 	@echo Enable PGM: $(ENABLE_PGM)
 
-$(ITTI_MESSAGES_H) : $(ITTI_MESSAGES_XML)
-	@echo "Generating messages_xml.h ..."
-	@sed -e 's/[ ]*//' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/"/' $< > $@
-
-$(ITTI_MESSAGES_XML) : $(ITTI_MESSAGES_FILE) $(ITTI_MESSAGES_FILES)
-	@echo "Generating messages.xml ..."
-	@gccxml $(L2_incl) $(UTILS_incl) $< -fxml=$@
-
 ASN1RELDIR=R9.8
 ifeq ($(USE_MME), R8)
 	ASN1RELDIR=R8.10
@@ -336,9 +321,26 @@ S1AP_DIR=$(OPENAIR2_DIR)/S1AP
 ASN1MESSAGESDIR=$(S1AP_DIR)/MESSAGES
 ASN1DIR=$(ASN1MESSAGESDIR)/ASN1
 
+-include $(ITTI_MESSAGES_XML:.xml:.d)
 -include $(OBJ:.o=.d)
+-include $(OAISIM_OBJS:.o=.d)
+-include $(OAISIM_PAD_OBJS:.o=.d)
 -include $(ASN1_MSG_OBJS1:.o=.d)
 
+$(ITTI_MESSAGES_H) : $(ITTI_MESSAGES_XML)
+	@echo "Generating messages_xml.h ..."
+	@sed -e 's/[ ]*//' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/"/' $< > $@
+
+$(ITTI_MESSAGES_XML) : $(ITTI_MESSAGES_FILE)
+	@echo "Generating messages.xml ..."
+	@gccxml $(L2_incl) $(UTILS_incl) $< -fxml=$@
+	@$(CC) -MM $(L2_incl) $(UTILS_incl) $< > $(basename $<).d
+	@mv -f $(basename $<).d $(basename $<).d.tmp
+	@sed -e 's|.*:|$@:|' < $(basename $<).d.tmp > $(basename $<).d
+	@sed -e 's/.*://' -e 's/\\$$//' < $(basename $<).d.tmp | fmt -1 | \
+	sed -e 's/^ *//' -e 's/$$/:/' >> $(basename $<).d
+	@rm -f $(basename $<).d.tmp
+
 $(OBJ) $(OAISIM_OBJS) $(OAISIM_PAD_OBJS) $(ASN1_MSG_OBJS1) : %.o : %.c
 	@echo Compiling $<
 	@$(CC) -c $(CFLAGS) $(EXTRA_CFLAGS) -DPHY_CONTEXT=1 -I$(TOP_DIR) $(L2_incl) $(UTIL_incl) $(UTILS_incl) -I$(ASN1_MSG_INC) -o $@ $<
-- 
GitLab