[libgda/LIBGDA_4.0] Make Windows import libs reference the correct DLL name



commit 2a194024e95c4ea8aef8b928f18b5c4c2375a4ab
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Jan 9 20:25:06 2011 +0100

    Make Windows import libs reference the correct DLL name

 libgda-report/Makefile.am |    2 +-
 libgda/Makefile.am        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libgda-report/Makefile.am b/libgda-report/Makefile.am
index b3f6cf7..64e1067 100644
--- a/libgda-report/Makefile.am
+++ b/libgda-report/Makefile.am
@@ -33,7 +33,7 @@ libgda-report.def: libgda-report.symbols
 	(echo -e EXPORTS; $(CPP) -P - <$(srcdir)/libgda-report.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda-report.def.tmp && mv libgda-report.def.tmp libgda-report.def
 
 libgda-report-$(GDA_ABI_VERSION).lib: libgda-report.def
-	$(DLLTOOL) --dllname libgda-report-$(GDA_ABI_VERSION)-$(GDA_CURRENT).dll --def libgda-report.def --output-lib libgda-report-$(GDA_ABI_VERSION).lib
+	$(DLLTOOL) --dllname libgda-report-$(GDA_ABI_VERSION)-$(GDA_ABI_MAJOR_VERSION).dll --def libgda-report.def --output-lib libgda-report-$(GDA_ABI_VERSION).lib
 
 install-data-local: install-def-files
 uninstall-local: uninstall-def-files
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 0714e5c..9a16c62 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -214,7 +214,7 @@ libgda.def: libgda.symbols
 	(echo -e EXPORTS; $(CPP) -P $(DEF_FLAGS) - <$(srcdir)/libgda.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g' | sort) > libgda.def.tmp && mv libgda.def.tmp libgda.def
 
 libgda-$(GDA_ABI_VERSION).lib: libgda.def
-	$(DLLTOOL) --dllname libgda-$(GDA_ABI_VERSION)-$(GDA_CURRENT).dll --def libgda.def --output-lib libgda-$(GDA_ABI_VERSION).lib
+	$(DLLTOOL) --dllname libgda-$(GDA_ABI_VERSION)-$(GDA_ABI_MAJOR_VERSION).dll --def libgda.def --output-lib libgda-$(GDA_ABI_VERSION).lib
 
 install-data-local: install-def-files
 uninstall-local: uninstall-def-files



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]