Revert "Makefile: move INCDIROPT to common place (#625)"

This reverts commit b9ace36fcc.

This change was added by PR 625 but has a serious logic flaw.  It removes all occurrences of INCDIROPT and replaces it with a definition in tools/Config.mk:

    else ifeq ($(WINTOOL),y)
      DEFINE = "$(TOPDIR)/tools/define.sh"
      INCDIR = "$(TOPDIR)/tools/incdir.sh" -w

This logic flaw is the Config.mk is included in all Make.defs files BEFORE WINTOOL is defined.  As a result, the definition is wrong in many places when building under Cygwin with a Windows native toolchain.

wireless/Makefile

@@ -36,6 +36,10 @@
 -include $(TOPDIR)/Make.defs
 DELIM ?= $(strip /)
 
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
 # Add files to the build
 
 DEPPATH = --dep-path .

wireless/bluetooth/Make.defs

@@ -43,6 +43,6 @@ CSRCS += bt_uuid.c
 
 DEPPATH += --dep-path bluetooth
 VPATH += :bluetooth
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)bluetooth}
 
 endif # CONFIG_WIRELESS_BLUETOOTH

wireless/ieee802154/Make.defs

@@ -66,6 +66,6 @@ endif
 
 DEPPATH += --dep-path ieee802154
 VPATH += :ieee802154
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)ieee802154}
 
 endif # CONFIG_WIRELESS_IEEE802154

wireless/pktradio/Make.defs

@@ -45,6 +45,6 @@ endif
 
 DEPPATH += --dep-path pktradio
 VPATH += :pktradio
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)wireless$(DELIM)pktradio}
 
 endif # CONFIG_WIRELESS_PKTRADIO