sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/examples/udp and nettest: Back out parts of commit e806097c70084ba98ff2ed1d018afbc126e533ae that broke the build of these examples.

Browse Source
This commit is contained in:
Gregory Nutt 2019-10-18 16:24:43 -06:00
parent 46612fe1a9
commit 2830892424
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/nettest/Makefile
View File

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

10
examples/udp/Makefile
View File

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