Use module qt2.

Set --enable-final. Even though the compile is slightly larger, the linker
more than compensates for it... go figure.
This commit is contained in:
espie 2001-08-27 09:58:35 +00:00
parent e3e00e8def
commit 3a45394359

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.22 2001/08/22 19:56:32 espie Exp $
# $OpenBSD: Makefile,v 1.23 2001/08/27 09:58:35 espie Exp $
COMMENT= "X11 toolkit, libraries"
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.363
NEED_VERSION= 1.447
VERSION= 2.2
DISTNAME= kdelibs-${VERSION}
DIST_SUBDIR= kde
@ -16,8 +16,8 @@ EXTRACT_SUFX= .tar.bz2
# duplicated over the place.
NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
LIB_DEPENDS= qt.2.::x11/qt2 \
png.2.::graphics/png \
MODULES= qt2
LIB_DEPENDS= png.2.::graphics/png \
jpeg.62.::graphics/jpeg \
tiff.35.::graphics/tiff \
audiofile.::devel/libaudiofile \
@ -33,13 +33,13 @@ BUILD_DEPENDS+= ${LOCALBASE}/share/doc/qt2/html/index.html::x11/qt2,-html
# CUPS
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS= --with-qt-includes=${LOCALBASE}/include/X11/qt2
CONFIGURE_ARGS+= --with-qt-libraries=${LOCALBASE}/lib/qt2
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
CONFIGURE_ARGS+= --disable-threading
CONFIGURE_ARGS+= --enable-mitshm
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --enable-final
#CONFIGURE_ARGS+= --enable-debug
#CONFIGURE_ARGS+=--enable-static --enable-debug --disable-shared
@ -48,8 +48,7 @@ CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
USE_GMAKE= Yes
CONFIGURE_ENV= MOC=${LOCALBASE}/bin/moc2
CONFIGURE_ENV+= QTDOCDIR=${LOCALBASE}/share/doc/qt2/html
CONFIGURE_ENV= QTDOCDIR=${LOCALBASE}/share/doc/qt2/html
MAKE_ENV= ${CONFIGURE_ENV}
pre-build:
@ -66,7 +65,7 @@ pre-build:
ln -sf $(LOCALBASE)/bin/zsh ${WRKBUILD}/sh
# Ensure qt2 will always be at the front
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2'
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
MAKE_FLAGS+=LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'
# GPL