diff --git a/Make/dependencies b/Make/dependencies
index 772634a8e..64fdaaf50 100644
--- a/Make/dependencies
+++ b/Make/dependencies
@@ -1,7 +1,7 @@
 ################################################################
 # Dependency library which have been installed on this system
 
-GDAL_INSTALLED = no
+GDAL_INSTALLED = yes
 JASPER_INSTALLED = no
 
 FREETYPE_INSTALLED = yes
diff --git a/Make/makedefs b/Make/makedefs
index b577a2e58..bcc99e14c 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -474,7 +474,7 @@ ifeq ($(OS),Darwin)
   PNG_LIBS        = -lpng -lz
   JPEG_LIBS       = -ljpeg
   GIF_LIBS        = -lungif
-  TIFF_LIBS       = -ltiff -lz -ljpeg
+  TIFF_LIB       = -ltiff -lz -ljpeg
 
 #  FREETYPE_INCLUDE  = `freetype-config --cflags`
 #  FREETYPE_LIB      = `freetype-config --libs`
diff --git a/Make/makerules b/Make/makerules
index 5524ca44d..1afc15639 100644
--- a/Make/makerules
+++ b/Make/makerules
@@ -9,6 +9,14 @@ debug: $(EXEC:=.dbg)\
 	$(LIB:=.dbg)\
 	$(PLUGIN:=.dbg)\
 
+static:\
+	$(STATICLIB:=.opt)\
+	$(STATICPLUGIN:=.opt)\
+
+staticdebug:\
+	$(STATICLIB:=.dbg)\
+	$(STATICPLUGIN:=.dbg)\
+
 cleandepend: cleandependopt cleandependdbg
 
 cleandependopt:
@@ -68,6 +76,7 @@ ifeq ($(OS),Darwin)
 $(LIB): $(OBJS)
 	$(C++) $(LDFLAGS) $(LIBVERSION) -dynamiclib $(OBJS) $(LIBS) -o $@
 
+
 $(PLUGIN): $(OBJS)
 	$(C++) $(LDFLAGS) -bundle $(OBJS) $(LIBS) -o $@
 else
@@ -80,6 +89,9 @@ else
 $(LIB) $(PLUGIN) : $(OBJS)
 	$(C++) $(LDFLAGS) $(SHARED) $(OBJS) $(LIBS) -o $@
 
+$(STATICLIB) $(STATICPLUGIN): $(OBJS)
+	ar rv $@  $? 
+
 endif # not HP-UX
 endif # not Darwin
 
@@ -99,6 +111,14 @@ $(LIB:=.dbg) : $(PLUGIN:=.dbg)
 	      MAKEDEPEND=Makedepend $(LIB)
 	@$(MAKE) LNSRC=$(DEBUGDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
 
+$(STATICLIB:=.dbg) : $(STATICPLUGIN:=.dbg)
+	@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
+	@cd $(DEBUGDIR);\
+	  $(MAKE) -f ../GNUmakefile "DOF=$(DBGF)"  TOPDIR=../${TOPDIR} \
+	      THISDIR=../$(THISDIR)\
+	      MAKEDEPEND=Makedepend $(STATICLIB)
+	@$(MAKE) LNSRC=$(DEBUGDIR)/$(STATICLIB) LNDEST=$(LIBINST)/$(STATICLIB) __link
+
 $(PLUGIN:=.dbg) : 
 	@[ -d $(DEBUGDIR) ] || mkdir $(DEBUGDIR)
 	@cd $(DEBUGDIR); \
@@ -124,6 +144,15 @@ $(LIB:=.opt) :
 	        MAKEDEPEND=Makedepend $(LIB)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(LIB) LNDEST=$(LIBINST)/$(LIB) __link
 
+$(STATICLIB:=.opt) : 
+	@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
+	@cd $(OPTDIR);\
+	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
+	        THISDIR=../$(THISDIR)\
+	        MAKEDEPEND=Makedepend $(STATICLIB)
+	@$(MAKE) LNSRC=$(OPTDIR)/$(STATICLIB) LNDEST=$(LIBINST)/$(STATICLIB) __link
+
+
 $(PLUGIN:=.opt) : 
 	@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
 	@cd $(OPTDIR); \
@@ -132,6 +161,14 @@ $(PLUGIN:=.opt) :
 	               MAKEDEPEND=Makedepend $(PLUGIN)
 	@$(MAKE) LNSRC=$(OPTDIR)/$(PLUGIN) LNDEST=$(PLUGININST)/$(PLUGIN) __link
 
+$(STATICPLUGIN:=.opt) : 
+	@[ -d $(OPTDIR) ] || mkdir -p $(OPTDIR)
+	@cd $(OPTDIR); \
+	  $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \
+	    THISDIR=../$(THISDIR)\
+	               MAKEDEPEND=Makedepend STATICPLUGIN=$(PLUGIN:.$(PLUGIN_EXT)=.a) $(STATICPLUGIN)
+	@$(MAKE) LNSRC=$(OPTDIR)/$(STATICPLUGIN) LNDEST=$(PLUGININST)/$(STATICPLUGIN) __link
+
 
 ## Revamped method for making Makedepend files
 ## Under this method, Makedepend simply includes
@@ -179,7 +216,6 @@ endif
 depend : $(MAKEDEPEND)
 
 __link : 
-	@echo Calling dolink.sh wit LNSRC = $(LNSRC) and LNDEST = $(LNDEST)
 	@sh $(TOPDIR)/Make/dolink.sh $(TOPDIR) $(LNSRC) $(LNDEST) "$(LINK)"
 		
 __instfiles :