dependencies

git-svn-id: http://svn.osgeo.org/qgis/trunk@4795 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 3, 2006 · 8aaad62 · 8aaad62
1 parent 88260cd
commit 8aaad62
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/src/composer/Makefile.win b/src/composer/Makefile.win
@@ -7,16 +7,19 @@ all: libs $(DLL)
 libs:
 	$(MAKE) -f Makefile libqgis_composer.la
 
-$(DLL):
+$(DLL): .libs/libqgis_composer.a
 	$(CXX) -shared -o $(DLL) \
 		-Wl,--out-implib=lib$(DLL).a \
 		-Wl,--export-all-symbols \
 		-Wl,--enable-auto-import \
 		-Wl,--whole-archive .libs/libqgis_composer.a \
 		-Wl,--no-whole-archive \
-			$(CORE_A) \
+			$(GUI_A) $(CORE_A) $(RASTER_A) $(LEGEND_A) \
+			$(PROJSEL_A) $(CORE_A) $(GUI_A) $(CORE_A) \
+			$(GUI_A) \
+			-lproj -lgdal -lsqlite3 \
 			$(QT_LDADD) \
-			-lmingw32
+			-lwsock32 -lmingw32
 	$(STRIP) $@
 
 install: all

diff --git a/src/core/Makefile.win b/src/core/Makefile.win
@@ -7,7 +7,7 @@ all: libs $(DLL)
 libs:
 	$(MAKE) -f Makefile libqgis_core.la
 
-$(DLL):
+$(DLL): .libs/libqgis_core.a
 	$(CXX) -shared -o $(DLL) \
 		-Wl,--out-implib=lib$(DLL).a \
 		-Wl,--export-all-symbols \

diff --git a/src/gui/Makefile.win b/src/gui/Makefile.win
@@ -18,7 +18,7 @@ objects:
 libs:
 	$(MAKE) -f Makefile libqgis_gui.la
 
-$(DLL):
+$(DLL): .libs/libqgis_gui.a
 	$(CXX) -shared -o $(DLL) \
 		-Wl,--out-implib=lib$(DLL).a \
 		-Wl,--export-all-symbols \

diff --git a/src/legend/Makefile.win b/src/legend/Makefile.win
@@ -7,7 +7,7 @@ all: libs $(DLL)
 libs:
 	$(MAKE) -f Makefile libqgis_legend.la
 
-$(DLL):
+$(DLL): .libs/libqgis_legend.a
 	$(CXX) -shared -o $(DLL) \
 		-Wl,--out-implib=lib$(DLL).a \
 		-Wl,--export-all-symbols \

diff --git a/src/raster/Makefile.win b/src/raster/Makefile.win
@@ -7,7 +7,7 @@ all: libs $(DLL)
 libs:
 	$(MAKE) -f Makefile libqgis_raster.la
 
-$(DLL):
+$(DLL): .libs/libqgis_raster.a
 	$(CXX) -shared -o $(DLL) \
 		-Wl,--out-implib=lib$(DLL).a \
 		-Wl,--export-all-symbols \

diff --git a/src/widgets/projectionselector/Makefile.win b/src/widgets/projectionselector/Makefile.win
@@ -7,7 +7,7 @@ all: libs $(DLL)
 libs:
 	$(MAKE) -f Makefile libqgsprojectionselector.la
 
-$(DLL):
+$(DLL): .libs/libqgsprojectionselector.a
 	$(CXX) -shared -o $(DLL) \
 		-Wl,--out-implib=lib$(DLL).a \
 		-Wl,--export-all-symbols \