Skip to content

Commit ee7a7d6

Browse files
author
rblazek
committed
postgres and grass conditional
git-svn-id: http://svn.osgeo.org/qgis/trunk@5689 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 817e01b commit ee7a7d6

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/Makefile.win

+11-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22
# creates static libraries (.libs/libqgis_xxx.a)
33
# then we run win32 specific makefiles which generates DLL
44

5+
all: stdsubdirs guilib winsubdirs
6+
7+
include ../Makefile.win.rules
8+
59
STDSUBDIRS = core ui legend raster composer widgets helpviewer
610
#providers plugins
711

812
WINSUBDIRS = core legend raster composer \
913
widgets/projectionselector gui \
1014
providers/ogr \
11-
providers/grass \
1215
providers/wms \
13-
providers/postgres \
1416
providers/gpx \
1517
providers/delimitedtext \
16-
plugins/grass \
1718
plugins/north_arrow \
1819
plugins/copyright_label \
1920
plugins/geoprocessing \
@@ -24,8 +25,13 @@ WINSUBDIRS = core legend raster composer \
2425
plugins/gps_importer \
2526
plugins/spit
2627

27-
28-
all: stdsubdirs guilib winsubdirs
28+
ifneq ($(GRASS_BASE),)
29+
WINSUBDIRS += providers/grass plugins/grass
30+
endif
31+
32+
ifneq ($(PG_LIB),)
33+
WINSUBDIRS += providers/postgres
34+
endif
2935

3036
guilib:
3137
$(MAKE) -C gui -f Makefile libqgis_gui.la
@@ -37,4 +43,3 @@ install: all
3743
$(MAKE) -C $$subdir -f Makefile.win install || exit 1 ; \
3844
done
3945

40-
include ../Makefile.win.rules

0 commit comments

Comments
 (0)