7 files changed, 32 insertions, 37 deletions
diff --git a/nuttx/examples/mount/Makefile b/nuttx/examples/mount/Makefile
index 7f40b93db..bee957d07 100644
--- a/nuttx/examples/mount/Makefile
+++ b/nuttx/examples/mount/Makefile
@@ -49,15 +49,14 @@ BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
 all:	$(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(BIN):	$(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)
@@ -67,7 +66,7 @@ $(BIN):	$(OBJS)
 depend: .depend
 
 clean:
-	rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/nuttx/examples/nettest/Makefile b/nuttx/examples/nettest/Makefile
index f71d2ce13..1a917e3be 100644
--- a/nuttx/examples/nettest/Makefile
+++ b/nuttx/examples/nettest/Makefile
@@ -72,22 +72,23 @@ HOST_BIN	= host
 all:	$(TARG_BIN)
 
 $(TARG_AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(TARG_COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(TARG_BIN):	$(TARG_OBJS) $(HOST_BIN)
 	@( for obj in $(TARG_OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 $(HOST_OBJS): %.o: %.c
-	$(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
+	@echo "CC: $<"
+	@$(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
 
 $(HOST_BIN):	$(HOST_OBJS)
-	$(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
+	@echo "LD: $@"
+	@$(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
 
 .depend: Makefile $(TARG_SRCS)
 	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(TARG_SRCS) >Make.dep
@@ -96,7 +97,7 @@ $(HOST_BIN):	$(HOST_OBJS)
 depend: .depend
 
 clean:
-	rm -f $(TARG_BIN) $(HOST_BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(TARG_BIN) $(HOST_BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/nuttx/examples/nsh/Makefile b/nuttx/examples/nsh/Makefile
index 56f4859c6..9c1bb7a78 100644
--- a/nuttx/examples/nsh/Makefile
+++ b/nuttx/examples/nsh/Makefile
@@ -62,15 +62,14 @@ BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
 all:	$(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(BIN):	$(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)
@@ -80,7 +79,7 @@ $(BIN):	$(OBJS)
 depend: .depend
 
 clean:
-	rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/nuttx/examples/null/Makefile b/nuttx/examples/null/Makefile
index 464d0f59d..39542b084 100644
--- a/nuttx/examples/null/Makefile
+++ b/nuttx/examples/null/Makefile
@@ -49,15 +49,14 @@ BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
 all:	$(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(BIN):	$(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)
@@ -67,7 +66,7 @@ $(BIN):	$(OBJS)
 depend: .depend
 
 clean:
-	rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/nuttx/examples/ostest/Makefile b/nuttx/examples/ostest/Makefile
index 143d33160..f473e08d5 100644
--- a/nuttx/examples/ostest/Makefile
+++ b/nuttx/examples/ostest/Makefile
@@ -72,15 +72,14 @@ BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
 all:	$(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(BIN):	$(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)
@@ -90,7 +89,7 @@ $(BIN):	$(OBJS)
 depend: .depend
 
 clean:
-	rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/nuttx/examples/udp/Makefile b/nuttx/examples/udp/Makefile
index 04f2005cc..1d3e67590 100644
--- a/nuttx/examples/udp/Makefile
+++ b/nuttx/examples/udp/Makefile
@@ -72,15 +72,14 @@ HOST_BIN	= host
 all:	$(TARG_BIN)
 
 $(TARG_AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(TARG_COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(TARG_BIN):	$(TARG_OBJS) $(HOST_BIN)
 	@( for obj in $(TARG_OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 $(HOST_OBJS): %.o: %.c
@@ -96,7 +95,7 @@ $(HOST_BIN):	$(HOST_OBJS)
 depend: .depend
 
 clean:
-	rm -f $(TARG_BIN) $(HOST_BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(TARG_BIN) $(HOST_BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend
diff --git a/nuttx/examples/uip/Makefile b/nuttx/examples/uip/Makefile
index f13cf0bab..0408b9b7c 100644
--- a/nuttx/examples/uip/Makefile
+++ b/nuttx/examples/uip/Makefile
@@ -49,15 +49,14 @@ BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
 all:	$(BIN)
 
 $(AOBJS): %$(OBJEXT): %.S
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call ASSEMBLE, $<, $@)
 
 $(COBJS): %$(OBJEXT): %.c
-	$(CC) -c $(CFLAGS) $< -o $@
+	$(call COMPILE, $<, $@)
 
 $(BIN):	$(OBJS)
 	@( for obj in $(OBJS) ; do \
-		$(AR) $@ $${obj} || \
-			{ echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
 
 .depend: Makefile $(SRCS)
@@ -67,7 +66,7 @@ $(BIN):	$(OBJS)
 depend: .depend
 
 clean:
-	rm -f $(BIN) *.o *.rel *.asm *.lst *.sym *.adb *~
+	rm -f $(BIN) *.o *.obj *.rel *.asm *.lst *.sym *.adb *~
 
 distclean: clean
 	rm -f Make.dep .depend