Release RMR version 4.9.2

[ric-plt/lib/rmr.git] / test / app_test / Makefile

diff --git a/test/app_test/Makefile b/test/app_test/Makefile
index 670ca1f..782af9f 100644 (file)
--- a/test/app_test/Makefile
+++ b/test/app_test/Makefile
@@ -1,7 +1,7 @@
 #
 #=================================================================================
-#    Copyright (c) 2019 Nokia
-#    Copyright (c) 2018-2019 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,60 +36,29 @@ 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
 
+# ------ all builds are si95 now ---------------------------------------------------
 
-# ------ nng based builds ------------------------------------------------------------
-
-receiver: receiver.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-mt_receiver: receiver.c
-       gcc -I $${C_INCLUDE_PATH:-.} -DMTC $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-lreceiver: lreceiver.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-ex_rts_receiver: ex_rts_receiver.c
-       gcc $(ex_cflags) -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-v_sender: v_sender.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-sender: sender.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-caller: caller.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_nng -lnng -lpthread -lm
-
-lcaller: lcaller.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@  -lrmr_nng -lnng -lpthread -lm
-
-lsender: lsender.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@  -lrmr_nng -lnng -lpthread -lm
-
-
-
-# ----- si test builds -------------------------------------------------------------
-
-sender_si: sender.c
+%:%.c
        gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_si -lpthread -lm
 
-receiver_si: receiver.c
-       gcc -I $${C_INCLUDE_PATH:-.} $< -g -o $@ -lrmr_si -lpthread -lm
+# 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
 
 
 # --------- housekeeping -----------------------------------------------------------
@@ -97,7 +66,7 @@ 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