diff options
-rw-r--r-- | apps/netutils/dhcpc/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/dhcpd/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/resolv/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/smtp/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/telnetd/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/tftpc/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/thttpd/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/webclient/Makefile | 2 | ||||
-rw-r--r-- | apps/netutils/webserver/Makefile | 2 | ||||
-rw-r--r-- | nuttx/ChangeLog | 2 | ||||
-rwxr-xr-x | nuttx/tools/mkdeps.sh | 6 |
11 files changed, 5 insertions, 21 deletions
diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index 0434630c9..d5f1f90c5 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifeq ($(CONFIG_NET_UDP),y) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile index 77c69d155..136bb134c 100644 --- a/apps/netutils/dhcpd/Makefile +++ b/apps/netutils/dhcpd/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifeq ($(CONFIG_NET_UDP),y) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/resolv/Makefile b/apps/netutils/resolv/Makefile index 53556203c..32d0896e2 100644 --- a/apps/netutils/resolv/Makefile +++ b/apps/netutils/resolv/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifeq ($(CONFIG_NET_UDP),y) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index dfad84f91..758e436f3 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifneq ($(SRCS),) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile index 5c2ea0c28..cba7f0c70 100644 --- a/apps/netutils/telnetd/Makefile +++ b/apps/netutils/telnetd/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifneq ($(SRCS),) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index e810124a6..1ec7b2b90 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -84,9 +84,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifeq ($(CONFIG_NET_UDP),y) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 5a7d0d852..4978c7c79 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -114,9 +114,7 @@ endif context: .depend: Makefile $(SRCS) -ifneq ($(SRCS),) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index e6a1aa575..e6616e8c8 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifneq ($(SRCS),) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile index 7f44fd8c8..a1422a249 100644 --- a/apps/netutils/webserver/Makefile +++ b/apps/netutils/webserver/Makefile @@ -82,9 +82,7 @@ $(COBJS): %$(OBJEXT): %.c context: .depend: Makefile $(SRCS) -ifneq ($(SRCS),) @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep -endif @touch $@ depend: .depend diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 1d696e6f4..59cb892e3 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1735,3 +1735,5 @@ build time * Makefile: Removed support for Pascal pcode interpreter. Support for that interpreter has been moved to apps/interpreter/Makefile. + * tools/mkdep.sh: Should not report an error if there are no files on the command + line. This happens normally in certain configurations. diff --git a/nuttx/tools/mkdeps.sh b/nuttx/tools/mkdeps.sh index 7df4d00c6..0aec5dba8 100755 --- a/nuttx/tools/mkdeps.sh +++ b/nuttx/tools/mkdeps.sh @@ -156,9 +156,9 @@ if [ -z "$cc" ]; then fi if [ -z "$files" ]; then - echo "No files specified" - show_usage - exit 2 + # Don't report an error -- this happens normally in some configurations + echo "# No files specified for dependency generataion" + exit 0 fi # Check if this compiler generates Cygwin/Linux paths or Windows paths |