diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-17 07:32:55 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-17 07:32:55 -0600 |
| commit | bab172c8baa89ceaf0e14a1882d310177567f118 (patch) | |
| tree | 08fb45c1ba1a6652deeabbe195fd8c90f5c2d907 /apps | |
| parent | b9fd394c9655312d0cd7e610594100693e22781c (diff) | |
| download | nuttx-bab172c8baa89ceaf0e14a1882d310177567f118.tar.gz nuttx-bab172c8baa89ceaf0e14a1882d310177567f118.tar.bz2 nuttx-bab172c8baa89ceaf0e14a1882d310177567f118.zip | |
Fix errors in apps/examplex/helloxx and cxxtext Makefiles; update SAMA5D3x-EK/hello defconfig
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/examples/cxxtest/Makefile | 6 | ||||
| -rw-r--r-- | apps/examples/helloxx/Makefile | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/examples/cxxtest/Makefile b/apps/examples/cxxtest/Makefile index c690e88a8..2e75f5bf9 100644 --- a/apps/examples/cxxtest/Makefile +++ b/apps/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/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile index 6a5da5416..285dd1d88 100644 --- a/apps/examples/helloxx/Makefile +++ b/apps/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) |