X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fapp_test%2FMakefile;h=782af9f80ab28251dd162fe685ca47eddb3b6b16;hb=HEAD;hp=fe4cd33607c91b77698113129e2730da8d9f10e8;hpb=02e8d49f42d94b51494977aa0d6f67479f1ceb1c;p=ric-plt%2Flib%2Frmr.git

diff --git a/test/app_test/Makefile b/test/app_test/Makefile
index fe4cd33..782af9f 100644
--- a/test/app_test/Makefile
+++ b/test/app_test/Makefile
@@ -1,7 +1,7 @@
 #
 #=================================================================================
-#    Copyright (c) 2019-2020 Nokia
-#    Copyright (c) 2018-2020 AT&T Intellectual Property.
+#    Copyright (c) 2019-2021 Nokia
+#    Copyright (c) 2018-2021 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #
 
 # NOTE:  this makefile assumes that RMR has been built using the directory .build
-#		at the top most repo directory (e.g. ../../.build). It can be changed 
+#		at the top most repo directory (e.g. ../../.build). It can be changed
 #		if you need to by adding "build_path=<path>" to the make command line.
 #		To use this makefile to build on a system where RMR is already installed
 #		try:    make build_path=/usr/local/lib
@@ -36,39 +36,28 @@ SHELL ?= /bin/ksh
 ex_cflags = $(shell echo $$EX_CFLAGS )
 
 build_path ?= ../../.build
-header_path := $(shell find $(build_path) -name 'rmr.h' |head -1 | sed 's!/rmr/.*!!' )
+header_path := $(shell find $(build_path) -name 'rmr.h' 2>/dev/null |head -1 | sed 's!/rmr/.*!!' )
 
-C_INCLUDE_PATH := $(header_path)
-LD_LIBRARY_PATH=$(build_path):$(build_path)/lib
+# use from environment if there so as to allow build to reference installed base
+C_INCLUDE_PATH ?= $(header_path)
+LD_LIBRARY_PATH ?= $(build_path):$(build_path)/lib
 LIBRARY_PATH = $(LD_LIBRARY_PATH)
 
 # These programmes are designed to test some basic application level functions
-# from the perspective of two, or more, communicating processes. 
+# from the perspective of two, or more, communicating processes.
 
 
-.PHONY: all all_si
-all: sender receiver caller mt_receiver v_sender ex_rts_receiver
+.PHONY: all
+all: sender receiver caller mt_receiver v_sender ex_rts_receiver lreceiver lsender
 
-all_si: sender_si receiver_si
 
-
-# ------ nng based builds ------------------------------------------------------------
+# ------ all builds are si95 now ---------------------------------------------------
 
 %:%.c
-	gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-# special build as it reuses an existing source module
-mt_receiver: receiver.c
-	gcc -I $${C_INCLUDE_PATH:-.} -DMTC $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-
-# ----- si test builds -------------------------------------------------------------
-
-%_si : %.c
 	gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_si -lpthread -lm
 
-# explicit rule because there is no mt_recever.c
-mt_receiver_si: receiver.c
+# special build rule as it reuses an existing source module with a sepcial define
+mt_receiver: receiver.c
 	gcc -I $${C_INCLUDE_PATH:-.} -DMTC $< -g -o $@ -lrmr_si -lpthread -lm
 
 
@@ -77,7 +66,7 @@ mt_receiver_si: receiver.c
 # clean removes intermediates; nuke removes everything that can be built
 .PHONY: clean nuke
 clean:
-	rm -f *.o
+	rm -f *.o *stash.inc
 
 nuke: clean
-	rm -f sender receiver caller mt_receiver
+	rm -f sender receiver caller mt_receiver v_sender ex_rts_receiver lreceiver lsender