merged datalink814.

df_datalink_sp/build/makefile

@@ -12,6 +12,7 @@ RM := rm -rf
 # All of the sources participating in the build are defined here
 -include sources.mk
 -include src/util/subdir.mk
+-include src/time_ctrl/subdir.mk
 -include src/systembus/subdir.mk
 -include src/networking/phy_layer/subdir.mk
 -include src/networking/link_layer/geometry/subdir.mk
@@ -42,24 +43,24 @@ endif
 
 # Add inputs and outputs from these tool invocations to the build variables 
 ELFSIZE += \
-df_datalink.elf.size \
+df_datalink_sp.elf.size \
 
 
 # All Target
 all: pre-build main-build
 
 # Main-build Target
-main-build: df_datalink.elf secondary-outputs
+main-build: df_datalink_sp.elf secondary-outputs
 
 # Tool invocations
-df_datalink.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
+df_datalink_sp.elf: $(OBJS) ../src/lscript.ld $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: ARM v7 gcc linker'
 	$(CC) -mcpu=cortex-a9 -mfpu=vfpv3 -mfloat-abi=hard -Wl,-build-id=none -specs=Xilinx.spec -Wl,-T -Wl,../src/lscript.ld -L../bsp/ps7_cortexa9_0/lib -o "df_datalink.elf" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 
-df_datalink.elf.size: df_datalink.elf
+df_datalink_sp.elf.size: df_datalink_sp.elf
 	@echo 'Invoking: ARM v7 Print Size'
 	arm-none-eabi-size df_datalink.elf  |tee "df_datalink.elf.size"
 	@echo 'Finished building: $@'
@@ -67,7 +68,7 @@ df_datalink.elf.size: df_datalink.elf
 
 # Other Targets
 clean:
-	-$(RM) $(EXECUTABLES)$(OBJS)$(S_UPPER_DEPS)$(C_DEPS)$(ELFSIZE) df_datalink.elf
+	-$(RM) $(EXECUTABLES)$(OBJS)$(S_UPPER_DEPS)$(C_DEPS)$(ELFSIZE) df_datalink_sp.elf
 	-@echo ' '
 
 pre-build: