From Remi Mommsen:

Patch changes the order of the libraries in asimage/Module.mk which allows
to pick a specific freetype not installed in default locations as the
-L/usr/X11R6/lib/ is defined in $(XLIBS). In addition there is a typo in
x11ttf/Module.mk.


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

asimage/Module.mk

@@ -200,14 +200,16 @@ ifeq ($(PLATFORM),win32)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
 		   "$(ASIMAGEO) $(ASIMAGEDO)" \
-		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \
-                    $(ASEXTRALIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
+		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) \
+                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(ASEXTRALIBDIR) $(ASEXTRALIB)"
 else
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImage.$(SOEXT) $@ \
 		   "$(ASIMAGEO) $(ASIMAGEDO)" \
-		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \
-                    $(ASEXTRALIB) $(XLIBS) $(FREETYPELDFLAGS) $(FREETYPELIB)"
+		   "$(ASIMAGELIBEXTRA) $(ASTEPLIB) \
+                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)"
 endif
 
 $(ASIMAGEDS):   $(ASIMAGEH) $(ASIMAGEL) $(ROOTCINTTMP)
@@ -224,14 +226,16 @@ ifeq ($(PLATFORM),win32)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImageGui.$(SOEXT) $@ \
 		   "$(ASIMAGEGUIO) $(ASIMAGEGUIDO)" \
-		   "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \
-                    $(ASEXTRALIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
+		   "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) \
+                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(ASEXTRALIBDIR) $(ASEXTRALIB)"
 else
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImageGui.$(SOEXT) $@ \
 		   "$(ASIMAGEGUIO) $(ASIMAGEGUIDO)" \
-		   "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \
-                    $(ASEXTRALIB) $(XLIBS) $(FREETYPELDFLAGS) $(FREETYPELIB)"
+		   "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) \
+                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)"
 endif
 
 $(ASIMAGEGUIDS): $(ASIMAGEGUIH) $(ASIMAGEGUIL) $(ROOTCINTTMP)
@@ -248,14 +252,16 @@ ifeq ($(PLATFORM),win32)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImageGS.$(SOEXT) $@ \
 		   "$(ASIMAGEGSO) $(ASIMAGEGSDO)" \
-		   "$(ASIMAGEGSLIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \
-                    $(ASEXTRALIB) $(FREETYPELDFLAGS) $(FREETYPELIB)"
+		   "$(ASIMAGEGSLIBEXTRA) $(ASTEPLIB) \
+                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(ASEXTRALIBDIR) $(ASEXTRALIB)"
 else
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libASImageGS.$(SOEXT) $@ \
 		   "$(ASIMAGEGSO) $(ASIMAGEGSDO)" \
-		   "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) $(ASEXTRALIBDIR) \
-                    $(ASEXTRALIB) $(XLIBS) $(FREETYPELDFLAGS) $(FREETYPELIB)"
+		   "$(ASIMAGEGUILIBEXTRA) $(ASTEPLIB) \
+                    $(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(ASEXTRALIBDIR) $(ASEXTRALIB) $(XLIBS)"
 endif
 
 $(ASIMAGEGSDS): $(ASIMAGEGSH) $(ASIMAGEGSL) $(ROOTCINTTMP)

x11ttf/Module.mk

@@ -40,7 +40,8 @@ $(X11TTFLIB):   $(X11TTFO) $(X11TTFDO) $(FREETYPEDEP) $(MAINLIBS) $(X11TTFLIBDEP
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ \
 		   "$(X11TTFO) $(X11TTFDO)" \
-		   "$(FREETYPELDLFAGS) $(FREETYPELIB) $(X11TTFLIBEXTRA) $(XLIBS)"
+		   "$(FREETYPELDFLAGS) $(FREETYPELIB) \
+		    $(X11TTFLIBEXTRA) $(XLIBS)"
 
 $(X11TTFDS):    $(X11TTFH) $(X11TTFL) $(ROOTCINTTMP)
 		@echo "Generating dictionary $@..."