Browse Source

Objects depend on the makefile chain as well.

sbg
px4dev 12 years ago
parent
commit
1c63eda98b
  1. 11
      apps/mk/app.mk

11
apps/mk/app.mk

@ -167,13 +167,9 @@ else
PRELINKOBJ = $(LIBNAME).pre.o PRELINKOBJ = $(LIBNAME).pre.o
endif endif
# The archive that the object file will be placed in
# XXX does WINTOOL ever get set? # XXX does WINTOOL ever get set?
ifeq ($(WINTOOL),y) ifeq ($(WINTOOL),y)
INCDIROPT = -w INCDIROPT = -w
BIN = "$(shell cygpath -w $(APPDIR)/libapps$(LIBEXT))"
else
BIN = "$(APPDIR)/libapps$(LIBEXT)"
endif endif
############################################################################ ############################################################################
@ -206,6 +202,7 @@ context: .context
@touch $@ @touch $@
else else
context: context:
@exit 0
endif endif
# #
@ -214,13 +211,13 @@ endif
$(PRELINKOBJ): $(OBJS) $(PRELINKOBJ): $(OBJS)
$(call PRELINK, $@, $(OBJS)) $(call PRELINK, $@, $(OBJS))
$(AOBJS): %.o : %.S $(AOBJS): %.o : %.S $(MAKEFILE_LIST)
$(call ASSEMBLE, $<, $@) $(call ASSEMBLE, $<, $@)
$(COBJS): %.o : %.c $(COBJS): %.o : %.c $(MAKEFILE_LIST)
$(call COMPILE, $<, $@) $(call COMPILE, $<, $@)
$(CXXOBJS): %.o : %.cpp $(CXXOBJS): %.o : %.cpp $(MAKEFILE_LIST)
$(call COMPILEXX, $<, $@) $(call COMPILEXX, $<, $@)
# #

Loading…
Cancel
Save