diff options
author | skrll <skrll@pkgsrc.org> | 2002-05-29 19:09:55 +0000 |
---|---|---|
committer | skrll <skrll@pkgsrc.org> | 2002-05-29 19:09:55 +0000 |
commit | 0654af6a3ceefade5c7bc444bab5d006081d6cf7 (patch) | |
tree | 8df4793c06467f22851cfd641d42319c0c58af54 /x11/qt3-libs/files | |
parent | 82104f6d023ae99eacc8d4e5a9ef5023792303cc (diff) | |
download | pkgsrc-0654af6a3ceefade5c7bc444bab5d006081d6cf7.tar.gz |
Various changes to help with KDE3.
o Enable thread support using pth-syscall and nathanw_sa. The
later has problems which are being worked on.
o Restructure the build of certain plugins so that qt3-libs
comes with jpeg and mng support.
o Introduce a BUILDLINK_DEPENDS_METHOD.qt3-tools variable that
when set to build means we don't get a full dependency on
qt3-tools.
Diffstat (limited to 'x11/qt3-libs/files')
-rw-r--r-- | x11/qt3-libs/files/qmake.conf | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index 87a0382c63b..af26c2512e0 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,5 +1,5 @@ # -# $Id: qmake.conf,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $ +# $Id: qmake.conf,v 1.2 2002/05/29 19:09:55 skrll Exp $ # # qmake configuration for netbsd-g++ # @@ -50,8 +50,11 @@ QMAKE_LINK_SHLIB_CMD = \ $(if $(TARGET0), \ -version-info $(subst $(TARGET0).,,$(TARGET1)):$(subst $(TARGET1).,,$(TARGET2)), \ -module -avoid-version) \ - $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) -rpath $(QTPREFIX) -QMAKE_LFLAGS = @LDFLAGS@ + $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) \ + -rpath $(if $(TARGET0), \ + $(QTPREFIX)/lib, \ + $(subst ../../..,$(QTPREFIX)/plugins,$(DESTDIR))) +QMAKE_LFLAGS = @LDFLAGS@ -L$(QTDIR)/lib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = QMAKE_LFLAGS_SHLIB = @@ -68,7 +71,9 @@ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11SM = -lICE -lSM -QMAKE_LIBS_QT = -lqt +QMAKE_LIBS_QT = $(LIBQT) +QMAKE_LIBS_QT_THREAD = $(LIBQT) +QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu |