From 7f58784576e95ec7716db2bec4d9dcb0750aa454 Mon Sep 17 00:00:00 2001 From: skarg Date: Mon, 9 Dec 2013 20:06:20 +0000 Subject: [PATCH] updated makefiles for unit tests to include prolist.c and lighting.c recently added modules --- bacnet-stack/demo/object/ai.mak | 2 ++ bacnet-stack/demo/object/ao.mak | 2 ++ bacnet-stack/demo/object/av.mak | 2 ++ bacnet-stack/demo/object/bi.mak | 2 ++ bacnet-stack/demo/object/bo.mak | 2 ++ bacnet-stack/demo/object/bv.mak | 2 ++ bacnet-stack/demo/object/csv.mak | 2 ++ bacnet-stack/demo/object/device.mak | 2 ++ bacnet-stack/demo/object/lc.mak | 2 ++ bacnet-stack/demo/object/lo.mak | 2 ++ bacnet-stack/demo/object/lsp.mak | 2 ++ bacnet-stack/demo/object/ms-input.mak | 2 ++ bacnet-stack/demo/object/mso.mak | 2 ++ bacnet-stack/demo/object/msv.mak | 2 ++ bacnet-stack/include/handlers.h | 1 + bacnet-stack/test/address.mak | 1 + bacnet-stack/test/bacapp.mak | 1 + bacnet-stack/test/cov.mak | 1 + bacnet-stack/test/datetime.mak | 1 + bacnet-stack/test/event.mak | 1 + bacnet-stack/test/getevent.mak | 1 + bacnet-stack/test/lso.mak | 2 ++ bacnet-stack/test/ptransfer.mak | 1 + bacnet-stack/test/rpm.mak | 1 + bacnet-stack/test/timesync.mak | 1 + bacnet-stack/test/wp.mak | 1 + 26 files changed, 41 insertions(+) diff --git a/bacnet-stack/demo/object/ai.mak b/bacnet-stack/demo/object/ai.mak index 9699be3b..399abd7f 100755 --- a/bacnet-stack/demo/object/ai.mak +++ b/bacnet-stack/demo/object/ai.mak @@ -17,6 +17,8 @@ SRCS = ai.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ + $(SRC_DIR)/proplist.c \ $(TEST_DIR)/ctest.c TARGET = analog_input diff --git a/bacnet-stack/demo/object/ao.mak b/bacnet-stack/demo/object/ao.mak index 2bcd77b8..6ca1c4e8 100755 --- a/bacnet-stack/demo/object/ao.mak +++ b/bacnet-stack/demo/object/ao.mak @@ -13,6 +13,8 @@ SRCS = ao.c \ $(SRC_DIR)/bacstr.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ diff --git a/bacnet-stack/demo/object/av.mak b/bacnet-stack/demo/object/av.mak index ca22cb45..1b93078c 100644 --- a/bacnet-stack/demo/object/av.mak +++ b/bacnet-stack/demo/object/av.mak @@ -13,6 +13,8 @@ SRCS = av.c \ $(SRC_DIR)/bacstr.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ diff --git a/bacnet-stack/demo/object/bi.mak b/bacnet-stack/demo/object/bi.mak index 03089512..4e6d1cf7 100644 --- a/bacnet-stack/demo/object/bi.mak +++ b/bacnet-stack/demo/object/bi.mak @@ -16,6 +16,8 @@ SRCS = bi.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = binary_input diff --git a/bacnet-stack/demo/object/bo.mak b/bacnet-stack/demo/object/bo.mak index bbf4f3b7..43431f83 100755 --- a/bacnet-stack/demo/object/bo.mak +++ b/bacnet-stack/demo/object/bo.mak @@ -15,6 +15,8 @@ SRCS = bo.c \ $(SRC_DIR)/datetime.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/indtext.c \ $(TEST_DIR)/ctest.c diff --git a/bacnet-stack/demo/object/bv.mak b/bacnet-stack/demo/object/bv.mak index 3c5cfe75..96948ba8 100644 --- a/bacnet-stack/demo/object/bv.mak +++ b/bacnet-stack/demo/object/bv.mak @@ -16,6 +16,8 @@ SRCS = bv.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = binary_value diff --git a/bacnet-stack/demo/object/csv.mak b/bacnet-stack/demo/object/csv.mak index 107f469c..1bf1ff6e 100644 --- a/bacnet-stack/demo/object/csv.mak +++ b/bacnet-stack/demo/object/csv.mak @@ -16,6 +16,8 @@ SRCS = csv.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = characterstring_value diff --git a/bacnet-stack/demo/object/device.mak b/bacnet-stack/demo/object/device.mak index 2fb03f12..369742e6 100644 --- a/bacnet-stack/demo/object/device.mak +++ b/bacnet-stack/demo/object/device.mak @@ -21,6 +21,8 @@ SRCS = device.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/apdu.c \ $(SRC_DIR)/address.c \ $(SRC_DIR)/bacaddr.c \ diff --git a/bacnet-stack/demo/object/lc.mak b/bacnet-stack/demo/object/lc.mak index 10fa47ef..7d965390 100644 --- a/bacnet-stack/demo/object/lc.mak +++ b/bacnet-stack/demo/object/lc.mak @@ -16,6 +16,8 @@ SRCS = lc.c ao.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = load_control diff --git a/bacnet-stack/demo/object/lo.mak b/bacnet-stack/demo/object/lo.mak index 9bc593b2..b611670b 100755 --- a/bacnet-stack/demo/object/lo.mak +++ b/bacnet-stack/demo/object/lo.mak @@ -16,6 +16,8 @@ SRCS = lo.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = lighting_output diff --git a/bacnet-stack/demo/object/lsp.mak b/bacnet-stack/demo/object/lsp.mak index 7e4e3a8b..caefcc34 100755 --- a/bacnet-stack/demo/object/lsp.mak +++ b/bacnet-stack/demo/object/lsp.mak @@ -16,6 +16,8 @@ SRCS = lsp.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = life_safety_point diff --git a/bacnet-stack/demo/object/ms-input.mak b/bacnet-stack/demo/object/ms-input.mak index 9d8de632..0a124e17 100644 --- a/bacnet-stack/demo/object/ms-input.mak +++ b/bacnet-stack/demo/object/ms-input.mak @@ -16,6 +16,8 @@ SRCS = ms-input.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = multistate_input diff --git a/bacnet-stack/demo/object/mso.mak b/bacnet-stack/demo/object/mso.mak index d38fabb7..b66745cf 100644 --- a/bacnet-stack/demo/object/mso.mak +++ b/bacnet-stack/demo/object/mso.mak @@ -16,6 +16,8 @@ SRCS = mso.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(TEST_DIR)/ctest.c TARGET = multistate_output diff --git a/bacnet-stack/demo/object/msv.mak b/bacnet-stack/demo/object/msv.mak index fe0df4ba..49e67182 100644 --- a/bacnet-stack/demo/object/msv.mak +++ b/bacnet-stack/demo/object/msv.mak @@ -15,6 +15,8 @@ SRCS = msv.c \ $(SRC_DIR)/datetime.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/indtext.c \ $(TEST_DIR)/ctest.c diff --git a/bacnet-stack/include/handlers.h b/bacnet-stack/include/handlers.h index 8ca47942..e9d31eb0 100644 --- a/bacnet-stack/include/handlers.h +++ b/bacnet-stack/include/handlers.h @@ -31,6 +31,7 @@ #include "bacdef.h" #include "apdu.h" #include "bacapp.h" +#include "ptransfer.h" #include "rd.h" #include "rp.h" #include "rpm.h" diff --git a/bacnet-stack/test/address.mak b/bacnet-stack/test/address.mak index 0940b39e..6b48893b 100644 --- a/bacnet-stack/test/address.mak +++ b/bacnet-stack/test/address.mak @@ -14,6 +14,7 @@ SRCS = $(SRC_DIR)/address.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ ctest.c diff --git a/bacnet-stack/test/bacapp.mak b/bacnet-stack/test/bacapp.mak index 32211ad2..dc0744a7 100644 --- a/bacnet-stack/test/bacapp.mak +++ b/bacnet-stack/test/bacapp.mak @@ -15,6 +15,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/datetime.c \ $(SRC_DIR)/bactext.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/indtext.c \ ctest.c diff --git a/bacnet-stack/test/cov.mak b/bacnet-stack/test/cov.mak index 684db809..5ed5c486 100644 --- a/bacnet-stack/test/cov.mak +++ b/bacnet-stack/test/cov.mak @@ -12,6 +12,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/datetime.c \ $(SRC_DIR)/bacapp.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/cov.c \ diff --git a/bacnet-stack/test/datetime.mak b/bacnet-stack/test/datetime.mak index a1a58a46..21b6c3e1 100644 --- a/bacnet-stack/test/datetime.mak +++ b/bacnet-stack/test/datetime.mak @@ -12,6 +12,7 @@ SRCS = $(SRC_DIR)/datetime.c \ $(SRC_DIR)/bacstr.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/bacapp.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ ctest.c diff --git a/bacnet-stack/test/event.mak b/bacnet-stack/test/event.mak index 487d99b7..ceea0081 100644 --- a/bacnet-stack/test/event.mak +++ b/bacnet-stack/test/event.mak @@ -15,6 +15,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/memcopy.c \ $(SRC_DIR)/timestamp.c \ $(SRC_DIR)/bacpropstates.c \ diff --git a/bacnet-stack/test/getevent.mak b/bacnet-stack/test/getevent.mak index 2e1297d4..22b79874 100644 --- a/bacnet-stack/test/getevent.mak +++ b/bacnet-stack/test/getevent.mak @@ -12,6 +12,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/timestamp.c \ diff --git a/bacnet-stack/test/lso.mak b/bacnet-stack/test/lso.mak index 8f1a2064..bf754eec 100644 --- a/bacnet-stack/test/lso.mak +++ b/bacnet-stack/test/lso.mak @@ -15,6 +15,8 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/proplist.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/memcopy.c \ $(SRC_DIR)/lso.c \ ctest.c diff --git a/bacnet-stack/test/ptransfer.mak b/bacnet-stack/test/ptransfer.mak index 5b5153f4..8a5e1a81 100644 --- a/bacnet-stack/test/ptransfer.mak +++ b/bacnet-stack/test/ptransfer.mak @@ -14,6 +14,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bacstr.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/ptransfer.c \ ctest.c diff --git a/bacnet-stack/test/rpm.mak b/bacnet-stack/test/rpm.mak index 10cd06ba..573cb843 100644 --- a/bacnet-stack/test/rpm.mak +++ b/bacnet-stack/test/rpm.mak @@ -15,6 +15,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/memcopy.c \ $(SRC_DIR)/rpm.c \ ctest.c diff --git a/bacnet-stack/test/timesync.mak b/bacnet-stack/test/timesync.mak index b7befd9c..26bd1733 100644 --- a/bacnet-stack/test/timesync.mak +++ b/bacnet-stack/test/timesync.mak @@ -27,6 +27,7 @@ SRCS := $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/timesync.c \ ctest.c diff --git a/bacnet-stack/test/wp.mak b/bacnet-stack/test/wp.mak index 4d8bd055..d35c6756 100644 --- a/bacnet-stack/test/wp.mak +++ b/bacnet-stack/test/wp.mak @@ -11,6 +11,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \ $(SRC_DIR)/bacstr.c \ $(SRC_DIR)/bacreal.c \ $(SRC_DIR)/datetime.c \ + $(SRC_DIR)/lighting.c \ $(SRC_DIR)/bacapp.c \ $(SRC_DIR)/bactext.c \ $(SRC_DIR)/indtext.c \