From 71464f2b7d4d153195ebef85083ca20a1df101de Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 17 Sep 2014 07:32:55 -0600 Subject: [PATCH] Fix errors in apps/examplex/helloxx and cxxtext Makefiles; update SAMA5D3x-EK/hello defconfig --- examples/cxxtest/Makefile | 6 +++--- examples/helloxx/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/cxxtest/Makefile b/examples/cxxtest/Makefile index c690e88a8..2e75f5bf9 100644 --- a/examples/cxxtest/Makefile +++ b/examples/cxxtest/Makefile @@ -47,7 +47,7 @@ MAINSRC = cxxtest_main.cxx AOBJS = $(ASRCS:.S=$(OBJEXT)) COBJS = $(CSRCS:.c=$(OBJEXT)) CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) -MAINOBJS = $(MAINSRC:.cxx=$(OBJEXT)) +MAINOBJ = $(MAINSRC:.cxx=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) @@ -101,10 +101,10 @@ endif $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) -$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c +$(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) -$(CXXOBJS): %$(OBJEXT): %.cxx +$(CXXOBJS) $(MAINOBJ): %$(OBJEXT): %.cxx $(call COMPILEXX, $<, $@) .built: chkcxx $(OBJS) diff --git a/examples/helloxx/Makefile b/examples/helloxx/Makefile index 6a5da5416..285dd1d88 100644 --- a/examples/helloxx/Makefile +++ b/examples/helloxx/Makefile @@ -99,10 +99,10 @@ endif $(AOBJS): %$(OBJEXT): %.S $(call ASSEMBLE, $<, $@) -$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c +$(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) -$(CXXOBJS): %$(OBJEXT): %.cxx +$(CXXOBJS) $(MAINOBJ): %$(OBJEXT): %.cxx $(call COMPILEXX, $<, $@) .built: chkcxx $(OBJS)