Don't enumerate evil. Pass down -L* and -l* only from LDFLAGS.

This commit is contained in:
joerg 2011-07-21 17:07:11 +00:00
parent a5f265b892
commit bc9afa20ba
2 changed files with 4 additions and 5 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.73 2011/03/06 16:10:22 wiz Exp $
# $NetBSD: Makefile.common,v 1.74 2011/07/21 17:07:11 joerg Exp $
# used by x11/qt3-docs/Makefile
# used by x11/qt3-libs/Makefile
# used by x11/qt3-tools/Makefile
@ -27,7 +27,7 @@ CONFIGURE_ARGS+= -prefix ${QTPREFIX}
CONFIGURE_ARGS+= -shared -sm -thread \
-system-zlib -system-libpng \
-system-libmng -system-libjpeg \
${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//:S/-dylib_file//:C/.*\.dylib\:.*\.dylib//}
${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
CONFIGURE_ARGS+= -qt-gif # qt3 does not write compressed GIFs
CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.26 2011/05/16 22:13:46 cheusov Exp $
# $NetBSD: Makefile.common,v 1.27 2011/07/21 17:07:11 joerg Exp $
# used by x11/qt4-docs/Makefile
# used by x11/qt4-libs/Makefile
# used by x11/qt4-mng/Makefile
@ -37,8 +37,7 @@ CONFIGURE_ARGS+= -optimized-qmake
CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
CONFIGURE_ARGS.SunOS+= -no-xrender
CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*}
CONFIGURE_ARGS+= ${LDFLAGS:M-Wl*:S/-Wl,//:S/-syslibroot,/-sdk /}
CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-l*}
CONFIGURE_ARGS+= -opensource -confirm-license
OPSYSVARS+= CONFIGURE_ARGS