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.

graphics/Makefile

@@ -38,6 +38,10 @@
 
 DEPPATH = --dep-path .
 
+ifeq ($(WINTOOL),y)
+INCDIROPT = -w
+endif
+
 ASRCS =
 CSRCS =
 VPATH =

graphics/nxbe/Make.defs

@@ -51,5 +51,5 @@ CSRCS += nxbe_cursor.c
 endif
 
 DEPPATH += --dep-path nxbe
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxbe}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxbe}
 VPATH += :nxbe

graphics/nxglib/Make.defs

@@ -111,6 +111,6 @@ CSRCS += nxglib_cursor_backup_24bpp.c nxglib_cursor_backup_32bpp.c
 endif
 
 DEPPATH += --dep-path nxglib
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxglib}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxglib}
 #VPATH += :nxglib
 VPATH = nxglib

graphics/nxmu/Make.defs

@@ -39,5 +39,5 @@ CSRCS += nxmu_sendclient.c nxmu_sendclientwindow.c nxmu_server.c
 CSRCS += nxmu_start.c
 
 DEPPATH += --dep-path nxmu
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxmu}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxmu}
 VPATH += :nxmu

graphics/nxterm/Make.defs

@@ -52,7 +52,7 @@ CSRCS += nxterm_sem.c
 endif
 
 DEPPATH += --dep-path nxterm
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/nxterm}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxterm}
 VPATH += :nxterm
 
 endif

graphics/vnc/client/Make.defs

@@ -36,7 +36,7 @@
 ifeq ($(CONFIG_VNCCLIENT),y)
 
 DEPPATH += --dep-path vnc/client
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/client}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/client}
 VPATH += :vnc/client
 
 endif

graphics/vnc/server/Make.defs

@@ -43,7 +43,7 @@ CSRCS += vnc_keymap.c
 endif
 
 DEPPATH += --dep-path vnc/server
-CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/server}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/vnc/server}
 VPATH += :vnc/server
 
 endif