Modify all base apps Makefiles according to the new subdirectory scheme

diff --git a/adc/Makefile b/adc/Makefile
index 91407f3..954c63f 100644 (file)
--- a/adc/Makefile
+++ b/adc/Makefile
@@ -1,10 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
+

diff --git a/eeprom/Makefile b/eeprom/Makefile
index 91407f3..954c63f 100644 (file)
--- a/eeprom/Makefile
+++ b/eeprom/Makefile
@@ -1,10 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
+

diff --git a/epaper/Makefile b/epaper/Makefile
index e44d25f..954c63f 100644 (file)
--- a/epaper/Makefile
+++ b/epaper/Makefile
@@ -1,12 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
-       cat $@ *.epaper > $(NAME).img
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
 

diff --git a/gpio_intr/Makefile b/gpio_intr/Makefile
index 91407f3..954c63f 100644 (file)
--- a/gpio_intr/Makefile
+++ b/gpio_intr/Makefile
@@ -1,10 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
+

diff --git a/i2c_temp/Makefile b/i2c_temp/Makefile
index 91407f3..954c63f 100644 (file)
--- a/i2c_temp/Makefile
+++ b/i2c_temp/Makefile
@@ -1,10 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
+

diff --git a/lcd_char/Makefile b/lcd_char/Makefile
index 86e0d12..954c63f 100644 (file)
--- a/lcd_char/Makefile
+++ b/lcd_char/Makefile
@@ -1,11 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
 

diff --git a/ledstrip/Makefile b/ledstrip/Makefile
index 91407f3..954c63f 100644 (file)
--- a/ledstrip/Makefile
+++ b/ledstrip/Makefile
@@ -1,10 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
+

diff --git a/ultrasonic_sensor/Makefile b/ultrasonic_sensor/Makefile
index 91407f3..954c63f 100644 (file)
--- a/ultrasonic_sensor/Makefile
+++ b/ultrasonic_sensor/Makefile
@@ -1,10 +1,13 @@
-# Makefile for GPIO Demo Module apps
+# Makefile for "base" apps
+# This includes apps for the GPIO Demo Module and for the LPC1224-BO board.
 
+MODULE = $(shell basename $(shell cd .. && pwd && cd -))
 NAME = $(shell basename $(CURDIR))
 
 .PHONY: $(NAME).bin
 $(NAME).bin:
-       @make -C ../.. --no-print-directory NAME=$(NAME) apps/$(NAME)/$@
+       @make -C ../../.. --no-print-directory NAME=$(NAME) MODULE=$(MODULE) apps/$(MODULE)/$(NAME)/$@
 
 clean mrproper:
-       @make -C ../.. --no-print-directory $@
+       @make -C ../../.. --no-print-directory $@
+