From 208e35e7d704467cb04b054e3fc32acf82be9e49 Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@mit.edu>
Date: Mon, 13 Sep 2010 15:15:39 -0400
Subject: exposed build-targets.mk

---
 Makefile                      |  2 +-
 build-targets.mk              | 35 +++++++++++++++++++++++++++++++++++
 support/make/build-targets.mk | 35 -----------------------------------
 3 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 build-targets.mk
 delete mode 100644 support/make/build-targets.mk

diff --git a/Makefile b/Makefile
index d779573..bc34f9e 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ LIBMAPLE_MODULES += $(SRCROOT)/wirish
 $(foreach m,$(LIBMAPLE_MODULES),$(eval $(call LIBMAPLE_MODULE_template,$(m))))
 
 # Main target
-include $(SUPPORT_PATH)/make/build-targets.mk
+include build-targets.mk
 
 .PHONY: install sketch clean help debug cscope tags ctags ram flash jtag
 
diff --git a/build-targets.mk b/build-targets.mk
new file mode 100644
index 0000000..448b1ee
--- /dev/null
+++ b/build-targets.mk
@@ -0,0 +1,35 @@
+# main project target
+$(BUILD_PATH)/main.o: main.cpp
+	$(SILENT_CXX) $(CXX) $(CFLAGS) $(CXXFLAGS) $(LIBMAPLE_INCLUDES) $(WIRISH_INCLUDES) -o $@ -c $< 
+
+$(BUILD_PATH)/$(BOARD).elf: $(BUILDDIRS) $(TGT_BIN) $(BUILD_PATH)/main.o
+	$(SILENT_LD) $(CXX) $(LDFLAGS) -o $@ $(TGT_BIN) $(BUILD_PATH)/main.o
+
+$(BUILD_PATH)/$(BOARD).bin: $(BUILD_PATH)/$(BOARD).elf
+	$(SILENT_OBJCOPY) $(OBJCOPY) -v -Obinary $(BUILD_PATH)/$(BOARD).elf $@ 1>/dev/null
+	$(SILENT_DISAS) $(DISAS) -d $(BUILD_PATH)/$(BOARD).elf > $(BUILD_PATH)/$(BOARD).disas
+	@echo " "
+	@echo "Object file sizes:"
+	@find $(BUILD_PATH) -iname *.o | xargs $(SIZE) -t > $(BUILD_PATH)/$(BOARD).sizes
+	@cat $(BUILD_PATH)/$(BOARD).sizes
+	@echo " "
+	@echo "Final Size:"
+	@$(SIZE) $<
+	@echo $(MEMORY_TARGET) > $(BUILD_PATH)/build-type
+
+$(BUILDDIRS):
+	@mkdir -p $@
+
+MSG_INFO:
+	@echo "================================================================================"
+	@echo ""
+	@echo "  Build info:"
+	@echo "     BOARD:          " $(BOARD)
+	@echo "     MCU:            " $(MCU)
+	@echo "     MEMORY_TARGET:  " $(MEMORY_TARGET)
+	@echo ""
+	@echo "  See 'make help' for all possible targets"
+	@echo ""
+	@echo "================================================================================"
+	@echo
+
diff --git a/support/make/build-targets.mk b/support/make/build-targets.mk
deleted file mode 100644
index 448b1ee..0000000
--- a/support/make/build-targets.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# main project target
-$(BUILD_PATH)/main.o: main.cpp
-	$(SILENT_CXX) $(CXX) $(CFLAGS) $(CXXFLAGS) $(LIBMAPLE_INCLUDES) $(WIRISH_INCLUDES) -o $@ -c $< 
-
-$(BUILD_PATH)/$(BOARD).elf: $(BUILDDIRS) $(TGT_BIN) $(BUILD_PATH)/main.o
-	$(SILENT_LD) $(CXX) $(LDFLAGS) -o $@ $(TGT_BIN) $(BUILD_PATH)/main.o
-
-$(BUILD_PATH)/$(BOARD).bin: $(BUILD_PATH)/$(BOARD).elf
-	$(SILENT_OBJCOPY) $(OBJCOPY) -v -Obinary $(BUILD_PATH)/$(BOARD).elf $@ 1>/dev/null
-	$(SILENT_DISAS) $(DISAS) -d $(BUILD_PATH)/$(BOARD).elf > $(BUILD_PATH)/$(BOARD).disas
-	@echo " "
-	@echo "Object file sizes:"
-	@find $(BUILD_PATH) -iname *.o | xargs $(SIZE) -t > $(BUILD_PATH)/$(BOARD).sizes
-	@cat $(BUILD_PATH)/$(BOARD).sizes
-	@echo " "
-	@echo "Final Size:"
-	@$(SIZE) $<
-	@echo $(MEMORY_TARGET) > $(BUILD_PATH)/build-type
-
-$(BUILDDIRS):
-	@mkdir -p $@
-
-MSG_INFO:
-	@echo "================================================================================"
-	@echo ""
-	@echo "  Build info:"
-	@echo "     BOARD:          " $(BOARD)
-	@echo "     MCU:            " $(MCU)
-	@echo "     MEMORY_TARGET:  " $(MEMORY_TARGET)
-	@echo ""
-	@echo "  See 'make help' for all possible targets"
-	@echo ""
-	@echo "================================================================================"
-	@echo
-
-- 
cgit v1.2.3