[Gpg4win-commits] r1150 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2009-04-03 16:02:44 +0200 (Fri, 03 Apr 2009)
New Revision: 1150

Added:
   trunk/src/QtCore.pc
   trunk/src/QtGui.pc
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/gpg4win.mk.in
Log:
2009-04-03  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_pkg_qt_post_install): New macro.
	* src/QtCore.pc, src/QtGui.pc: New files.
	* src/gpg4win.mk.in: Clear PKG_CONFIG_LIBDIR.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-04-02 19:12:45 UTC (rev 1149)
+++ trunk/ChangeLog	2009-04-03 14:02:44 UTC (rev 1150)
@@ -1,3 +1,9 @@
+2009-04-03  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (gpg4win_pkg_qt_post_install): New macro.
+	* src/QtCore.pc, src/QtGui.pc: New files.
+	* src/gpg4win.mk.in: Clear PKG_CONFIG_LIBDIR.
+
 2009-04-02  Marcus Brinkmann  <marcus at g10code.de>
 
 	* Makefile.am (EXTRA_DIST): Remove

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2009-04-02 19:12:45 UTC (rev 1149)
+++ trunk/src/Makefile.am	2009-04-03 14:02:44 UTC (rev 1150)
@@ -393,7 +393,13 @@
 $(DLLTOOL) --output-lib libiconv.dll.a --def libiconv.def)
 endef
 
+# Qt is missing the pkgconfig files.
+define gpg4win_pkg_qt_post_install
+(mkdir $$$${pkgidir_dev}/lib/pkgconfig; \
+ cp $(srcdir)/QtCore.pc $(srcdir)/QtGui.pc $$$${pkgidir_dev}/lib/pkgconfig/)
+endef
 
+
 # kdesupport ships gettext, which we already have.  Remove a stow
 # conflict about that.  Also remove a stow conflict with kdelibs-lib.
 define gpg4win_pkg_kdesupport_post_install

Added: trunk/src/QtCore.pc
===================================================================
--- trunk/src/QtCore.pc	2009-04-02 19:12:45 UTC (rev 1149)
+++ trunk/src/QtCore.pc	2009-04-03 14:02:44 UTC (rev 1150)
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/QtCore
+
+Name: Qtcore
+Description: Qtcore Library
+Version: 4.5.0
+Libs: -L${libdir} -lQtCore4 
+Cflags: -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I/usr/include -I${includedir}
+

Added: trunk/src/QtGui.pc
===================================================================
--- trunk/src/QtGui.pc	2009-04-02 19:12:45 UTC (rev 1149)
+++ trunk/src/QtGui.pc	2009-04-03 14:02:44 UTC (rev 1150)
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/QtGui
+
+Name: Qtgui
+Description: Qtgui Library
+Version: 4.5.0
+Libs: -L${libdir} -lQtGui 
+Cflags: -DQT_LARGEFILE_SUPPORT -DQT_DLL -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I/usr/include -I${includedir}
+Requires: QtCore
+

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2009-04-02 19:12:45 UTC (rev 1149)
+++ trunk/src/gpg4win.mk.in	2009-04-03 14:02:44 UTC (rev 1150)
@@ -69,6 +69,7 @@
 	pkgmkargs_inst="$(call GETVAR,gpg4win_pkg_$(1)_make_args_inst)";\
 	export PKG_CONFIG="$(tsdir)/src/pkg-config";			\
 	export PKG_CONFIG_PATH="$(idir)/lib/pkgconfig";			\
+	export PKG_CONFIG_LIBDIR="";					\
 	export PATH="$(idir)/bin:$${PATH}";				\
 	export SYSROOT="$(idir)";					\
 	export CONFIG_SITE="$(tsdir)/src/config.site"