diff options
| author | minskim <minskim@pkgsrc.org> | 2006-03-12 06:49:21 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-03-12 06:49:21 +0000 |
| commit | 17ee0d96257ffe8844b8fe31fa7aa8bd2dd7f221 (patch) | |
| tree | 71cd456ded36ace92636edb4d954baade4032ea9 /x11/qt3-libs/files | |
| parent | 36fce353a17f2f202fcb7c181e159c2df8e11996 (diff) | |
| download | pkgsrc-17ee0d96257ffe8844b8fe31fa7aa8bd2dd7f221.tar.gz | |
Force to use the libtool mode of qmake, instead of patching the
non-libtool mode to use libool. In this way, qmake will generates
valid install commands. This closes PR pkg/29572.
Bump qt3-tools PKGREVISION.
Diffstat (limited to 'x11/qt3-libs/files')
| -rw-r--r-- | x11/qt3-libs/files/qmake.conf | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf index e44ac220d52..647593f72e0 100644 --- a/x11/qt3-libs/files/qmake.conf +++ b/x11/qt3-libs/files/qmake.conf @@ -1,12 +1,12 @@ -# $NetBSD: qmake.conf,v 1.20 2006/03/11 04:56:17 reed Exp $ -# $Id: qmake.conf,v 1.20 2006/03/11 04:56:17 reed Exp $ +# $NetBSD: qmake.conf,v 1.21 2006/03/12 06:49:21 minskim Exp $ +# $Id: qmake.conf,v 1.21 2006/03/12 06:49:21 minskim Exp $ # # qmake configuration for netbsd-g++ (pkgsrc) # MAKEFILE_GENERATOR = UNIX TEMPLATE = app -CONFIG += qt warn_on release +CONFIG += qt warn_on release link_prl QMAKE_CC = @CC@ QMAKE_LEX = @LEX@ @@ -19,7 +19,7 @@ QMAKE_CFLAGS_WARN_ON = QMAKE_CFLAGS_WARN_OFF = QMAKE_CFLAGS_RELEASE = QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = +QMAKE_CFLAGS_SHLIB = QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses QMAKE_CFLAGS_THREAD = -D_REENTRANT @@ -43,32 +43,17 @@ QMAKE_LIBDIR_QT = $(QTDIR)/lib QMAKE_INCDIR_OPENGL = @X11PREFIX@/include QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib -QMAKE_LINK = @LIBTOOL@ --mode=link @CXX@ -QMAKE_LINK_SHLIB_CMD = \ - @LIBTOOL@ --mode=link @CXX@ $(LFLAGS) \ - -o $(if $(TARGET0), \ - $(patsubst %.so,%.la,$(DESTDIR)$(TARGET0)), \ - $(patsubst %.so,%.la,$(DESTDIR)$(TARGET))) \ - $(if $(TARGET0), \ - -version-info `expr $(subst $(TARGET0).,,$(TARGET1)) + $(subst $(TARGET1).,,$(TARGET2))`:$(subst $(TARGET2).,,$(TARGET)):$(subst $(TARGET1).,,$(TARGET2)), \ - -module -avoid-version) \ - $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) \ - -rpath $(if $(TARGET0), \ - $(QTPREFIX)/lib, \ - $(subst ../../..,$(QTPREFIX)/plugins,$(DESTDIR))) +QMAKE_LINK = @CXX@ +QMAKE_LINK_SHLIB = @CXX@ +QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = +QMAKE_LFLAGS_SHLIB = QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = QMAKE_RPATH = @COMPILER_RPATH_FLAG@ -QMAKE_RUN_CC = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CC_IMP = @LIBTOOL@ --mode=compile @CC@ -c $(CFLAGS) $(INCPATH) -o $@ $< -QMAKE_RUN_CXX = @LIBTOOL@ --mode=compile @CXX@ -c $(CXXFLAGS) $(INCPATH) -o $obj $src -QMAKE_RUN_CXX_IMP = @LIBTOOL@ --mode=compile @CXX@ -c $(CXXFLAGS) $(INCPATH) -o $@ $< - QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ |