Fix BAS 2.4 Makefile

This commit is contained in:
Gregory Nutt 2014-10-29 06:48:41 -06:00
parent 94c5d707fc
commit 81722acb62

View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# apps/bas/Makefile # apps/bas/Makefile
# #
# Copyright (C) 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -63,12 +63,12 @@ SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y) ifeq ($(CONFIG_WINDOWS_NATIVE),y)
BIN = ..\libapps$(LIBEXT) BIN = ..\..\libapps$(LIBEXT)
else else
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
BIN = ..\\libapps$(LIBEXT) BIN = ..\\..\\libapps$(LIBEXT)
else else
BIN = ../libapps$(LIBEXT) BIN = ../../libapps$(LIBEXT)
endif endif
endif endif
@ -77,30 +77,23 @@ endif
all: .built all: .built
.PHONY: context .depend depend clean distclean .PHONY: context .depend depend clean distclean
ifeq ($(CONFIG_BAS),y)
$(AOBJS): %$(OBJEXT): %.S $(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
$(COBJS): %$(OBJEXT): %.c $(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
endif
.built: $(OBJS) .built: $(OBJS)
ifeq ($(CONFIG_BAS),y)
$(call ARCHIVE, $(BIN), $(OBJS)) $(call ARCHIVE, $(BIN), $(OBJS))
$(Q) touch .built $(Q) touch .built
endif
install: install:
context: context:
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
ifeq ($(CONFIG_BAS),y)
$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@ $(Q) touch $@
endif
depend: .depend depend: .depend