diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-20 22:07:56 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-20 22:07:56 +0000 |
| commit | 60051cba0cf424e01ef2eda09816ee8945867b6d (patch) | |
| tree | 506ffc7c368b1b0756a12099b0f2401e56ea4496 /apps/vsn | |
| parent | f6f8f750c7a25d123dc6f20902b38bcda1c95963 (diff) | |
| download | nuttx-60051cba0cf424e01ef2eda09816ee8945867b6d.tar.gz nuttx-60051cba0cf424e01ef2eda09816ee8945867b6d.tar.bz2 nuttx-60051cba0cf424e01ef2eda09816ee8945867b6d.zip | |
More build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3407 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'apps/vsn')
| -rw-r--r-- | apps/vsn/Makefile | 19 | ||||
| -rw-r--r-- | apps/vsn/free/Makefile | 4 | ||||
| -rw-r--r-- | apps/vsn/hello/Makefile | 4 | ||||
| -rw-r--r-- | apps/vsn/poweroff/Makefile | 4 | ||||
| -rw-r--r-- | apps/vsn/ramtron/Makefile | 4 | ||||
| -rw-r--r-- | apps/vsn/sdcard/Makefile | 4 |
6 files changed, 22 insertions, 17 deletions
diff --git a/apps/vsn/Makefile b/apps/vsn/Makefile index 29b4f1b6a..b3fed59c2 100644 --- a/apps/vsn/Makefile +++ b/apps/vsn/Makefile @@ -33,6 +33,8 @@ # ############################################################################ +-include $(TOPDIR)/.config # Current configuration + # Sub-directories SUBDIRS = free hello poweroff ramtron sdcard @@ -42,17 +44,20 @@ all: nothing nothing: -define DOMAKE - @(MAKE) -C $1 $2 TOPDIR="$(TOPDIR) APPDIR=$(APPDIR)" -endef - depend: - $(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),depend))) + @for dir in $(SUBDIRS) ; do \ + $(MAKE) -C $$dir depend TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + done clean: - $(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),clean))) + @for dir in $(SUBDIRS) ; do \ + $(MAKE) -C $$dir clean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + done distclean: clean - $(foreach DIR, $(SUBDIRS), $(eval $(call DOMAKE,$(DIR),distclean))) + @for dir in $(SUBDIRS) ; do \ + $(MAKE) -C $$dir distclean TOPDIR="$(TOPDIR)" APPDIR=$(APPDIR); \ + done -include Make.dep + diff --git a/apps/vsn/free/Makefile b/apps/vsn/free/Makefile index 421544f3c..01545d06d 100644 --- a/apps/vsn/free/Makefile +++ b/apps/vsn/free/Makefile @@ -61,7 +61,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../../libapps$(LIBEXT) +BIN = $(APPDIR)/libapps$(LIBEXT) ROOTDEPPATH = --dep-path . @@ -95,7 +95,7 @@ $(BIN): $(OBJS) depend: .depend clean: - @rm -f $(BIN) *.o *~ .*.swp .built + @rm -f *.o *~ .*.swp .built $(call CLEAN) distclean: clean diff --git a/apps/vsn/hello/Makefile b/apps/vsn/hello/Makefile index 3f4115ede..45f60e9bd 100644 --- a/apps/vsn/hello/Makefile +++ b/apps/vsn/hello/Makefile @@ -61,7 +61,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../../libapps$(LIBEXT) +BIN = $(APPDIR)/libapps$(LIBEXT) ROOTDEPPATH = --dep-path . @@ -95,7 +95,7 @@ $(BIN): $(OBJS) depend: .depend clean: - @rm -f $(BIN) *.o *~ .*.swp .built + @rm -f *.o *~ .*.swp .built $(call CLEAN) distclean: clean diff --git a/apps/vsn/poweroff/Makefile b/apps/vsn/poweroff/Makefile index 80bde85b0..d4fc2ed00 100644 --- a/apps/vsn/poweroff/Makefile +++ b/apps/vsn/poweroff/Makefile @@ -61,7 +61,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../../libapps$(LIBEXT) +BIN = $(APPDIR)/libapps$(LIBEXT) ROOTDEPPATH = --dep-path . @@ -95,7 +95,7 @@ $(BIN): $(OBJS) depend: .depend clean: - @rm -f $(BIN) *.o *~ .*.swp .built + @rm -f *.o *~ .*.swp .built $(call CLEAN) distclean: clean diff --git a/apps/vsn/ramtron/Makefile b/apps/vsn/ramtron/Makefile index 5803f1ffa..c9aeae651 100644 --- a/apps/vsn/ramtron/Makefile +++ b/apps/vsn/ramtron/Makefile @@ -61,7 +61,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../../libapps$(LIBEXT) +BIN = $(APPDIR)/libapps$(LIBEXT) ROOTDEPPATH = --dep-path . @@ -95,7 +95,7 @@ $(BIN): $(OBJS) depend: .depend clean: - @rm -f $(BIN) *.o *~ .*.swp .built + @rm -f *.o *~ .*.swp .built $(call CLEAN) distclean: clean diff --git a/apps/vsn/sdcard/Makefile b/apps/vsn/sdcard/Makefile index b19ebdec7..ea0f51f35 100644 --- a/apps/vsn/sdcard/Makefile +++ b/apps/vsn/sdcard/Makefile @@ -61,7 +61,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -BIN = ../../libapps$(LIBEXT) +BIN = $(APPDIR)/libapps$(LIBEXT) ROOTDEPPATH = --dep-path . @@ -95,7 +95,7 @@ $(BIN): $(OBJS) depend: .depend clean: - @rm -f $(BIN) *.o *~ .*.swp .built + @rm -f *.o *~ .*.swp .built $(call CLEAN) distclean: clean |