dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup Makefile build on Win32 (#222)

Browse Source 
Co-authored-by: Steve Karg <skarg@users.sourceforge.net>
This commit is contained in:
Steve Karg
2022-01-30 13:56:16 -06:00
committed by GitHub
parent 71604664d5
commit 65c7425e0e
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+32 -9
View File
@@ -11,15 +11,15 @@ all: apps
.PHONY: bsd .PHONY: bsd
bsd: bsd:
$(MAKE) BACNET_PORT=bsd -C apps all $(MAKE) BACNET_PORT=bsd -s -C apps all
.PHONY: win32 .PHONY: win32
win32: win32:
$(MAKE) BACNET_PORT=win32 -C apps all $(MAKE) BACNET_PORT=win32 -s -C apps all
.PHONY: mstpwin32 .PHONY: mstpwin32
mstpwin32: mstpwin32:
$(MAKE) BACDL=mstp BACNET_PORT=win32 -C apps all $(MAKE) BACDL=mstp BACNET_PORT=win32 -s -C apps all
.PHONY: mstp .PHONY: mstp
mstp: mstp:
@@ -148,30 +148,53 @@ router-mstp:
ports: atmega168 bdk-atxx4-mstp at91sam7s stm32f10x ports: atmega168 bdk-atxx4-mstp at91sam7s stm32f10x
@echo "Built the ARM7 and AVR ports" @echo "Built the ARM7 and AVR ports"
.PHONY: ports-clean
ports-clean: atmega168-clean bdk-atxx4-mstp-clean at91sam7s-clean stm32f10x-clean
.PHONY: atmega168 .PHONY: atmega168
atmega168: ports/atmega168/Makefile atmega168: ports/atmega168/Makefile
$(MAKE) -s -C ports/atmega168 clean all $(MAKE) -s -C ports/atmega168 clean all
.PHONY: atmega168-clean
atmega168-clean: ports/atmega168/Makefile
$(MAKE) -s -C ports/atmega168 clean
.PHONY: bdk-atxx4-mstp
bdk-atxx4-mstp: ports/bdk-atxx4-mstp/Makefile
$(MAKE) -s -C ports/bdk-atxx4-mstp clean all
.PHONY: bdk-atxx4-mstp-clean
bdk-atxx4-mstp-clean: ports/bdk-atxx4-mstp/Makefile
$(MAKE) -s -C ports/bdk-atxx4-mstp clean
.PHONY: at91sam7s .PHONY: at91sam7s
at91sam7s: ports/at91sam7s/Makefile at91sam7s: ports/at91sam7s/Makefile
$(MAKE) -C ports/at91sam7s clean all $(MAKE) -s -C ports/at91sam7s clean all
.PHONY: at91sam7s-clean
at91sam7s-clean: ports/at91sam7s/Makefile
$(MAKE) -s -C ports/at91sam7s clean
.PHONY: stm32f10x .PHONY: stm32f10x
stm32f10x: ports/stm32f10x/Makefile stm32f10x: ports/stm32f10x/Makefile
$(MAKE) -s -C ports/stm32f10x clean all $(MAKE) -s -C ports/stm32f10x clean all
.PHONY: stm32f10x-clean
stm32f10x-clean: ports/stm32f10x/Makefile
$(MAKE) -s -C ports/stm32f10x clean
.PHONY: stm32f4xx .PHONY: stm32f4xx
stm32f4xx: ports/stm32f4xx/Makefile stm32f4xx: ports/stm32f4xx/Makefile
$(MAKE) -s -C ports/stm32f4xx clean all $(MAKE) -s -C ports/stm32f4xx clean all
.PHONY: stm32f4xx-clean
stm32f4xx-clean: ports/stm32f4xx/Makefile
$(MAKE) -s -C ports/stm32f4xx clean
.PHONY: mstpsnap .PHONY: mstpsnap
mstpsnap: ports/linux/mstpsnap.mak mstpsnap: ports/linux/mstpsnap.mak
$(MAKE) -s -C ports/linux -f mstpsnap.mak clean all $(MAKE) -s -C ports/linux -f mstpsnap.mak clean all
.PHONY: bdk-atxx4-mstp
bdk-atxx4-mstp: ports/bdk-atxx4-mstp/Makefile
$(MAKE) -s -C ports/bdk-atxx4-mstp clean all
.PHONY: pretty .PHONY: pretty
pretty: pretty:
find ./src -iname *.h -o -iname *.c -exec \ find ./src -iname *.h -o -iname *.c -exec \
@@ -208,7 +231,7 @@ cppcheck:
cppcheck $(CPPCHECK_OPTIONS) --quiet --force ./src/ cppcheck $(CPPCHECK_OPTIONS) --quiet --force ./src/
.PHONY: clean .PHONY: clean
clean: clean: ports-clean
$(MAKE) -s -C src clean $(MAKE) -s -C src clean
$(MAKE) -s -C apps clean $(MAKE) -s -C apps clean
$(MAKE) -s -C apps/router clean $(MAKE) -s -C apps/router clean
apps/Makefile
-2
View File
@@ -106,8 +106,6 @@ BACNET_DEFINES += -DBIP_DEBUG
endif endif
endif endif
# If BACNET_DEFINES has not already been set, configure to your needs here
BACNET_DEFINES ?=
BACNET_DEFINES += -DPRINT_ENABLED=1 BACNET_DEFINES += -DPRINT_ENABLED=1
BACNET_DEFINES += -DBACAPP_ALL BACNET_DEFINES += -DBACAPP_ALL
BACNET_DEFINES += -DBACFILE BACNET_DEFINES += -DBACFILE
apps/readprop/main.c
-1
View File
@@ -53,7 +53,6 @@
/* some demo stuff needed */ /* some demo stuff needed */
#include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/filename.h"
#include "bacnet/basic/services.h" #include "bacnet/basic/services.h"
#include "bacnet/basic/services.h"
#include "bacnet/basic/tsm/tsm.h" #include "bacnet/basic/tsm/tsm.h"
#include "bacnet/datalink/dlenv.h" #include "bacnet/datalink/dlenv.h"