diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-17 20:44:02 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-17 20:44:02 +0000 |
| commit | abe75281e693689f8efe02ddad2c82ae067e5d98 (patch) | |
| tree | 4c9e8e7a6afb3c57062a61a70eab90cb4b3504da /NxWidgets/UnitTests/CScrollbarHorizontal | |
| parent | a444a16f4746959a1332cb21749fbdf9a31df091 (diff) | |
| download | nuttx-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/UnitTests/CScrollbarHorizontal')
| -rw-r--r-- | NxWidgets/UnitTests/CScrollbarHorizontal/Makefile | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile index 9efc5d401..0fe12318b 100644 --- a/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/NxWidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -36,13 +36,13 @@ TESTDIR := ${shell pwd | sed -e 's/ /\\ /g'} -include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs +include $(APPDIR)$(DELIM)Make.defs # Add the path to the NXWidget include directory to the CFLAGS -NXWIDGETS_DIR="$(TESTDIR)/../../libnxwidgets" -NXWIDGETS_INC="$(NXWIDGETS_DIR)/include" -NXWIDGETS_LIB="$(NXWIDGETS_DIR)/libnxwidgets$(LIBEXT)" +NXWIDGETS_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)libnxwidgets" +NXWIDGETS_INC="$(NXWIDGETS_DIR)$(DELIM)include" +NXWIDGETS_LIB="$(NXWIDGETS_DIR)$(DELIM)libnxwidgets$(LIBEXT)" ifeq ($(WINTOOL),y) CFLAGS += ${shell $(INCDIR) -w "$(CC)" "$(NXWIDGETS_INC)"} @@ -54,8 +54,8 @@ endif # Get the path to the archiver tool -TESTTOOL_DIR="$(TESTDIR)/../../tools" -ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh +TESTTOOL_DIR="$(TESTDIR)$(DELIM)..$(DELIM)..$(DELIM)tools" +ARCHIVER=$(TESTTOOL_DIR)$(DELIM)addobjs.sh # Hello, World! C++ Example @@ -70,7 +70,7 @@ CXXOBJS = $(CXXSRCS:.cxx=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) -POSIX_BIN = "$(APPDIR)/libapps$(LIBEXT)" +POSIX_BIN = "$(APPDIR)$(DELIM)libapps$(LIBEXT)" ifeq ($(WINTOOL),y) BIN = "${shell cygpath -w $(POSIX_BIN)}" else @@ -120,7 +120,7 @@ endif # Verify that the NXWidget library has been built chklib: - @( \ + $(Q) ( \ if [ ! -e "$(NXWIDGETS_LIB)" ]; then \ echo "$(NXWIDGETS_LIB) does not exist."; \ echo "Please go to $(NXWIDGETS_DIR)"; \ @@ -136,11 +136,11 @@ $(NXWIDGETS_LIB): # Just to keep make happy. chklib does the work. .built: chkcxx chklib $(OBJS) $(NXWIDGETS_LIB) $(call ARCHIVE, $@, $(OBJS)) ifeq ($(WINTOOL),y) - @$(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR) + $(Q) $(ARCHIVER) -w -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR) else - @$(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR) + $(Q) $(ARCHIVER) -p "$(CROSSDEV)" $(BIN) $(NXWIDGETS_DIR) endif - @touch .built + $(Q) touch .built # Standard housekeeping targets @@ -148,7 +148,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) endif - @touch $@ + $(Q) touch $@ context: .context @@ -159,10 +159,11 @@ context: .context depend: .depend clean: - @rm -f *.o *~ .*.swp .built + $(call DELFILE .built) $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(call DELFILE Make.dep) + $(call DELFILE .depend) -include Make.dep |