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
This commit is contained in:
patacongo 2012-11-17 20:44:02 +00:00
parent 26c9112ad2
commit 87ca1176ed
61 changed files with 393 additions and 332 deletions

View File

@ -80,16 +80,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -73,17 +73,18 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -63,16 +63,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -63,16 +63,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -69,16 +69,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -33,22 +33,21 @@
# #
############################################################################ ############################################################################
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# Board-specific directory, board library, and application library # Board-specific directory, board library, and application library
PASS1_SRCDIR = arch/$(CONFIG_ARCH)/src PASS1_SRCDIR = arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
PASS1_BOARDDIR = $(PASS1_SRCDIR)/board PASS1_BOARDDIR = $(PASS1_SRCDIR)$(DELIM)board
PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT) PASS1_LIBBOARD = $(PASS1_BOARDDIR)$(DELIM)libboard$(LIBEXT)
# Where is the application library? # Where is the application library?
ifneq ($(CONFIG_APPS_DIR),) ifneq ($(CONFIG_APPS_DIR),)
PASS1_LIBAPPS = $(CONFIG_APPS_DIR)/libapps$(LIBEXT) PASS1_LIBAPPS = $(CONFIG_APPS_DIR)$(DELIM)libapps$(LIBEXT)
else else
ifneq ($(APPDIR),) ifneq ($(APPDIR),)
PASS1_LIBAPPS = $(APPDIR)/libapps$(LIBEXT) PASS1_LIBAPPS = $(APPDIR)$(DELIM)libapps$(LIBEXT)
endif endif
endif endif
@ -63,12 +62,12 @@ PASS1_LINKLIBS += $(PASS1_LIBBOARD)
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
# Windows-native toolchains # Windows-native toolchains
PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)/lib"}" PASS1_LIBPATHS += -L"${shell cygpath -w "$(TOPDIR)$(DELIM)lib"}"
PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc}" PASS1_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc}"
else else
# Linux/Cygwin-native toolchain # Linux/Cygwin-native toolchain
PASS1_LIBPATHS += -L"(TOPDIR)/lib" PASS1_LIBPATHS += -L"(TOPDIR)$(DELIM)lib"
PASS1_LDSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/locked/ld-locked.inc PASS1_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)locked$(DELIM)ld-locked.inc
endif endif
PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT) PASS1_LDFLAGS = -r $(PASS1_LDSCRIPT)
@ -77,23 +76,23 @@ PASS1_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
# Targets: # Targets:
all: $(PASS1_SRCDIR)/locked.r all: $(PASS1_SRCDIR)$(DELIM)locked.r
.PHONY: depend clean distclean .PHONY: depend clean distclean
# Create include-able linker script that specifies all of the symbols to be # Create include-able linker script that specifies all of the symbols to be
# resolved in the locked.r file. # resolved in the locked.r file.
ld-locked.inc: mklocked.sh $(TOPDIR)/.config ld-locked.inc: mklocked.sh $(TOPDIR)$(DELIM).config
@echo "MK: ld-locked.inc" @echo "MK: ld-locked.inc"
@./mklocked.sh "$(TOPDIR)" @.$(DELIM)mklocked.sh "$(TOPDIR)"
# Make the board library. This is normally done in arch/arm/src/Makefile. # Make the board library. This is normally done in arch/arm/src/Makefile.
# However, we need it earlier here when doing a two-pass build so that libboard.a # However, we need it earlier here when doing a two-pass build so that libboard.a
# is available to link against. # is available to link against.
$(PASS1_LIBBOARD): $(PASS1_LIBBOARD):
@$(MAKE) -C $(TOPDIR)/configs/ea3131/src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C $(TOPDIR)$(DELIM)configs$(DELIM)ea3131$(DELIM)src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
# Create the locked.r file containing all of the code (except the start-up code) # Create the locked.r file containing all of the code (except the start-up code)
# that needs to lie in the locked text region. # that needs to lie in the locked text region.
@ -105,16 +104,17 @@ locked.r: ld-locked.inc $(PASS1_LIBBOARD)
@fgrep " U " locked.map | grep -v os_start @fgrep " U " locked.map | grep -v os_start
@$(CROSSDEV)size $@ @$(CROSSDEV)size $@
$(PASS1_SRCDIR)/locked.r: locked.r $(PASS1_SRCDIR)$(DELIM)locked.r: locked.r
@cp -a locked.r $(TOPDIR)/$(PASS1_SRCDIR)/locked.r @cp -a locked.r $(TOPDIR)$(DELIM)$(PASS1_SRCDIR)$(DELIM)locked.r
.depend: .depend:
depend: .depend depend: .depend
clean: clean:
@rm -f locked.r locked.map *~ .*.swp $(call DELFILE locked.r)
$(call DELFILE locked.map)
$(call CLEAN)
distclean: clean distclean: clean
@rm -f ld-locked.inc $(call DELFILE ld-locked.inc)

View File

@ -88,16 +88,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -88,16 +88,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -69,16 +69,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -71,16 +71,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -53,9 +53,9 @@ OBJS = $(AOBJS) $(COBJS)
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS): %$(OBJEXT): %$(ASMEXT) $(AOBJS): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -67,16 +67,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -60,9 +60,9 @@ OBJS = $(AOBJS) $(COBJS)
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS): %$(OBJEXT): %$(ASMEXT) $(AOBJS): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -74,16 +74,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -110,16 +110,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -89,16 +89,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -88,16 +88,16 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -70,16 +70,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -107,16 +107,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -57,16 +57,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -80,16 +80,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -80,16 +80,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -69,16 +69,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -87,16 +87,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -76,16 +76,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -72,16 +72,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -73,16 +73,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -71,16 +71,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -82,16 +82,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -86,16 +86,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -59,16 +59,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -66,16 +66,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -33,24 +33,23 @@
# #
############################################################################ ############################################################################
-include $(TOPDIR)/.config
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
# This is the directory for the board-specific header files # This is the directory for the board-specific header files
BOARD_INCLUDE = $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/include BOARD_INCLUDE = $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include
# Get the paths to the libraries and the links script path in format that # Get the paths to the libraries and the links script path in format that
# is appropriate for the host OS # is appropriate for the host OS
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
# Windows-native toolchains # Windows-native toolchains
USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)/$$path`;echo "-L\"`cygpath -w $$dir`\"";done} USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done}
USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/kernel/kernel.ld}" USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)kernel$(DELIM)kernel.ld}"
else else
# Linux/Cygwin-native toolchain # Linux/Cygwin-native toolchain
USER_LIBPATHS = $(addprefix -L$(TOPDIR)/,$(dir $(USERLIBS))) USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS)))
USER_LDSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/kernel/kernel.ld USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)kernel$(DELIM)kernel.ld
endif endif
USER_LDFLAGS = $(USER_LDSCRIPT) USER_LDFLAGS = $(USER_LDSCRIPT)
@ -59,78 +58,80 @@ USER_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
# Targets: # Targets:
all: $(TOPDIR)/nuttx_user.elf $(TOPDIR)/User.map $(BOARD_INCLUDE)/user_map.h all: $(TOPDIR)$(DELIM)nuttx_user.elf $(TOPDIR)$(DELIM)User.map $(BOARD_INCLUDE)$(DELIM)user_map.h
.PHONY: depend clean distclean .PHONY: depend clean distclean
# Create the nuttx_user.elf file containing all of the user-mode code # Create the nuttx_user.elf file containing all of the user-mode code
nuttx_user.elf: nuttx_user.elf:
@$(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC) $(Q) $(LD) -o $@ $(USER_LDFLAGS) $(USER_LIBPATHS) --start-group $(USER_LDLIBS) --end-group $(USER_LIBGCC)
$(TOPDIR)/nuttx_user.elf: nuttx_user.elf $(TOPDIR)$(DELIM)nuttx_user.elf: nuttx_user.elf
@echo "LD: nuttx_user.elf" @echo "LD: nuttx_user.elf"
@cp -a nuttx_user.elf $(TOPDIR)/nuttx_user.elf $(Q) cp -a nuttx_user.elf $(TOPDIR)$(DELIM)nuttx_user.elf
ifeq ($(CONFIG_INTELHEX_BINARY),y) ifeq ($(CONFIG_INTELHEX_BINARY),y)
@echo "CP: nuttx_user.hex" @echo "CP: nuttx_user.hex"
@$(OBJCOPY) $(OBJCOPYARGS) -O ihex nuttx_user.elf $(TOPDIR)/nuttx_user.hex $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O ihex nuttx_user.elf $(TOPDIR)$(DELIM)nuttx_user.hex
endif endif
ifeq ($(CONFIG_MOTOROLA_SREC),y) ifeq ($(CONFIG_MOTOROLA_SREC),y)
@echo "CP: nuttx_user.srec" @echo "CP: nuttx_user.srec"
@$(OBJCOPY) $(OBJCOPYARGS) -O srec nuttx_user.elf $(TOPDIR)/nuttx_user.srec $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O srec nuttx_user.elf $(TOPDIR)$(DELIM)nuttx_user.srec
endif endif
ifeq ($(CONFIG_RAW_BINARY),y) ifeq ($(CONFIG_RAW_BINARY),y)
@echo "CP: nuttx_user.bin" @echo "CP: nuttx_user.bin"
@$(OBJCOPY) $(OBJCOPYARGS) -O binary nuttx_user.elf $(TOPDIR)/nuttx_user.bin $(Q) $(OBJCOPY) $(OBJCOPYARGS) -O binary nuttx_user.elf $(TOPDIR)$(DELIM)nuttx_user.bin
endif endif
$(TOPDIR)/User.map: nuttx_user.elf $(TOPDIR)$(DELIM)User.map: nuttx_user.elf
@echo "MK: User.map" @echo "MK: User.map"
@$(NM) nuttx_user.elf >$(TOPDIR)/User.map $(Q) $(NM) nuttx_user.elf >$(TOPDIR)$(DELIM)User.map
@$(CROSSDEV)size nuttx_user.elf $(Q) $(CROSSDEV)size nuttx_user.elf
$(BOARD_INCLUDE)/user_map.h: $(TOPDIR)/User.map $(BOARD_INCLUDE)$(DELIM)user_map.h: $(TOPDIR)$(DELIM)User.map
@echo "MK: user_map.h" @echo "MK: user_map.h"
@echo "/* configs/$(CONFIG_ARCH_BOARD)/include/user_map.h" > $(BOARD_INCLUDE)/user_map.h @echo "/* configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include$(DELIM)user_map.h" > $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo " *" >> $(BOARD_INCLUDE)/user_map.h @echo " *" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo " * This is an auto-generated file.. Do not edit this file!" >> $(BOARD_INCLUDE)/user_map.h @echo " * This is an auto-generated file.. Do not edit this file!" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo " */" >> $(BOARD_INCLUDE)/user_map.h @echo " */" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#ifndef __ARCH_BOARD_USER_MAP_H" >> $(BOARD_INCLUDE)/user_map.h @echo "#ifndef __ARCH_BOARD_USER_MAP_H" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define __ARCH_BOARD_USER_MAP_H" >> $(BOARD_INCLUDE)/user_map.h @echo "#define __ARCH_BOARD_USER_MAP_H" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "/* General memory map */" >> $(BOARD_INCLUDE)/user_map.h @echo "/* General memory map */" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_ENTRYPOINT 0x`grep \" user_start$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_ENTRYPOINT 0x`grep \" user_start$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_TEXTSTART 0x`grep \" _stext\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_TEXTSTART 0x`grep \" _stext\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_TEXTEND 0x`grep \" _etext$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_TEXTEND 0x`grep \" _etext$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_DATASOURCE 0x`grep \" _eronly$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_DATASOURCE 0x`grep \" _eronly$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_DATADESTSTART 0x`grep \" _sdata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_DATADESTSTART 0x`grep \" _sdata$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_DATADESTEND 0x`grep \" _edata$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_DATADESTEND 0x`grep \" _edata$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_BSSSTART 0x`grep \" _sbss\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_BSSSTART 0x`grep \" _sbss\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_BSSEND 0x`grep \" _ebss$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_BSSEND 0x`grep \" _ebss$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "/* Memory manager entry points */" >> $(BOARD_INCLUDE)/user_map.h @echo "/* Memory manager entry points */" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_MMINIT 0x`grep \" mm_initialize$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_MMINIT 0x`grep \" mm_initialize$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_MMADDREGION 0x`grep \" mm_addregion$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_MMADDREGION 0x`grep \" mm_addregion$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_MMTRYSEM 0x`grep \" mm_trysemaphore$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_MMTRYSEM 0x`grep \" mm_trysemaphore$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_MMGIVESEM 0x`grep \" mm_givesemaphore$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_MMGIVESEM 0x`grep \" mm_givesemaphore$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_MALLOC 0x`grep \" malloc$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_MALLOC 0x`grep \" malloc$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_REALLOC 0x`grep \" realloc$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_REALLOC 0x`grep \" realloc$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_ZALLOC 0x`grep \" zalloc$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_ZALLOC 0x`grep \" zalloc$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#define CONFIG_USER_FREE 0x`grep \" free$\" $(TOPDIR)/User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)/user_map.h @echo "#define CONFIG_USER_FREE 0x`grep \" free$\" $(TOPDIR)$(DELIM)User.map | cut -d' ' -f1`" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "" >> $(BOARD_INCLUDE)/user_map.h @echo "" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
@echo "#endif /* __ARCH_BOARD_USER_MAP_H */" >> $(BOARD_INCLUDE)/user_map.h @echo "#endif /* __ARCH_BOARD_USER_MAP_H */" >> $(BOARD_INCLUDE)$(DELIM)user_map.h
.depend: .depend:
depend: .depend depend: .depend
clean: clean:
@rm -f nuttx_user.elf *~ .*.swp $(call DELFILE nuttx_user.elf)
@rm -f $(TOPDIR)/nuttx_user.elf $(TOPDIR)/User.map $(call DELFILE "$(TOPDIR)$(DELIM)nuttx_user.elf")
$(call DELFILE "$(TOPDIR)$(DELIM)User.map")
$(call CLEAN)
distclean: clean distclean: clean

View File

@ -79,16 +79,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -130,16 +130,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -60,22 +60,23 @@ $(COBJS) $(LINKOBJS): %$(OBJEXT): %.c
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
libboard$(LIBEXT): $(OBJS) libboard$(LIBEXT): $(OBJS)
@$(AR) $@ # Create an empty archive $(Q) $(AR) $@ # Create an empty archive
ifneq ($(OBJS),) ifneq ($(OBJS),)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
endif endif
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -114,16 +114,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -114,16 +114,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -122,16 +122,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -66,16 +66,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -91,16 +91,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -86,16 +86,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -88,16 +88,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -82,16 +82,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -33,19 +33,20 @@
# #
############################################################################ ############################################################################
include $(TOPDIR)/.config
include $(TOPDIR)/Make.defs include $(TOPDIR)/Make.defs
SRC = shterm.c SRC = shterm.c
BIN = shterm BIN = shterm
all: ../bin/$(BIN)$(EXEEXT) all: ..$(DELIM)bin$(DELIM)$(BIN)$(EXEEXT)
$(BIN)$(EXEEXT): $(SRC) $(BIN)$(EXEEXT): $(SRC)
$(HOSTCC) $(HOSTCFLAGS) $^ -o $@ $(HOSTCC) $(HOSTCFLAGS) $^ -o $@
../bin/$(BIN)$(EXEEXT): $(BIN)$(EXEEXT) ..$(DELIM)bin$(DELIM)$(BIN)$(EXEEXT): $(BIN)$(EXEEXT)
install --mode 0755 $^ $@ install --mode 0755 $^ $@
clean: clean:
@rm -f $(BIN)$(EXEEXT) ../bin/$(BIN)$(EXEEXT) *~ .*.swp *.o $(call DELFILE $(BIN)$(EXEEXT))
$(call DELFILE..$(DELIM)bin$(DELIM)$(BIN)$(EXEEXT))
$(call CLEAN) $(call CLEAN)

View File

@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT)))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -87,23 +87,24 @@ libboard$(LIBEXT): $(OBJS)
.context: .context:
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
@touch $@ $(Q) touch $@
context: .context context: .context
# Create dependencies # Create dependencies
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend .context $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -35,7 +35,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
CFLAGS += -I$(TOPDIR)/sched -I$(TOPDIR)/arch/z80/src/common -I$(TOPDIR)/arch/z80/src/z80 CFLAGS += -I$(TOPDIR)$(DELIM)sched -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)common -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)z80
ASRCS = ASRCS =
AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT)) AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT))
@ -45,8 +45,8 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src CFLAGS += -I $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/include CFLAGS += -I $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)include
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
@ -60,16 +60,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -35,7 +35,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
@ -53,9 +53,9 @@ OBJS = $(AOBJS) $(COBJS)
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) $< -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) $< -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS): %$(OBJEXT): %$(ASMEXT) $(AOBJS): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -67,16 +67,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -35,7 +35,9 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
CFLAGS += -I$(TOPDIR)/sched -I$(TOPDIR)/arch/z80/src/common -I$(TOPDIR)/arch/z80/src/z80 CFLAGS += -I$(TOPDIR)$(DELIM)sched
CFLAGS += -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)common -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)z80
CFLAGS += -I$(TOPDIR)$(DELIM)arch$(DELIM)z80$(DELIM)src$(DELIM)z80
ASRCS = ASRCS =
AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT)) AOBJS = $(ASRCS:$(ASMEXT)=$(OBJEXT))
@ -45,7 +47,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) SRCS = $(ASRCS) $(CSRCS)
OBJS = $(AOBJS) $(COBJS) OBJS = $(AOBJS) $(COBJS)
CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src CFLAGS += -I $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
@ -59,16 +61,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -35,7 +35,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
@ -53,9 +53,9 @@ OBJS = $(AOBJS) $(COBJS)
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS): %$(OBJEXT): %$(ASMEXT) $(AOBJS): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -67,16 +67,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep

View File

@ -35,7 +35,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
ARCHSRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)} WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common'
INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES)
@ -53,9 +53,9 @@ OBJS = $(AOBJS) $(COBJS)
all: libboard$(LIBEXT) all: libboard$(LIBEXT)
$(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S $(ASRCS) $(HEAD_ASRC): %$(ASMEXT): %.S
@$(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp $(Q) $(CPP) $(CPPFLAGS) `cygpath -w $<` -o $@.tmp
@cat $@.tmp | sed -e "s/^#/;/g" > $@ $(Q) cat $@.tmp | sed -e "s/^#/;/g" > $@
@rm $@.tmp $(Q) rm $@.tmp
$(AOBJS): %$(OBJEXT): %$(ASMEXT) $(AOBJS): %$(OBJEXT): %$(ASMEXT)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
@ -67,16 +67,17 @@ libboard$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS)) $(call ARCHIVE, $@, $(OBJS))
.depend: Makefile $(SRCS) .depend: Makefile $(SRCS)
@$(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@ $(Q) touch $@
depend: .depend depend: .depend
clean: clean:
@rm -f libboard$(LIBEXT) *~ .*.swp $(call DELFILE libboard$(LIBEXT))
$(call CLEAN) $(call CLEAN)
distclean: clean distclean: clean
@rm -f Make.dep .depend $(call DELFILE Make.dep)
$(call DELFILE .depend)
-include Make.dep -include Make.dep