OSGeo · jef-n · Jan 26, 2013
diff --git a/gdal/frmts/georaster/makefile.vc b/gdal/frmts/georaster/makefile.vc
@@ -13,7 +13,8 @@ PLUGIN_DLL = gdal_GEOR.dll
 !IFDEF JPEG_EXTERNAL_LIB
 JPEG_FLAGS =	-I$(JPEGDIR) -DJPEG_SUPPORTED
 !ELSE
-JPEG_FLAGS =	-I..\jpeg\libjpeg -DJPEG_SUPPORTED
+JPEG_FLAGS = -I..\jpeg\libjpeg -DJPEG_SUPPORTED
+JPEG_LIB   = ..\jpeg\libjpeg\libjpeg.lib
 !ENDIF
 !ENDIF
 
@@ -37,7 +38,7 @@ plugin:	$(PLUGIN_DLL)
 
 $(PLUGIN_DLL): $(OBJ)
 	link /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) $(GDALLIB) $(OCI_LIB) ..\zlib\*.obj \
-	..\jpeg\vsidataio.obj ..\jpeg\libjpeg\libjpeg.lib
+	..\jpeg\vsidataio.obj $(JPEG_LIB)
 	if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2
 
 plugin-install:

diff --git a/gdal/makefile.vc b/gdal/makefile.vc
@@ -127,6 +127,11 @@ plugin_dir:
 	cd frmts
 	$(MAKE) /f makefile.vc plugindirs
 	cd ..
+!IFDEF INCLUDE_OGR_FRMTS
+	cd ogr\ogrsf_frmts
+	$(MAKE) /f makefile.vc plugindirs
+	cd ..\..
+!ENDIF
 
 apps_dir:
 	cd apps
@@ -186,11 +191,12 @@ install: $(GDAL_DLL) plugin_dir apps_dir
 	cd ogr
 	$(MAKE) /f makefile.vc install
 	cd ..
-!IFDEF HTMLDIR
 	cd ogr\ogrsf_frmts
+	$(MAKE) /f makefile.vc plugins-install
+!IFDEF HTMLDIR
 	$(MAKE) /f makefile.vc html-install
-	cd ..\..
 !ENDIF
+	cd ..\..
 !ENDIF
 
 devinstall: install

diff --git a/gdal/ogr/ogrsf_frmts/dwg/makefile.vc b/gdal/ogr/ogrsf_frmts/dwg/makefile.vc
@@ -10,7 +10,7 @@ OBJ =	\
 
 DXF_OBJ = ..\dxf\intronurbs.obj ..\dxf\ogrdxf_polyline_smooth.obj 
 
-PLUGINDLL = ogr_DWG.dll
+PLUGIN_DLL = ogr_DWG.dll
 
 GDAL_ROOT	=	..\..\..
 
@@ -52,13 +52,14 @@ clean:
 	-del *.obj *.pdb
 	-del *.dll
 
-plugin:	 $(PLUGINDLL)
+plugin:	 $(PLUGIN_DLL)
 
-$(PLUGINDLL):	$(OBJ)
-	link /dll $(LDEBUG) /out:$(PLUGINDLL) $(OBJ) $(DXF_OBJ) \
+$(PLUGIN_DLL):	$(OBJ)
+	link /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) $(DXF_OBJ) \
 		$(GDAL_ROOT)/gdal_i.lib $(TD_LIBS)
-	if exist $(PLUGINDLL).manifest mt -manifest $(PLUGINDLL).manifest \
-		-outputresource:$(PLUGINDLL);2
-
-
+	if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest \
+		-outputresource:$(PLUGIN_DLL);2
 
+plugin-install:
+	-mkdir $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
diff --git a/gdal/ogr/ogrsf_frmts/generic/makefile.vc b/gdal/ogr/ogrsf_frmts/generic/makefile.vc
@@ -35,8 +35,10 @@ ODBCDEF	=	-DODBC_ENABLED -DPGEO_ENABLED -DMSSQLSPATIAL_ENABLED -DGEOMEDIA_ENABLE
 !ENDIF
 
 !IFDEF PG_LIB
+!IFNDEF PG_PLUGIN
 PGDEF	=	-DPG_ENABLED
 !ENDIF
+!ENDIF
 
 !IFDEF MYSQL_LIB
 MYSQLDEF	=	-DMYSQL_ENABLED
@@ -65,9 +67,12 @@ FMEDEF = -DFME_ENABLED
 !IFDEF ILI_ENABLED
 ILIDEF = -DILI_ENABLED
 !ENDIF
+
 !IFDEF DWGDIRECT
+!IF "$(DWG_PLUGIN)" != "YES"
 ILIDEF = -DDWGDIRECT_ENABLED
 !ENDIF
+!ENDIF
 
 !IFDEF SDE_ENABLED
 !IF "$(SDE_PLUGIN)" != "YES"
@@ -88,8 +93,10 @@ DODSDEF = -DDODS_ENABLED
 !ENDIF
 
 !IFDEF LIBKML_DIR
+!IFNDEF LIBKML_PLUGIN
 LIBKMLDEF = -DLIBKML_ENABLED
 !ENDIF
+!ENDIF
 
 !IFDEF CURL_LIB
 WFSDEF = -DWFS_ENABLED

diff --git a/gdal/ogr/ogrsf_frmts/ingres/makefile.vc b/gdal/ogr/ogrsf_frmts/ingres/makefile.vc
@@ -3,6 +3,8 @@ OBJ =	ogringresdriver.obj ogringresdatasource.obj ogringreslayer.obj \
 	ogringrestablelayer.obj ogringresresultlayer.obj \
 	ogringresstatement.obj 
 
+PLUGIN_DLL = ogr_Ingres.dll
+
 GDAL_ROOT	=	..\..\..
 
 !INCLUDE $(GDAL_ROOT)\nmake.opt
@@ -11,9 +13,15 @@ EXTRAFLAGS = -I.. -I..\.. -I$(INGRES_INC_DIR)
 
 default:	$(OBJ)
 
-ogr_Ingres.dll:	$(OBJ)
-	link /dll /out:ogr_Ingres.dll $(OBJ) $(GDALLIB) $(INGRES_LIB)
-	if exist ogr_Ingres.dll.manifest mt -manifest ogr_Ingres.dll.manifest -outputresource:ogr_Ingres.dll;2
+$(PLUGIN_DLL):	$(OBJ)
+	link /dll /out:$(PLUGIN_DLL) $(OBJ) $(GDALLIB) $(INGRES_LIB)
+	if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2
+
+plugin: $(PLUGIN_DLL)
+
+plugin-install:
+        -mkdir $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
 
 clean:
 	-del *.lib

diff --git a/gdal/ogr/ogrsf_frmts/libkml/makefile.vc b/gdal/ogr/ogrsf_frmts/libkml/makefile.vc
@@ -8,6 +8,8 @@ CORE_OBJ =	ogrlibkmlgeometry.obj \
 		ogrlibkmlfeaturestyle.obj \
 		ogrlibkmlstyle.obj
 
+PLUGIN_DLL = ogr_LIBKML.dll
+
 OGR_OBJ =	ogrlibkmldriver.obj \
 		ogrlibkmldatasource.obj \
 		ogrlibkmllayer.obj
@@ -23,6 +25,13 @@ clean:
 	-del *.obj *.pdb
 	-del *.dll
 
-ogr_LIBKML.dll:	$(OBJ)
-	link /dll $(LDEBUG) /out:ogr_LIBKML.dll $(OBJ) /LTCG \
+plugin: $(PLUGIN_DLL)
+
+$(PLUGIN_DLL):	$(OBJ)
+	link /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) /LTCG \
 		$(GDAL_ROOT)/gdal_i.lib $(LIBKML_LIBS)
+
+plugin-install:
+        -mkdir $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
+
diff --git a/gdal/ogr/ogrsf_frmts/makefile.vc b/gdal/ogr/ogrsf_frmts/makefile.vc
@@ -13,6 +13,15 @@ DIRLIST		=	generic geojson shape ntf sdts tiger s57 dgn mitab gml \
 			$(COUCHDBDIR) $(FGDB_DIR) $(XLSDIR) $(ODSDIR) $(XLSXDIR) \
 			$(INGRESDIR) $(ELASTICDIR) $(OSMDIR)
 
+PLUGINDIRLIST	=	$(PLUGIN_ARCOBJECTS_DIR) \
+			$(PLUGIN_DWG_DIR) \
+			$(PLUGIN_PG_DIR) \
+			$(PLUGIN_FGDB_DIR) \
+			$(PLUGIN_OCIDIR) \
+			$(PLUGIN_SDE_DIR) \
+			$(PLUGIN_INGRESDIR) \
+			$(PLUGIN_LIBKMLDIR)
+
 !INCLUDE $(GDAL_ROOT)\nmake.opt
 
 !IF "$(PCIDSK_SETTING)" == "EXTERNAL"
@@ -40,14 +49,20 @@ SQLITE_OBJ =	sqlite\*.obj
 !ENDIF
 
 !IFDEF OCI_LIB
+!IF "$(OCI_PLUGIN)" != "YES"
 OCIDIR =	oci
 OCIOBJ =	oci\*.obj
+!ELSE
+PLUGIN_OCIDIR = oci
+!ENDIF
 !ENDIF
 
 !IFDEF INGRES_HOME
 !IF "$(INGRES_PLUGIN)" != "YES"
 INGRESDIR	=	ingres
 INGRESOBJ =	ingres\*.obj
+!ELSE
+PLUGIN_INGRESDIR =	ingres
 !ENDIF
 !ENDIF
 
@@ -57,31 +72,49 @@ FMEOBJ = fme\*.obj
 !ENDIF
 
 !IFDEF PG_INC_DIR
+!IF "$(PG_PLUGIN)" != "YES"
 PG_DIR = pg
 PG_OBJ = pg\*.obj
+!ELSE
+PLUGIN_PG_DIR = pg
+!ENDIF
 !ENDIF
 
 !IFDEF DWGDIRECT
+!IF "$(DWG_PLUGIN)" != "YES"
 DWGDIR = dxfdwg
 DWG_OBJ = dxfdwg\*.obj
+!ELSE
+PLUGIN_DWGDIR = dxfdwg
+!ENDIF
 !ENDIF
 
 !IFDEF SDE_LIB
+!IF "$(SDE_PLUGIN)" != "YES"
 SDE_DIR = sde
 SDE_OBJ = sde\*.obj
+!ELSE
+PLUGIN_SDE_DIR = sde
+!ENDIF
 !ENDIF
 
 !IFDEF FGDB_LIB
 !IF "$(FGDB_PLUGIN)" != "YES"
 FGDB_DIR = filegdb
 FGDB_OBJ = filegdb\*.obj
+!ELSE
+PLUGIN_FGDB_DIR = filegdb
 !ENDIF
 !ENDIF
 
 
 !IFDEF HAS_ARCOBJECTS
+!IF "$(ARCOBJECTS_PLUGIN)" != "YES"
 ARCOBJECTS_DIR = arcobjects
 ARCOBJECTS_OBJ = arcobjects\*.obj
+!ELSE
+PLUGIN_ARCOBJECTS_DIR = arcobjects
+!ENDIF
 !ENDIF
 
 
@@ -111,8 +144,12 @@ DODS_OBJ = dods\*.obj
 !ENDIF
 
 !IFDEF LIBKML_DIR
+!IF "$(LIBKML_PLUGIN)" != "YES"
 LIBKMLDIR = libkml
 LIBKMLOBJ =	libkml\*.obj
+!ELSE
+PLUGIN_LIBKMLDIR = libkml
+!ENDIF
 !ENDIF
 
 !IFDEF CURL_LIB
@@ -198,6 +235,14 @@ default:
 				 ..\..\frmts\sdts\sdtsindexedreader.obj \
 				 ..\..\frmts\sdts\sdtsxref.obj
 
+plugindirs:
+	@echo plugins: $(PLUGINDIRLIST)
+        for %d in ( $(PLUGINDIRLIST) ) do \
+                cd %d \
+                && $(MAKE) /f makefile.vc plugin \
+                && cd .. \
+                || exit 1
+
 clean:
 	-del ogrsf_frmts.lib
 	-del ogrsf_frmts_sup.lib
@@ -207,6 +252,13 @@ clean:
 		&& cd .. \
 		|| exit 1
 
+plugins-install:
+        -for %d in ( $(PLUGINDIRLIST) ) do \
+                cd %d \
+                && $(MAKE) /f makefile.vc plugin-install \
+                && cd .. \
+                || exit 1
+
 html-install:
 	copy *.html $(HTMLDIR)
 	-for %d in ( $(DIRLIST) ) do \

diff --git a/gdal/ogr/ogrsf_frmts/oci/makefile.vc b/gdal/ogr/ogrsf_frmts/oci/makefile.vc
@@ -5,6 +5,7 @@ OGR_OBJ	=	ogrocidriver.obj ogrocidatasource.obj ogrocilayer.obj \
 		ogrociwritablelayer.obj ogrociloaderlayer.obj \
 		ogrocistroke.obj
 
+PLUGIN_DLL =	ogr_OCI.dll
 
 OBJ	=	$(LL_OBJ) $(OGR_OBJ)
 
@@ -22,8 +23,10 @@ clean:
 	-del *.obj *.pdb
 	-del *.exe
 
-ogr_OCI.dll:	$(OBJ)
-	link /dll $(LDEBUG) /out:ogr_OCI.dll $(OBJ) \
+plugin:	$(PLUGIN_DLL)
+
+$(PLUGIN_DLL):	$(OBJ)
+	link /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) \
 		$(GDAL_ROOT)/gdal_i.lib $(OCI_LIB)
 	if exist ogr_OCI.dll.manifest mt -manifest ogr_OCI.dll.manifest \
 		-outputresource:ogr_OCI.dll;2
@@ -39,3 +42,6 @@ fastload.exe:	$(LL_OBJ) fastload.obj
 		$(GDAL_ROOT)/port/cpl.lib $(OCI_LIB) $(LIBS)
 
 
+plugin-install:
+        -mkdir $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
diff --git a/gdal/ogr/ogrsf_frmts/pg/makefile.vc b/gdal/ogr/ogrsf_frmts/pg/makefile.vc
@@ -2,6 +2,8 @@
 OBJ	=	ogrpgdriver.obj ogrpgdatasource.obj ogrpglayer.obj \
 		ogrpgtablelayer.obj ogrpgresultlayer.obj ogrpgutility.obj
 
+PLUGIN_DLL = ogr_PG.dll
+
 GDAL_ROOT	=	..\..\..
 
 !INCLUDE $(GDAL_ROOT)\nmake.opt
@@ -10,13 +12,19 @@ EXTRAFLAGS = -I.. -I..\.. -I$(PG_INC_DIR)
 
 default:	$(OBJ)
 
-ogr_PG.dll:	$(OBJ)
-	link /dll /out:ogr_PG.dll $(OBJ) $(GDALLIB) $(PG_LIB)
-	if exist ogr_PG.dll.manifest mt -manifest ogr_PG.dll.manifest -outputresource:ogr_PG.dll;2
+plugin: $(PLUGIN_DLL)
+
+$(PLUGIN_DLL):	$(OBJ)
+	link /dll /out:$(PLUGIN_DLL) $(OBJ) $(GDALLIB) $(PG_LIB)
+	if exist $(PLUGIN_DLL).manifest mt -manifest $(PLUGIN_DLL).manifest -outputresource:$(PLUGIN_DLL);2
 
 clean:
 	-del *.lib
 	-del *.obj *.pdb *.exp
 	-del *.exe
 	-del *.dll
-	-del *.manifest
+	-del *.manifest
+
+plugin-install:
+	-mkdir $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)
diff --git a/gdal/ogr/ogrsf_frmts/sde/makefile.vc b/gdal/ogr/ogrsf_frmts/sde/makefile.vc
@@ -1,6 +1,8 @@
 OBJ     =       ogrsdedatasource.obj ogrsdedriver.obj ogrsdelayer.obj
 EXTRAFLAGS =	-I.. -I..\.. -I$(SDE_INC)
 
+PLUGIN_DLL = ogr_SDE.dll
+
 GDAL_ROOT	=	..\..\..
 
 !INCLUDE $(GDAL_ROOT)\nmake.opt
@@ -10,6 +12,12 @@ default:	$(OBJ)
 clean:
 	-del *.obj *.pdb
 
-ogr_SDE.dll:	$(OBJ)
-	link /dll $(LDEBUG) /out:ogr_SDE.dll $(OBJ) \
-		$(GDALLIB) $(SDE_LIB)
+plugin: $(PLUGIN_DLL)
+
+$(PLUGIN_DLL):	$(OBJ)
+	link /dll $(LDEBUG) /out:$(PLUGIN_DLL) $(OBJ) \
+		$(GDALLIB) $(SDE_LIB)
+
+plugin-install:
+	-mkdir $(PLUGINDIR)
+	$(INSTALL) $(PLUGIN_DLL) $(PLUGINDIR)