From: Paula Carrillo Date: Wed, 18 Jul 2018 22:31:08 +0000 (-0500) Subject: Adding rules.make to makefiles - PSDK5.0 X-Git-Url: https://git.ti.com/gitweb?p=apps%2Ftidep0079.git;a=commitdiff_plain Adding rules.make to makefiles - PSDK5.0 --- diff --git a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile index 0f1541f..a69d1f3 100755 --- a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile +++ b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile @@ -1,3 +1,9 @@ +ifeq ($(RULES_MAKE), ) +include $(PDK_INSTALL_PATH)/ti/build/Rules.make +else +include $(RULES_MAKE) +endif + ifndef MAKE export MAKE = make endif @@ -432,7 +438,7 @@ clean: -$(RM) EcTimer.o I2C_soc.o UART_soc.o main.o EcMasterDemo/ATEMDemo.o EcMasterDemo/ATEMDemoMain.o EcMasterDemo/Logging.o EcMasterDemo/ecatDemoCommon.o EcMasterDemo/ecatNotification.o EcMasterDemo/selectLinkLayer.o eni/MasterENI.o -$(RM) I2C_soc.d UART_soc.d main.d eni/MasterENI.d -$(RM) EcTimer.d EcMasterDemo/ATEMDemo.d EcMasterDemo/ATEMDemoMain.d EcMasterDemo/Logging.d EcMasterDemo/ecatDemoCommon.d EcMasterDemo/ecatNotification.d EcMasterDemo/selectLinkLayer.d EcMasterDemo.map - -$(RM) EcMasterDemo.out.rprc EcMasterDemo.map + -$(RM) app EcMasterDemo.out.rprc EcMasterDemo.map -@echo 'Finished clean' -@echo ' '' diff --git a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_linux b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_linux index 0f1541f..a69d1f3 100755 --- a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_linux +++ b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_linux @@ -1,3 +1,9 @@ +ifeq ($(RULES_MAKE), ) +include $(PDK_INSTALL_PATH)/ti/build/Rules.make +else +include $(RULES_MAKE) +endif + ifndef MAKE export MAKE = make endif @@ -432,7 +438,7 @@ clean: -$(RM) EcTimer.o I2C_soc.o UART_soc.o main.o EcMasterDemo/ATEMDemo.o EcMasterDemo/ATEMDemoMain.o EcMasterDemo/Logging.o EcMasterDemo/ecatDemoCommon.o EcMasterDemo/ecatNotification.o EcMasterDemo/selectLinkLayer.o eni/MasterENI.o -$(RM) I2C_soc.d UART_soc.d main.d eni/MasterENI.d -$(RM) EcTimer.d EcMasterDemo/ATEMDemo.d EcMasterDemo/ATEMDemoMain.d EcMasterDemo/Logging.d EcMasterDemo/ecatDemoCommon.d EcMasterDemo/ecatNotification.d EcMasterDemo/selectLinkLayer.d EcMasterDemo.map - -$(RM) EcMasterDemo.out.rprc EcMasterDemo.map + -$(RM) app EcMasterDemo.out.rprc EcMasterDemo.map -@echo 'Finished clean' -@echo ' '' diff --git a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_win b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_win index 8ae99d2..9bcd155 100755 --- a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_win +++ b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Debug/makefile_win @@ -1,3 +1,9 @@ +ifeq ($(RULES_MAKE), ) +include $(PDK_INSTALL_PATH)/ti/build/Rules.make +else +include $(RULES_MAKE) +endif + ifndef MAKE export MAKE = gmake endif @@ -397,9 +403,12 @@ BIN_OUTPUTS__QUOTED += \ # All Target -all: EcMasterDemo.out +all: EcLib EcMasterDemo.out # Tool invocations +EcLib: + @$(MAKE) --no-print-directory -C ../../emllICSS/Debug all + EcMasterDemo.out: $(OBJS) $(CMD_SRCS) $(GEN_CMDS) @echo 'Building target: $@' @echo 'Invoking: GNU Linker' @@ -417,12 +426,13 @@ EcMasterDemo.hex: $(EXE_OUTPUTS) # Other Targets clean: + @$(MAKE) --no-print-directory -C ../../emllICSS/Debug clean -$(RM) $(GEN_CMDS__QUOTED)$(GEN_MISC_FILES__QUOTED)$(BIN_OUTPUTS__QUOTED)$(GEN_FILES__QUOTED)$(EXE_OUTPUTS__QUOTED)$(GEN_OPTS__QUOTED) -$(RMDIR) $(GEN_MISC_DIRS__QUOTED) -$(RM) "EcTimer.o" "I2C_soc.o" "UART_soc.o" "main.o" "EcMasterDemo\ATEMDemo.o" "EcMasterDemo\ATEMDemoMain.o" "EcMasterDemo\Logging.o" "EcMasterDemo\ecatDemoCommon.o" "EcMasterDemo\ecatNotification.o" "EcMasterDemo\selectLinkLayer.o" "eni\MasterENI.o" -$(RM) "I2C_soc.d" "UART_soc.d" "main.d" "eni\MasterENI.d" -$(RM) "EcTimer.d" "EcMasterDemo\ATEMDemo.d" "EcMasterDemo\ATEMDemoMain.d" "EcMasterDemo\Logging.d" "EcMasterDemo\ecatDemoCommon.d" "EcMasterDemo\ecatNotification.d" "EcMasterDemo\selectLinkLayer.d" - -$(RM) "EcMasterDemo.out.rprc" "EcMasterDemo.map" + -$(RM) "app" "EcMasterDemo.out.rprc" "EcMasterDemo.map" -@echo 'Finished clean' -@echo ' ' diff --git a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile index dfba8d8..a8f3ada 100755 --- a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile +++ b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile @@ -1,3 +1,9 @@ +ifeq ($(RULES_MAKE), ) +include $(PDK_INSTALL_PATH)/ti/build/Rules.make +else +include $(RULES_MAKE) +endif + ifndef MAKE export MAKE = make endif @@ -432,7 +438,7 @@ clean: -$(RM) EcTimer.o I2C_soc.o UART_soc.o main.o EcMasterDemo/ATEMDemo.o EcMasterDemo/ATEMDemoMain.o EcMasterDemo/Logging.o EcMasterDemo/ecatDemoCommon.o EcMasterDemo/ecatNotification.o EcMasterDemo/selectLinkLayer.o eni/MasterENI.o -$(RM) I2C_soc.d UART_soc.d main.d eni/MasterENI.d -$(RM) EcTimer.d EcMasterDemo/ATEMDemo.d EcMasterDemo/ATEMDemoMain.d EcMasterDemo/Logging.d EcMasterDemo/ecatDemoCommon.d EcMasterDemo/ecatNotification.d EcMasterDemo/selectLinkLayer.d EcMasterDemo.map - -$(RM) EcMasterDemo.out.rprc EcMasterDemo.map + -$(RM) app EcMasterDemo.out.rprc EcMasterDemo.map -@echo 'Finished clean' -@echo ' '' diff --git a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_linux b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_linux index dfba8d8..a8f3ada 100755 --- a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_linux +++ b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_linux @@ -1,3 +1,9 @@ +ifeq ($(RULES_MAKE), ) +include $(PDK_INSTALL_PATH)/ti/build/Rules.make +else +include $(RULES_MAKE) +endif + ifndef MAKE export MAKE = make endif @@ -432,7 +438,7 @@ clean: -$(RM) EcTimer.o I2C_soc.o UART_soc.o main.o EcMasterDemo/ATEMDemo.o EcMasterDemo/ATEMDemoMain.o EcMasterDemo/Logging.o EcMasterDemo/ecatDemoCommon.o EcMasterDemo/ecatNotification.o EcMasterDemo/selectLinkLayer.o eni/MasterENI.o -$(RM) I2C_soc.d UART_soc.d main.d eni/MasterENI.d -$(RM) EcTimer.d EcMasterDemo/ATEMDemo.d EcMasterDemo/ATEMDemoMain.d EcMasterDemo/Logging.d EcMasterDemo/ecatDemoCommon.d EcMasterDemo/ecatNotification.d EcMasterDemo/selectLinkLayer.d EcMasterDemo.map - -$(RM) EcMasterDemo.out.rprc EcMasterDemo.map + -$(RM) app EcMasterDemo.out.rprc EcMasterDemo.map -@echo 'Finished clean' -@echo ' '' diff --git a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_win b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_win index b19744d..3a8b646 100755 --- a/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_win +++ b/EC_Master_SysBios_Am572x/Workspace/SYSBIOS_AM57xx/EcMasterDemo/Release/makefile_win @@ -1,3 +1,9 @@ +ifeq ($(RULES_MAKE), ) +include $(PDK_INSTALL_PATH)/ti/build/Rules.make +else +include $(RULES_MAKE) +endif + ifndef MAKE export MAKE = gmake endif @@ -397,9 +403,13 @@ BIN_OUTPUTS__QUOTED += \ # All Target -all: EcMasterDemo.out +all: EcLib EcMasterDemo.out + # Tool invocations +EcLib: + @$(MAKE) --no-print-directory -C ../../emllICSS/Release all + EcMasterDemo.out: $(OBJS) $(CMD_SRCS) $(GEN_CMDS) @echo 'Building target: $@' @echo 'Invoking: GNU Linker' @@ -417,12 +427,13 @@ EcMasterDemo.hex: $(EXE_OUTPUTS) # Other Targets clean: + @$(MAKE) --no-print-directory -C ../../emllICSS/Release clean -$(RM) $(GEN_CMDS__QUOTED)$(GEN_MISC_FILES__QUOTED)$(BIN_OUTPUTS__QUOTED)$(GEN_FILES__QUOTED)$(EXE_OUTPUTS__QUOTED)$(GEN_OPTS__QUOTED) -$(RMDIR) $(GEN_MISC_DIRS__QUOTED) -$(RM) "EcTimer.o" "I2C_soc.o" "UART_soc.o" "main.o" "EcMasterDemo\ATEMDemo.o" "EcMasterDemo\ATEMDemoMain.o" "EcMasterDemo\Logging.o" "EcMasterDemo\ecatDemoCommon.o" "EcMasterDemo\ecatNotification.o" "EcMasterDemo\selectLinkLayer.o" "eni\MasterENI.o" -$(RM) "I2C_soc.d" "UART_soc.d" "main.d" "eni\MasterENI.d" -$(RM) "EcTimer.d" "EcMasterDemo\ATEMDemo.d" "EcMasterDemo\ATEMDemoMain.d" "EcMasterDemo\Logging.d" "EcMasterDemo\ecatDemoCommon.d" "EcMasterDemo\ecatNotification.d" "EcMasterDemo\selectLinkLayer.d" - -$(RM) "EcMasterDemo.out.rprc" "EcMasterDemo.map" + -$(RM) "app" "EcMasterDemo.out.rprc" "EcMasterDemo.map" -@echo 'Finished clean' -@echo ' '