diff options
| author | px4dev <px4@purgatory.org> | 2013-01-12 12:39:29 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-12 12:39:29 -0800 |
| commit | 1c63eda98bb89d0d206efb88195020f5822d7df8 (patch) | |
| tree | 0e49e167b225c2e480f64b14348b37aa8854bfdb /apps | |
| parent | 5b07efdbeb8b6c6e7c3e5a86a2e55a2de345b579 (diff) | |
| download | px4-firmware-1c63eda98bb89d0d206efb88195020f5822d7df8.tar.gz px4-firmware-1c63eda98bb89d0d206efb88195020f5822d7df8.tar.bz2 px4-firmware-1c63eda98bb89d0d206efb88195020f5822d7df8.zip | |
Objects depend on the makefile chain as well.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/mk/app.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/mk/app.mk b/apps/mk/app.mk index c5a025394..7cbdc3e62 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, $<, $@) # |