From 1c63eda98bb89d0d206efb88195020f5822d7df8 Mon Sep 17 00:00:00 2001 From: px4dev Date: Sat, 12 Jan 2013 12:39:29 -0800 Subject: [PATCH] Objects depend on the makefile chain as well. --- apps/mk/app.mk | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/mk/app.mk b/apps/mk/app.mk index c5a0253940..7cbdc3e620 100644 --- a/apps/mk/app.mk +++ b/apps/mk/app.mk @@ -167,13 +167,9 @@ else PRELINKOBJ = $(LIBNAME).pre.o endif -# The archive that the object file will be placed in # XXX does WINTOOL ever get set? ifeq ($(WINTOOL),y) INCDIROPT = -w - BIN = "$(shell cygpath -w $(APPDIR)/libapps$(LIBEXT))" -else - BIN = "$(APPDIR)/libapps$(LIBEXT)" endif ############################################################################ @@ -206,6 +202,7 @@ context: .context @touch $@ else context: + @exit 0 endif # @@ -214,13 +211,13 @@ endif $(PRELINKOBJ): $(OBJS) $(call PRELINK, $@, $(OBJS)) -$(AOBJS): %.o : %.S +$(AOBJS): %.o : %.S $(MAKEFILE_LIST) $(call ASSEMBLE, $<, $@) -$(COBJS): %.o : %.c +$(COBJS): %.o : %.c $(MAKEFILE_LIST) $(call COMPILE, $<, $@) -$(CXXOBJS): %.o : %.cpp +$(CXXOBJS): %.o : %.cpp $(MAKEFILE_LIST) $(call COMPILEXX, $<, $@) #