fix so that there are no non-loadable .lib files anymore in the rootmap

file.


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

config/Makefile.depend

@@ -12,9 +12,8 @@ GPADLIBDEP          = $(GRAFLIB) $(HISTLIB)
 GPADLIBEXTRA        = lib/libGraf.lib lib/libHist.lib
 G3DLIBDEP           = $(GRAFLIB) $(HISTLIB)
 G3DLIBEXTRA         = lib/libGraf.lib lib/libHist.lib
-WIN32GDKLIBDEP      = $(GPADLIB) $(GRAFLIB) $(GDKDLLS) $(GDKLIBS)
-WIN32GDKLIBEXTRA    = lib/libGpad.lib lib/libGraf.lib $(GDKLIBS) Glu32.lib \
-                      Opengl32.lib
+WIN32GDKLIBDEP      = $(GPADLIB) $(GRAFLIB)
+WIN32GDKLIBEXTRA    = lib/libGpad.lib lib/libGraf.lib
 ASIMAGELIBDEP       = $(GRAFLIB) $(HISTLIB) $(GPADLIB)
 ASIMAGELIBEXTRA     = lib/libGraf.lib lib/libHist.lib lib/libGpad.lib
 ASIMAGEGUILIBDEP    = $(GRAFLIB) $(HISTLIB) $(GUILIB) $(ASIMAGELIB)

win32gdk/Module.mk

@@ -85,11 +85,11 @@ $(GDKLIBA):     $(GDKSRC)
                   NMCXXFLAGS=$(GDKNMCXXFLAGS) VC_MAJOR=$(VC_MAJOR))
 
 $(WIN32GDKLIB): $(WIN32GDKO) $(WIN32GDKDO) $(FREETYPEDEP) $(GDKLIB) $(GDKDLL) \
-                $(ORDER_) $(MAINLIBS) $(WIN32GDKLIBDEP)
+                $(ORDER_) $(MAINLIBS) $(GDKDLLS) $(GDKLIBS) $(WIN32GDKLIBDEP)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libWin32gdk.$(SOEXT) $@ \
 		   "$(WIN32GDKO) $(WIN32GDKDO)" \
-		   "$(FREETYPELDFLAGS) $(FREETYPELIB) $(GDKLIB) $(WIN32GDKLIBEXTRA)"
+		   "$(FREETYPELDFLAGS) $(FREETYPELIB) $(GDKLIB) $(WIN32GDKLIBEXTRA) $(GDKLIBS) Glu32.lib Opengl32.lib"
 
 $(WIN32GDKDS):  $(WIN32GDKH1) $(WIN32GDKL) $(ROOTCINTTMPEXE)
 		@echo "Generating dictionary $@..."