From ba795a3d2e4a44d957185acbe750dfeda23b1a12 Mon Sep 17 00:00:00 2001 From: skarg Date: Wed, 13 Jan 2010 18:06:42 +0000 Subject: [PATCH] Moved key.c and keylist.c into library for better management. Thanks Piotr! --- bacnet-stack/demo/epics/Makefile | 4 +--- bacnet-stack/demo/epics/makefile.b32 | 4 +--- bacnet-stack/lib/Makefile | 2 ++ bacnet-stack/lib/makefile.b32 | 2 ++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bacnet-stack/demo/epics/Makefile b/bacnet-stack/demo/epics/Makefile index 5e604de2..b91288e2 100644 --- a/bacnet-stack/demo/epics/Makefile +++ b/bacnet-stack/demo/epics/Makefile @@ -44,9 +44,7 @@ endif CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) -SRCS = main.c \ - $(BACNET_SOURCE)/keylist.c \ - $(BACNET_SOURCE)/key.c +SRCS = main.c OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32 index f197052c..5cfe0ca5 100644 --- a/bacnet-stack/demo/epics/makefile.b32 +++ b/bacnet-stack/demo/epics/makefile.b32 @@ -38,9 +38,7 @@ BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) -SRCS = main.c \ - $(BACNET_SOURCE)\keylist.c \ - $(BACNET_SOURCE)\key.c +SRCS = main.c OBJS = $(SRCS:.c=.obj) diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile index 3e24dd6f..06c27b65 100644 --- a/bacnet-stack/lib/Makefile +++ b/bacnet-stack/lib/Makefile @@ -47,6 +47,8 @@ CORE_SRC = \ $(BACNET_CORE)/bactext.c \ $(BACNET_CORE)/datetime.c \ $(BACNET_CORE)/indtext.c \ + $(BACNET_CORE)/key.c \ + $(BACNET_CORE)/keylist.c \ $(BACNET_CORE)/debug.c \ $(BACNET_CORE)/bigend.c \ $(BACNET_CORE)/arf.c \ diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32 index c11fd906..0bc8694f 100644 --- a/bacnet-stack/lib/makefile.b32 +++ b/bacnet-stack/lib/makefile.b32 @@ -36,6 +36,8 @@ INCLUDES = \ -I$(BACNET_HANDLER) CORE1_SRC = $(BACNET_CORE)\indtext.c \ + $(BACNET_CORE)\key.c \ + $(BACNET_CORE)\keylist.c \ $(BACNET_CORE)\debug.c \ $(BACNET_CORE)\bigend.c \ $(BACNET_CORE)\filename.c \