From: Michal Sojka <michal.sojka@cvut.cz>
Date: Sun, 8 Sep 2019 21:02:45 +0000 (+0200)
Subject: Rename rtiostream_serial.c to rtiostream_serial_rpp.c
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/pes-rpp/rpp-simulink.git/commitdiff_plain/1514d427b0846e83ddea59acc035f411035cbdf5?ds=sidebyside

Rename rtiostream_serial.c to rtiostream_serial_rpp.c

The reason is that the makefile (.tmf) tried to compile
<MATLAB>/rtw/c/src/rtiostream/rtiostreamserial/rtiostream_serial.c
instead of rtiostream_serial.c from our rpp directory and it fails. By
renaming the file Makefile finds only our file.
---

diff --git a/rpp/rpp/.gitattributes b/rpp/rpp/.gitattributes
index a150324..86cab0a 100644
--- a/rpp/rpp/.gitattributes
+++ b/rpp/rpp/.gitattributes
@@ -11,7 +11,7 @@
 /rpp_setup.m	eaton
 /rpp_simulink_runtime.h	eaton
 /rpp_srmain.tlc	eaton
-/rtiostream_serial.c	eaton
+/rtiostream_serial_rpp.c	eaton
 /rtiostream_tcpip.c	eaton
 /sl_customization.m	eaton
 /target_tools.mk	eaton
diff --git a/rpp/rpp/rpp.tmf b/rpp/rpp/rpp.tmf
index 6462899..2c24b05 100644
--- a/rpp/rpp/rpp.tmf
+++ b/rpp/rpp/rpp.tmf
@@ -103,7 +103,7 @@ ifeq ($(EXT_MODE),1)
   endif
   ifeq ($(EXTMODE_TRANSPORT),1) #serial
     EXT_SRC += ext_svr_serial_transport.c ext_serial_pkt.c
-    EXT_SRC += rtiostream_serial_interface.c rtiostream_serial.c
+    EXT_SRC += rtiostream_serial_interface.c rtiostream_serial_rpp.c
   endif
   ifeq ($(TMW_EXTMODE_TESTING),1)
     EXT_SRC     += ext_test.c
diff --git a/rpp/rpp/rtiostream_serial.c b/rpp/rpp/rtiostream_serial_rpp.c
similarity index 100%
rename from rpp/rpp/rtiostream_serial.c
rename to rpp/rpp/rtiostream_serial_rpp.c