Commit 060132b2 authored by Raymond Knopp's avatar Raymond Knopp

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5497 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 416ee836
...@@ -206,9 +206,11 @@ $(LFDS_LIB): ...@@ -206,9 +206,11 @@ $(LFDS_LIB):
@if [ ! -d $(LFDS_OBJ_DIR)/obj ]; then mkdir -p $(LFDS_OBJ_DIR)/obj; fi; @if [ ! -d $(LFDS_OBJ_DIR)/obj ]; then mkdir -p $(LFDS_OBJ_DIR)/obj; fi;
$(MAKE) -C $(LFDS_DIR) -f makefile.linux OUTDIR=$(LFDS_OBJ_DIR) $(MAKE) -C $(LFDS_DIR) -f makefile.linux OUTDIR=$(LFDS_OBJ_DIR)
ifeq ($(USRP),1)
$(USRP_OBJ):$(USRP_FILE_OBJ) $(USRP_OBJ):$(USRP_FILE_OBJ)
@echo Compiling $< # @echo Compiling $<
@$(CXX) -c $(USRP_CFLAGS) $(USRP_FILE_OBJ) -o $(USRP_OBJ) @$(CXX) -c $(USRP_CFLAGS) $(USRP_FILE_OBJ) -o $(USRP_OBJ)
endif
ifeq ($(RTAI),1) ifeq ($(RTAI),1)
$(RTAI_OBJ) lte-softmodem.o: %.o : %.c $(RTAI_OBJ) lte-softmodem.o: %.o : %.c
...@@ -231,7 +233,7 @@ endif ...@@ -231,7 +233,7 @@ endif
ifeq ($(RTAI),1) ifeq ($(RTAI),1)
$(OBJ) $(ASN1_MSG_OBJS1): %.o : %.c $(OBJ) $(ASN1_MSG_OBJS1): %.o : %.c
else else
$(OBJ) $(ASN1_MSG_OBJS1) lte-enb.o lte-softmodem.o: %.o : %.c $(OBJ) $(ASN1_MSG_OBJS1) lte-softmodem.o: %.o : %.c
endif endif
@echo Compiling $< ... @echo Compiling $< ...
...@@ -248,10 +250,6 @@ ifeq ($(XFORMS),1) ...@@ -248,10 +250,6 @@ ifeq ($(XFORMS),1)
OBJ_EMOS+=lte_scope.o OBJ_EMOS+=lte_scope.o
endif endif
$(USRP_OBJ):$(USRP_FILE_OBJ)
@echo Compiling openair_usrp.cpp
@$(CXX) -c $(USRP_CFLAGS) $(USRP_FILE_OBJ) -o $(USRP_OBJ)
condtest: condtest.c condtest: condtest.c
$(CC) $(CFLAGS) $(LDFLAGS) condtest.c -o condtest $(CC) $(CFLAGS) $(LDFLAGS) condtest.c -o condtest
...@@ -348,7 +346,7 @@ run_eNB2: ...@@ -348,7 +346,7 @@ run_eNB2:
rtai-load eNB2 --verbose rtai-load eNB2 --verbose
clean: common-clean clean: common-clean
@$(RM_F_V) $(OBJ) $(RTAI_OBJ) $(OBJ_EMOS) $(OBJ_SYNC) @$(RM_F_V) $(OBJ) $(RTAI_OBJ) $(OBJ_EMOS) $(OBJ_SYNC) $(USRP_OBJ)
@$(RM_F_V) $(OBJ:.o=.d) $(RTAI_OBJ:.o=.d) $(OBJ_EMOS:.o=.d) $(OBJ_SYNC:.o=.d) @$(RM_F_V) $(OBJ:.o=.d) $(RTAI_OBJ:.o=.d) $(OBJ_EMOS:.o=.d) $(OBJ_SYNC:.o=.d)
@$(RM_F_V) $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1_msg.o $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1_msg.d @$(RM_F_V) $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1_msg.o $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1_msg.d
@$(RM_F_V) lte-enb.o lte-enb.d lte-softmodem.o lte-softmodem.d @$(RM_F_V) lte-enb.o lte-enb.d lte-softmodem.o lte-softmodem.d
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment