summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-17 20:44:02 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-11-17 20:44:02 +0000
commitabe75281e693689f8efe02ddad2c82ae067e5d98 (patch)
tree4c9e8e7a6afb3c57062a61a70eab90cb4b3504da /NxWidgets/libnxwidgets/Makefile
parenta444a16f4746959a1332cb21749fbdf9a31df091 (diff)
downloadnuttx-abe75281e693689f8efe02ddad2c82ae067e5d98.tar.gz
nuttx-abe75281e693689f8efe02ddad2c82ae067e5d98.tar.bz2
nuttx-abe75281e693689f8efe02ddad2c82ae067e5d98.zip
Finishes all Makefile file changes for Windows native clean
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5368 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/libnxwidgets/Makefile')
-rw-r--r--NxWidgets/libnxwidgets/Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/NxWidgets/libnxwidgets/Makefile b/NxWidgets/libnxwidgets/Makefile
index 654f1d2fc..27a85b428 100644
--- a/NxWidgets/libnxwidgets/Makefile
+++ b/NxWidgets/libnxwidgets/Makefile
@@ -87,8 +87,8 @@ ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
-CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
-CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)/include}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
+CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(NXWIDGETDIR)$(DELIM)include}
DEPPATH = --dep-path src
VPATH = src
@@ -105,7 +105,7 @@ $(CXXOBJS): %$(OBJEXT): %.cxx
$(call COMPILEXX, $<, $@)
check_nuttx:
- @( \
+ $(Q) ( \
if [ -z "$(TOPDIR)" ]; then \
echo "The path to the nuttx directory must be provided on the command line."; \
echo "Usage: make -C $(NXWIDGETDIR) TOPDIR=\"<nuttx directory>\""; \
@@ -115,7 +115,7 @@ check_nuttx:
echo "The nuttx directory (TOPDIR) does not exist: $(TOPDIR)"; \
exit 1; \
fi; \
- if [ ! -f "$(TOPDIR)/.config" ]; then \
+ if [ ! -f "$(TOPDIR)$(DELIM).config" ]; then \
echo "The nuttx directory (TOPDIR) has not been configured"; \
echo "Please configure NuttX and try again"; \
exit 1; \
@@ -126,17 +126,18 @@ $(BIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS)
- @$(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
- @touch $@
+ $(Q) $(MKDEP) $(DEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+ $(Q) touch $@
depend: .depend
clean:
- @rm -f $(BIN) *.a *.o *~ .*.sw*
+ $(call DELFILE $(BIN))
$(call CLEAN)
distclean: clean
- @rm -f Make.dep .depend
+ $(call DELFILE Make.dep)
+ $(call DELFILE .depend)
export: $(BIN)
zip -r nxwidgets-export.zip include $(BIN) COPYING