Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix errors in apps/examplex/helloxx and cxxtext Makefiles; update SAMA5D3x-EK/hello defconfig

Browse source
This commit is contained in:
Gregory Nutt 2014-09-17 07:32:55 -06:00
parent 4a3b3c2d46
commit 71464f2b7d
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
examples/cxxtest/Makefile
View file

@ -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)

4
examples/helloxx/Makefile
View file

@ -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)