diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-03 16:18:37 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 11:54:01 +0100 |
| commit | 73f7db9af2f76593856d64349a376412d292cd15 (patch) | |
| tree | db311e489246d41e6386f4c8bcc14da17e634c66 /configure | |
| parent | f007c420ed4e2eadaedbbdd1c29912c6c8142fa1 (diff) | |
| download | qtlocation-mapboxgl-73f7db9af2f76593856d64349a376412d292cd15.tar.gz | |
cleanup makefiles
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -85,14 +85,15 @@ CONFIG="# Do not edit. Generated by the configure script. if [ ! -z ${BOOST_VERSION} ]; then mason install boost ${BOOST_VERSION} - CONFIG+=" 'boost_root': '$(mason prefix boost ${BOOST_VERSION})',"$LN + CONFIG+=" 'boost_cflags%': $(quote_flags $(mason cflags boost ${BOOST_VERSION})),"$LN + CONFIG+=" 'boost_ldflags%': $(quote_flags $(mason ldflags boost ${BOOST_VERSION})),"$LN fi if [ ! -z ${OPENSSL_VERSION} ]; then mason install openssl ${OPENSSL_VERSION} - CONFIG+=" 'openssl_static_libs': $(quote_flags $(mason static_libs openssl ${OPENSSL_VERSION})),"$LN - CONFIG+=" 'openssl_cflags': $(quote_flags $(mason cflags openssl ${OPENSSL_VERSION})),"$LN - CONFIG+=" 'openssl_ldflags': $(quote_flags $(mason ldflags openssl ${OPENSSL_VERSION})),"$LN + CONFIG+=" 'openssl_static_libs%': $(quote_flags $(mason static_libs openssl ${OPENSSL_VERSION})),"$LN + CONFIG+=" 'openssl_cflags%': $(quote_flags $(mason cflags openssl ${OPENSSL_VERSION})),"$LN + CONFIG+=" 'openssl_ldflags%': $(quote_flags $(mason ldflags openssl ${OPENSSL_VERSION})),"$LN fi if [ ! -z ${LIBCURL_VERSION} ]; then @@ -153,9 +154,9 @@ fi if [ ! -z ${LIBZIP_VERSION} ]; then mason install libzip ${LIBZIP_VERSION} - CONFIG+=" 'zip_static_libs': $(quote_flags $(mason static_libs libzip ${LIBZIP_VERSION})),"$LN - CONFIG+=" 'zip_cflags': $(quote_flags $(mason cflags libzip ${LIBZIP_VERSION})),"$LN - CONFIG+=" 'zip_ldflags': $(quote_flags $(mason ldflags libzip ${LIBZIP_VERSION})),"$LN + CONFIG+=" 'zip_static_libs%': $(quote_flags $(mason static_libs libzip ${LIBZIP_VERSION})),"$LN + CONFIG+=" 'zip_cflags%': $(quote_flags $(mason cflags libzip ${LIBZIP_VERSION})),"$LN + CONFIG+=" 'zip_ldflags%': $(quote_flags $(mason ldflags libzip ${LIBZIP_VERSION})),"$LN fi CONFIG+=" } |