apps/examples/udp and nettest: Back out parts of commit e806097 that …

…broke the build of these examples.
SunJun8 · Oct 18, 2019 · 2830892 · 2830892
1 parent 46612fe
commit 2830892
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile
@@ -109,24 +109,34 @@ $(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_NETTEST_TARGET2),y)
+ifneq ($(CONFIG_EXAMPLES_NETTEST_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_NETTEST_TARGET2),y)
+ifneq ($(CONFIG_EXAMPLES_NETTEST_LOOPBACK),y)
 	$(call DELFILE, *.$(HOSTOBJEXT))
 	$(call DELFILE, $(HOST_BIN))
 	$(call DELFILE, *.dSYM)
-	$(call DELFILE, config.h)
-
 endif
 endif
+	$(call DELFILE, config.h)
 
 MODULE = $(CONFIG_EXAMPLES_NETTEST)
 

diff --git a/examples/udp/Makefile b/examples/udp/Makefile
@@ -96,22 +96,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_UDP_TARGET2),y)
+
 $(HOST_BIN): config.h $(HOST_OBJS)
 	$(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@
 
+endif
+
 context:: config.h $(HOST_BIN)
 
 clean::
+ifneq ($(CONFIG_EXAMPLES_UDP_TARGET2),y)
 	$(call DELFILE, $(HOST_BIN))
 	$(call DELFILE, *.$(HOSTOBJSEXT))
 	$(call DELFILE, *.dSYM)
-	$(call DELFILE, config.h)
-
 endif
+	$(call DELFILE, config.h)
 
 MODULE = $(CONFIG_EXAMPLES_UDP)