apps/examples/flowc, tcpblaster, and udpblaster: Back out more changes that broke the makefiles fixed by commit 2830892424. This applies the same fix to other Makefiles that follow that same pattern and seem to have the same breakage.

This commit is contained in:
Gregory Nutt 2019-10-18 16:47:57 -06:00
parent 2830892424
commit 8cb4896bdb
4 changed files with 26 additions and 8 deletions

View File

@ -88,22 +88,28 @@ $(HOST_OBJS): %.$(HOSTOBJSEXT): %.c
@echo "CC: $<"
$(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
endif
config.h: $(TOPDIR)/include/nuttx/config.h
@echo "CP: $<"
$(Q) cp $< $@
ifneq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y)
$(HOST_BIN): config.h $(HOST_OBJS)
$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
endif
context:: config.h $(HOST_BIN)
clean::
ifneq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y)
$(call DELFILE, $(HOST_BIN))
$(call DELFILE, *.$(HOSTOBJSEXT))
$(call DELFILE, *.dSYM)
$(call DELFILE, config.h)
endif
$(call DELFILE, config.h)
MODULE = $(CONFIG_EXAMPLES_FLOWC)

View File

@ -2,7 +2,6 @@
/.depend
/.built
/host
/config.h
/*.asm
/*.obj
/*.rel

View File

@ -106,25 +106,35 @@ $(HOST_OBJS): %.$(HOSTOBJEXT): %.c
@echo "CC: $<"
$(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
endif
endif
config.h: $(TOPDIR)/include/nuttx/config.h
@echo "CP: $<"
$(Q) cp $< $@
ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y)
ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y)
$(HOST_BIN): config.h $(HOST_OBJS)
@echo "LD: $@"
$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
endif
endif
context:: config.h $(HOST_BIN)
clean::
ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y)
ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y)
$(call DELFILE, *.$(HOSTOBJEXT))
$(call DELFILE, $(HOST_BIN))
$(call DELFILE, *.dSYM)
endif
endif
$(call DELFILE, config.h)
endif
endif
MODULE = $(CONFIG_EXAMPLES_TCPBLASTER)
include $(APPDIR)/Application.mk

View File

@ -60,24 +60,27 @@ ifneq ($(CONFIG_EXAMPLES_UDPBLASTER_LOOPBACK),y)
$(HOST_OBJS): %$(HOSTOBJEXT): %.c
@echo "CC: $<"
$(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
endif
config.h: $(TOPDIR)/include/nuttx/config.h
@echo "CP: $<"
$(Q) cp $< $@
ifneq ($(CONFIG_EXAMPLES_UDPBLASTER_LOOPBACK),y)
$(HOST_BIN): config.h $(HOST_OBJS)
@echo "LD: $@"
$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
endif
context:: config.h $(HOST_BIN)
clean::
ifneq ($(CONFIG_EXAMPLES_UDPBLASTER_LOOPBACK),y)
$(call DELFILE, *$(HOSTOBJEXT))
$(call DELFILE, $(HOST_BIN))
$(call DELFILE, *.dSYM)
$(call DELFILE, config.h)
endif
$(call DELFILE, config.h)
MODULE = $(CONFIG_EXAMPLES_UDPBLASTER)