summaryrefslogtreecommitdiff
path: root/nuttx/mm
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-01-08 17:06:21 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2008-01-08 17:06:21 +0000
commitaaf14056e435090f70b7e82d42874d090d1a1e35 (patch)
tree41a2ddea543958ebb2c2d0e4018edd3275b690f2 /nuttx/mm
parent6be6922d92309de635a5c222d94224adab2f73e5 (diff)
downloadpx4-nuttx-aaf14056e435090f70b7e82d42874d090d1a1e35.tar.gz
px4-nuttx-aaf14056e435090f70b7e82d42874d090d1a1e35.tar.bz2
px4-nuttx-aaf14056e435090f70b7e82d42874d090d1a1e35.zip
Make logic reorganized for non-GNU toolchain
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@528 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/mm')
-rw-r--r--nuttx/mm/Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile
index 3d9961664..e7495b77c 100644
--- a/nuttx/mm/Makefile
+++ b/nuttx/mm/Makefile
@@ -36,11 +36,11 @@
-include $(TOPDIR)/Make.defs
ASRCS =
-AOBJS = $(ASRCS:.S=.o)
+AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \
mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \
mm_memalign.c mm_free.c mm_mallinfo.c
-COBJS = $(CSRCS:.c=.o)
+COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
@@ -49,16 +49,15 @@ BIN = libmm$(LIBEXT)
all: $(BIN)
-$(AOBJS): %.o: %.S
- $(CC) -c $(CFLAGS) $< -o $@
+$(AOBJS): %$(OBJEXT): %.S
+ $(call ASSEMBLE, $<, $@)
-$(COBJS): %.o: %.c
- $(CC) -c $(CFLAGS) $< -o $@
+$(COBJS): %$(OBJEXT): %.c
+ $(call COMPILE, $<, $@)
$(BIN): $(OBJS)
@( for obj in $(OBJS) ; do \
- $(AR) $@ $${obj} || \
- { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \
+ $(call ARCHIVE, $@, $${obj}); \
done ; )
.depend: Makefile $(SRCS)
@@ -68,7 +67,8 @@ $(BIN): $(OBJS)
depend: .depend
clean:
- rm -f $(BIN) *.o *.asm *.lst *.sym *.adb *~
+ rm -f $(BIN) *.asm *.lst *.sym *.adb *~ .*.swp
+ if [ ! -z "$(OBJEXT)" ]; then rm -f *$(OBJEXT); fi
distclean: clean
rm -f Make.dep .depend