From fe2c7cd00a8155c8f153d3b07211fa2d81df19f2 Mon Sep 17 00:00:00 2001 From: skarg Date: Fri, 12 Oct 2007 01:39:31 +0000 Subject: [PATCH] Updated makefile for I-Am file split. --- bacnet-stack/ports/at91sam7s/makefile | 60 +++++++++++---------- bacnet-stack/ports/atmega168/Makefile | 78 ++++++++++++++------------- 2 files changed, 71 insertions(+), 67 deletions(-) diff --git a/bacnet-stack/ports/at91sam7s/makefile b/bacnet-stack/ports/at91sam7s/makefile index 8e82b4b9..0eb36626 100644 --- a/bacnet-stack/ports/at91sam7s/makefile +++ b/bacnet-stack/ports/at91sam7s/makefile @@ -19,11 +19,11 @@ BACNET_FLAGS += -DMAX_APDU=480 BACNET_FLAGS += -DCRC_USE_TABLE #BACNET_FLAGS += -DDLMSTP_TEST -BACNET_ROOT = ../.. +BACNET_CORE = ../../src INCLUDES = -I. -INCLUDES += -I$(BACNET_ROOT) -INCLUDES += -I$(BACNET_ROOT)/demo/handler -INCLUDES += -I$(BACNET_ROOT)/demo/object +INCLUDES += -I$(BACNET_CORE) +INCLUDES += -I$(BACNET_CORE)/demo/handler +INCLUDES += -I$(BACNET_CORE)/demo/object #OPTIMIZATION = -O0 OPTIMIZATION = -Os CFLAGS = -fno-common $(INCLUDES) $(BACNET_FLAGS) -Wall -g @@ -45,7 +45,7 @@ PORTSRC = main.c \ blinker.c \ rs485.c \ dlmstp.c \ - $(BACNET_ROOT)/crc.c + $(BACNET_CORE)/crc.c DEMOSRC = ai.c \ av.c \ @@ -54,29 +54,31 @@ DEMOSRC = ai.c \ h_rp.c \ h_wp.c \ device.c \ - $(BACNET_ROOT)/demo/handler/txbuf.c \ - $(BACNET_ROOT)/demo/handler/h_whois.c \ - $(BACNET_ROOT)/demo/handler/h_rd.c \ - $(BACNET_ROOT)/demo/handler/h_dcc.c + $(BACNET_CORE)/demo/handler/txbuf.c \ + $(BACNET_CORE)/demo/handler/h_whois.c \ + $(BACNET_CORE)/demo/handler/h_rd.c \ + $(BACNET_CORE)/demo/handler/h_dcc.c -CORESRC = $(BACNET_ROOT)/npdu.c \ - $(BACNET_ROOT)/bacint.c \ - $(BACNET_ROOT)/apdu.c \ - $(BACNET_ROOT)/bacdcode.c \ - $(BACNET_ROOT)/bacaddr.c \ - $(BACNET_ROOT)/bacstr.c \ - $(BACNET_ROOT)/abort.c \ - $(BACNET_ROOT)/bacerror.c \ - $(BACNET_ROOT)/reject.c \ - $(BACNET_ROOT)/bacapp.c \ - $(BACNET_ROOT)/datetime.c \ - $(BACNET_ROOT)/rp.c \ - $(BACNET_ROOT)/wp.c \ - $(BACNET_ROOT)/dcc.c \ - $(BACNET_ROOT)/rd.c \ - $(BACNET_ROOT)/whois.c \ - $(BACNET_ROOT)/iam.c \ - $(BACNET_ROOT)/version.c +CORESRC = $(BACNET_CORE)/npdu.c \ + $(BACNET_CORE)/bacint.c \ + $(BACNET_CORE)/apdu.c \ + $(BACNET_CORE)/bacdcode.c \ + $(BACNET_CORE)/bacaddr.c \ + $(BACNET_CORE)/bacstr.c \ + $(BACNET_CORE)/abort.c \ + $(BACNET_CORE)/bacerror.c \ + $(BACNET_CORE)/reject.c \ + $(BACNET_CORE)/bacapp.c \ + $(BACNET_CORE)/datetime.c \ + $(BACNET_CORE)/rp.c \ + $(BACNET_CORE)/wp.c \ + $(BACNET_CORE)/dcc.c \ + $(BACNET_CORE)/rd.c \ + $(BACNET_CORE)/whois.c \ + $(BACNET_CORE)/iam/iam_client.c \ + $(BACNET_CORE)/iam/iam_server.c \ + $(BACNET_CORE)/iam/iam_send.c \ + $(BACNET_CORE)/version.c CSRC = $(PORTSRC) $(DEMOSRC) #CSRC = $(PORTSRC) @@ -107,10 +109,10 @@ $(LIBRARY): $(COREOBJ) Makefile #main.o: # $(CC) -c $(CFLAGS) $*.c -o $@ # -#$(BACNET_ROOT)/npdu.o: +#$(BACNET_CORE)/npdu.o: # $(CC) -c $(CFLAGS) $*.c -o $@ # -#$(BACNET_ROOT)/apdu.o: +#$(BACNET_CORE)/apdu.o: # $(CC) -c $(CFLAGS) $*.c -o $@ .c.o: diff --git a/bacnet-stack/ports/atmega168/Makefile b/bacnet-stack/ports/atmega168/Makefile index 8f9901ac..433a8b2f 100644 --- a/bacnet-stack/ports/atmega168/Makefile +++ b/bacnet-stack/ports/atmega168/Makefile @@ -14,56 +14,58 @@ OBJDUMP = avr-objdump SIZE = avr-size # Source locations -BACNET_ROOT = ../.. +BACNET_CORE = ../../src CSRC = main.c \ timer.c \ rs485.c \ dlmstp.c \ - $(BACNET_ROOT)/crc.c + $(BACNET_CORE)/crc.c DEMOSRC = h_rp.c \ h_wp.c \ device.c \ ai.c \ - $(BACNET_ROOT)/demo/handler/txbuf.c \ - $(BACNET_ROOT)/demo/handler/h_whois.c \ - $(BACNET_ROOT)/demo/handler/h_rd.c \ - $(BACNET_ROOT)/demo/handler/h_dcc.c + $(BACNET_CORE)/demo/handler/txbuf.c \ + $(BACNET_CORE)/demo/handler/h_whois.c \ + $(BACNET_CORE)/demo/handler/h_rd.c \ + $(BACNET_CORE)/demo/handler/h_dcc.c CORESRC = \ - $(BACNET_ROOT)/apdu.c \ - $(BACNET_ROOT)/npdu.c \ - $(BACNET_ROOT)/bacdcode.c \ - $(BACNET_ROOT)/bacint.c \ - $(BACNET_ROOT)/bacapp.c \ - $(BACNET_ROOT)/bacprop.c \ - $(BACNET_ROOT)/bacstr.c \ - $(BACNET_ROOT)/bactext.c \ - $(BACNET_ROOT)/datetime.c \ - $(BACNET_ROOT)/indtext.c \ - $(BACNET_ROOT)/bigend.c \ - $(BACNET_ROOT)/arf.c \ - $(BACNET_ROOT)/awf.c \ - $(BACNET_ROOT)/cov.c \ - $(BACNET_ROOT)/dcc.c \ - $(BACNET_ROOT)/iam.c \ - $(BACNET_ROOT)/ihave.c \ - $(BACNET_ROOT)/rd.c \ - $(BACNET_ROOT)/rp.c \ - $(BACNET_ROOT)/rpm.c \ - $(BACNET_ROOT)/timesync.c \ - $(BACNET_ROOT)/whohas.c \ - $(BACNET_ROOT)/whois.c \ - $(BACNET_ROOT)/wp.c \ - $(BACNET_ROOT)/abort.c \ - $(BACNET_ROOT)/reject.c \ - $(BACNET_ROOT)/bacerror.c \ - $(BACNET_ROOT)/filename.c \ - $(BACNET_ROOT)/tsm.c \ - $(BACNET_ROOT)/bacaddr.c \ - $(BACNET_ROOT)/address.c \ - $(BACNET_ROOT)/version.c + $(BACNET_CORE)/apdu.c \ + $(BACNET_CORE)/npdu.c \ + $(BACNET_CORE)/bacdcode.c \ + $(BACNET_CORE)/bacint.c \ + $(BACNET_CORE)/bacapp.c \ + $(BACNET_CORE)/bacprop.c \ + $(BACNET_CORE)/bacstr.c \ + $(BACNET_CORE)/bactext.c \ + $(BACNET_CORE)/datetime.c \ + $(BACNET_CORE)/indtext.c \ + $(BACNET_CORE)/bigend.c \ + $(BACNET_CORE)/arf.c \ + $(BACNET_CORE)/awf.c \ + $(BACNET_CORE)/cov.c \ + $(BACNET_CORE)/dcc.c \ + $(BACNET_CORE)/iam/iam_client.c \ + $(BACNET_CORE)/iam/iam_server.c \ + $(BACNET_CORE)/iam/iam_send.c \ + $(BACNET_CORE)/ihave.c \ + $(BACNET_CORE)/rd.c \ + $(BACNET_CORE)/rp.c \ + $(BACNET_CORE)/rpm.c \ + $(BACNET_CORE)/timesync.c \ + $(BACNET_CORE)/whohas.c \ + $(BACNET_CORE)/whois.c \ + $(BACNET_CORE)/wp.c \ + $(BACNET_CORE)/abort.c \ + $(BACNET_CORE)/reject.c \ + $(BACNET_CORE)/bacerror.c \ + $(BACNET_CORE)/filename.c \ + $(BACNET_CORE)/tsm.c \ + $(BACNET_CORE)/bacaddr.c \ + $(BACNET_CORE)/address.c \ + $(BACNET_CORE)/version.c ## Include Directories INCLUDES = -I. -I../.. -I../../demo/object -I../../demo/handler