Mercurial > mxe-octave
diff src/qt.mk @ 3145:fae248a5b181
Qt: generalize the use of pkg-config to get dbus compilation flags
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Mon, 15 Jul 2013 21:29:42 -0400 |
parents | d24828818d36 |
children | 11f8ec654cd4 |
line wrap: on
line diff
--- a/src/qt.mk Mon Jul 15 21:29:42 2013 -0400 +++ b/src/qt.mk Mon Jul 15 21:29:42 2013 -0400 @@ -12,7 +12,7 @@ $(PKG)_CONFIGURE_CMD := $(PKG)_CONFIGURE_CROSS_COMPILE_OPTION := $(PKG)_CONFIGURE_DATABASE_OPTION := -$(PKG)_CONFIGURE_ENV := +$(PKG)_CONFIGURE_ENV := PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' $(PKG)_CONFIGURE_EXTRA_OPTION := $(PKG)_CONFIGURE_INCLUDE_OPTION := $(PKG)_CONFIGURE_LIBPATH_OPTION := @@ -22,9 +22,6 @@ ifneq ($(filter mingw msvc,$(MXE_SYSTEM)),) ifeq ($(MXE_NATIVE_BUILD),yes) - $(PKG)_CONFIGURE_ENV := \ - PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' - ifeq ($(MXE_SYSTEM),msvc) # NMAKE is perturbed by the values of MAKE and MAKEFLAGS defined by GNU # make. These need to be unset even when running configure script, as @@ -40,8 +37,7 @@ # compile-in generic ODBC driver under Windows $(PKG)_CONFIGURE_DATABASE_OPTION += -plugin-sql-odbc else - $(PKG)_CONFIGURE_ENV := \ - CPPFLAGS='$(HOST_INCDIR)/dbus-1.0' \ + $(PKG)_CONFIGURE_ENV += \ LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' endif @@ -72,15 +68,12 @@ # variables *before* "configure.exe" doesn't work. Also compile-in D-BUS # support, for what it's worth... $(PKG)_CONFIGURE_EXTRA_OPTION += \ - -openssl-linked \ - OPENSSL_LIBS="`PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' '$(MXE_PKG_CONFIG)' --libs-only-l openssl`" \ - -dbus-linked + OPENSSL_LIBS="`PKG_CONFIG_PATH='$(HOST_PREFIX)/lib/pkgconfig' '$(MXE_PKG_CONFIG)' --libs-only-l openssl`" else $(PKG)_CONFIGURE_CMD := configure $(PKG)_CONFIGURE_EXTRA_OPTION := \ -prefix-install \ -make libs \ - -openssl-linked \ -no-glib \ -no-gstreamer \ -no-reduce-exports \ @@ -88,7 +81,6 @@ -no-rpath \ -device-option PKG_CONFIG='$(MXE_PKG_CONFIG)' \ -force-pkg-config \ - -dbus-linked \ -v ifeq ($(MXE_SYSTEM),mingw) @@ -115,6 +107,7 @@ $($(PKG)_CONFIGURE_LIBPATH_OPTION) \ -opensource \ -confirm-license \ + -dbus-linked \ -fast \ $($(PKG)_CONFIGURE_PLATFORM_OPTION) \ $($(PKG)_CONFIGURE_CROSS_COMPILE_OPTION) \ @@ -126,6 +119,7 @@ -script \ -no-iconv \ -opengl desktop \ + -openssl-linked \ -no-webkit \ -no-phonon \ -no-phonon-backend \