From Axel:

This patch fixes some Module.mks building with an incompatible
-MD(d). They were using ROOTBUILD, not WINRTDEBUG.

Fixes a typo in win32gdk's Module.mk.

Also don't read (or generate) .d files if running make clean-whatever.


git-svn-id: http://root.cern.ch/svn/root/trunk@14302 27541ba8-7e3a-0410-8455-c3a389f83636

Makefile

@@ -434,11 +434,13 @@ endif
 ifeq ($(findstring $(MAKECMDGOALS),clean distclean maintainer-clean dist \
       distsrc version importcint install uninstall showbuild changelog html \
       debian redhat),)
+ifeq ($(findstring clean-,$(MAKECMDGOALS)),)
 ifeq ($(findstring skip,$(MAKECMDGOALS))$(findstring fast,$(MAKECMDGOALS)),)
 -include $(INCLUDEFILES)
 endif
 -include build/dummy.d          # must be last include
 endif
+endif
 
 rootcint:       all-cint all-utils
 

asimage/Module.mk

@@ -25,7 +25,7 @@ ifeq ($(BUILTINASIMAGE),yes)
 ifeq ($(PLATFORM),win32)
 ASTEPLIBA    := $(ASTEPDIRS)/libAfterImage.lib
 ASTEPLIB     := $(LPATH)/libAfterImage.lib
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+ifeq (yes,$(WINRTDEBUG))
 ASTEPBLD      = "libAfterImage - Win32 Debug"
 else
 ASTEPBLD      = "libAfterImage - Win32 Release"

freetype/Module.mk

@@ -23,7 +23,7 @@ FREETYPEDIRI := $(MODDIRS)/$(FREETYPEVERS)/include
 FREETYPELIBS := $(MODDIRS)/$(FREETYPEVERS).tar.gz
 ifeq ($(PLATFORM),win32)
 FREETYPELIB  := $(LPATH)/libfreetype.lib
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+ifeq (yes,$(WINRTDEBUG))
 FREETYPELIBA := $(MODDIRS)/$(FREETYPEVERS)/objs/freetype219MT_D.lib
 FTNMCFG      := "freetype - Win32 Debug Multithreaded"
 else

mathmore/Module.mk

@@ -20,7 +20,7 @@ GSLDIRI      := -I$(MODDIRS)/$(GSLVERS)
 ifeq ($(PLATFORM),win32)
 GSLLIBA      := $(GSLDIRS)/libgsl.lib
 #GSLLIB       := $(LPATH)/libgsl.lib
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+ifeq (yes,$(WINRTDEBUG))
 GSLBLD        = "libgsl - Win32 Debug"
 else
 GSLBLD        = "libgsl - Win32 Release"

pcre/Module.mk

@@ -24,7 +24,7 @@ PCRELIBS     := $(MODDIRS)/$(PCREVERS).tar.gz
 ifeq ($(PLATFORM),win32)
 PCRELIBA     := $(MODDIRS)/$(PCREVERS)/Win32/libpcre-6.4.lib
 PCRELIB      := $(LPATH)/libpcre.lib
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+ifeq (yes,$(WINRTDEBUG))
 PCREBLD      := "libpcre - Win32 Debug"
 else
 PCREBLD      := "libpcre - Win32 Release"

win32gdk/Module.mk

@@ -23,7 +23,7 @@ GDKDLL       := bin/gdk-1.3.dll
 GDKLIB       := $(LPATH)/gdk-1.3.lib
 GDKSRC       := $(wildcard $(GDKDIRS)/*.c) $(wildcard $(GDKDIRS)/win32/*.c)
 
-ifeq (debug,$(findstring debug,$(ROOTBUILD)))
+ifeq (yes,$(WINRTDEBUG))
 GDKNMCXXFLAGS:= "$(BLDCXXFLAGS)" DEBUG=1
 else
 GDKNMCXXFLAGS:= "$(BLDCXXFLAGS)"
@@ -121,4 +121,4 @@ distclean::     distclean-win32gdk
 ##### extra rules #####
 $(WIN32GDKO1) $(WIN32GDKDO): $(FREETYPEDEP)
 $(WIN32GDKO1) $(WIN32GDKDO): CXXFLAGS += $(FREETYPEINC) \
-  -I$(WIN32GDKDIR)/gdk/src CXXFLAGS += $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)
+  -I$(WIN32GDKDIR)/gdk/src $(GDKDIRI:%=-I%) $(GLIBDIRI:%=-I%)