summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-29 06:48:41 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-29 06:48:41 -0600
commit04d4a95ec767aeca7d1f2169ad5ea2751fd88804 (patch)
tree1e9124983c338418e7a9ef21d046f6c0a2a3f9f8
parent274cc1fac9732628ac8e337af77ffe69f59d240f (diff)
downloadnuttx-04d4a95ec767aeca7d1f2169ad5ea2751fd88804.tar.gz
nuttx-04d4a95ec767aeca7d1f2169ad5ea2751fd88804.tar.bz2
nuttx-04d4a95ec767aeca7d1f2169ad5ea2751fd88804.zip
Fix BAS 2.4 Makefile
-rw-r--r--apps/interpreters/bas/Makefile15
1 files changed, 4 insertions, 11 deletions
diff --git a/apps/interpreters/bas/Makefile b/apps/interpreters/bas/Makefile
index 74cde67fd..c115fe91f 100644
--- a/apps/interpreters/bas/Makefile
+++ b/apps/interpreters/bas/Makefile
@@ -1,7 +1,7 @@
############################################################################
# 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>
#
# Redistribution and use in source and binary forms, with or without
@@ -63,12 +63,12 @@ SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- BIN = ..\libapps$(LIBEXT)
+ BIN = ..\..\libapps$(LIBEXT)
else
ifeq ($(WINTOOL),y)
- BIN = ..\\libapps$(LIBEXT)
+ BIN = ..\\..\\libapps$(LIBEXT)
else
- BIN = ../libapps$(LIBEXT)
+ BIN = ../../libapps$(LIBEXT)
endif
endif
@@ -77,30 +77,23 @@ endif
all: .built
.PHONY: context .depend depend clean distclean
-ifeq ($(CONFIG_BAS),y)
-
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
$(COBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@)
-endif
.built: $(OBJS)
-ifeq ($(CONFIG_BAS),y)
$(call ARCHIVE, $(BIN), $(OBJS))
$(Q) touch .built
-endif
install:
context:
.depend: Makefile $(SRCS)
-ifeq ($(CONFIG_BAS),y)
$(Q) $(MKDEP) $(DEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
$(Q) touch $@
-endif
depend: .depend