author | kergoth <kergoth> | 2002-12-09 22:39:57 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-12-09 22:39:57 (UTC) |
commit | 421f5d6b87f509430836fb2c60b57f9266371121 (patch) (unidiff) | |
tree | 98c968915b1a9dcdd8eb3e3565c8859127f1c3e9 /mkspecs | |
parent | 8bf05369dcdf93a712607aab6dacf407dcce5142 (diff) | |
download | opie-421f5d6b87f509430836fb2c60b57f9266371121.zip opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.gz opie-421f5d6b87f509430836fb2c60b57f9266371121.tar.bz2 |
Add a var to pass in libs from teh environment easily.. needed so that the OZ buildroot can pass in -lsupc++ on the link when building with gcc3.
59 files changed, 59 insertions, 59 deletions
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf index 2dee750..c79fe81 100644 --- a/mkspecs/aix-g++/qmake.conf +++ b/mkspecs/aix-g++/qmake.conf | |||
@@ -55,3 +55,3 @@ QMAKE_LFLAGS_THREAD = -L/usr/lib/threads | |||
55 | 55 | ||
56 | QMAKE_LIBS = | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
57 | QMAKE_LIBS_DYNLOAD= -ldl | 57 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf index 49b47a7..2e08cbf 100644 --- a/mkspecs/aix-xlc-64/qmake.conf +++ b/mkspecs/aix-xlc-64/qmake.conf | |||
@@ -62,3 +62,3 @@ QMAKE_LFLAGS_THREAD = -L/usr/lib/threads | |||
62 | 62 | ||
63 | QMAKE_LIBS = | 63 | QMAKE_LIBS = $(LIBS_EXTRA) |
64 | QMAKE_LIBS_DYNLOAD= -ldl | 64 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf index 6e17b4a..76ead61 100644 --- a/mkspecs/aix-xlc/qmake.conf +++ b/mkspecs/aix-xlc/qmake.conf | |||
@@ -62,3 +62,3 @@ QMAKE_LFLAGS_THREAD = -L/usr/lib/threads | |||
62 | 62 | ||
63 | QMAKE_LIBS = | 63 | QMAKE_LIBS = $(LIBS_EXTRA) |
64 | QMAKE_LIBS_DYNLOAD= -ldl | 64 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/bsdi-g++/qmake.conf b/mkspecs/bsdi-g++/qmake.conf index 628c09b..be4e125 100644 --- a/mkspecs/bsdi-g++/qmake.conf +++ b/mkspecs/bsdi-g++/qmake.conf | |||
@@ -59,3 +59,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
59 | 59 | ||
60 | QMAKE_LIBS = | 60 | QMAKE_LIBS = $(LIBS_EXTRA) |
61 | QMAKE_LIBS_DYNLOAD= -ldl | 61 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf index 50aba89..4532c89 100644 --- a/mkspecs/cygwin-g++/qmake.conf +++ b/mkspecs/cygwin-g++/qmake.conf | |||
@@ -57,3 +57,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
57 | 57 | ||
58 | QMAKE_LIBS = | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
59 | QMAKE_LIBS_DYNLOAD= -ldl | 59 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/dgux-g++/qmake.conf b/mkspecs/dgux-g++/qmake.conf index 04af167..c8c7527 100644 --- a/mkspecs/dgux-g++/qmake.conf +++ b/mkspecs/dgux-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_LFLAGS_SONAME = -Wl,-h, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= -ldl | 56 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 020d6d5..3269c83 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf | |||
@@ -57,3 +57,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
57 | 57 | ||
58 | QMAKE_LIBS = | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
59 | QMAKE_LIBS_DYNLOAD= | 59 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf index 7affcb4..7ce4711 100644 --- a/mkspecs/hpux-acc-64/qmake.conf +++ b/mkspecs/hpux-acc-64/qmake.conf | |||
@@ -97,3 +97,3 @@ QMAKE_RPATH = -Wl,+b, | |||
97 | 97 | ||
98 | QMAKE_LIBS = -lm | 98 | QMAKE_LIBS = $(LIBS_EXTRA) |
99 | QMAKE_LIBS_DYNLOAD= -ldld | 99 | QMAKE_LIBS_DYNLOAD= -ldld |
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf index f47f74b..f9f88bb 100644 --- a/mkspecs/hpux-acc-o64/qmake.conf +++ b/mkspecs/hpux-acc-o64/qmake.conf | |||
@@ -96,3 +96,3 @@ QMAKE_RPATH = -Wl,+b, | |||
96 | 96 | ||
97 | QMAKE_LIBS = -lm | 97 | QMAKE_LIBS = $(LIBS_EXTRA) |
98 | QMAKE_LIBS_DYNLOAD= -ldld | 98 | QMAKE_LIBS_DYNLOAD= -ldld |
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf index 26eca39..c344f26 100644 --- a/mkspecs/hpux-acc/qmake.conf +++ b/mkspecs/hpux-acc/qmake.conf | |||
@@ -76,3 +76,3 @@ QMAKE_RPATH = -Wl,+b, | |||
76 | 76 | ||
77 | QMAKE_LIBS = -lm | 77 | QMAKE_LIBS = $(LIBS_EXTRA) |
78 | QMAKE_LIBS_DYNLOAD= -ldld | 78 | QMAKE_LIBS_DYNLOAD= -ldld |
diff --git a/mkspecs/hpux-cc/qmake.conf b/mkspecs/hpux-cc/qmake.conf index d522252..fe5d293 100644 --- a/mkspecs/hpux-cc/qmake.conf +++ b/mkspecs/hpux-cc/qmake.conf | |||
@@ -75,3 +75,3 @@ QMAKE_RPATH = -Wl,+b, | |||
75 | 75 | ||
76 | QMAKE_LIBS = -lm | 76 | QMAKE_LIBS = $(LIBS_EXTRA) |
77 | QMAKE_LIBS_DYNLOAD= -ldld | 77 | QMAKE_LIBS_DYNLOAD= -ldld |
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf index b11fde2..0af1de7 100644 --- a/mkspecs/hpux-g++/qmake.conf +++ b/mkspecs/hpux-g++/qmake.conf | |||
@@ -59,3 +59,3 @@ QMAKE_RPATH = -Wl,+b, | |||
59 | 59 | ||
60 | QMAKE_LIBS = | 60 | QMAKE_LIBS = $(LIBS_EXTRA) |
61 | QMAKE_LIBS_DYNLOAD= -ldld | 61 | QMAKE_LIBS_DYNLOAD= -ldld |
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf index 1898ea2..b86f93b 100644 --- a/mkspecs/hurd-g++/qmake.conf +++ b/mkspecs/hurd-g++/qmake.conf | |||
@@ -55,3 +55,3 @@ QMAKE_LFLAGS_SONAME = -Wl,-soname, | |||
55 | 55 | ||
56 | QMAKE_LIBS = | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
57 | QMAKE_LIBS_DYNLOAD= -ldl | 57 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf index cd6c432..8035658 100644 --- a/mkspecs/irix-cc-64/qmake.conf +++ b/mkspecs/irix-cc-64/qmake.conf | |||
@@ -88,3 +88,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
88 | 88 | ||
89 | QMAKE_LIBS = | 89 | QMAKE_LIBS = $(LIBS_EXTRA) |
90 | QMAKE_LIBS_DYNLOAD= | 90 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/irix-cc-o32/qmake.conf b/mkspecs/irix-cc-o32/qmake.conf index b755813..75114a5 100644 --- a/mkspecs/irix-cc-o32/qmake.conf +++ b/mkspecs/irix-cc-o32/qmake.conf | |||
@@ -62,3 +62,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
62 | 62 | ||
63 | QMAKE_LIBS = | 63 | QMAKE_LIBS = $(LIBS_EXTRA) |
64 | QMAKE_LIBS_DYNLOAD= | 64 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf index e51731b..31411af 100644 --- a/mkspecs/irix-cc/qmake.conf +++ b/mkspecs/irix-cc/qmake.conf | |||
@@ -88,3 +88,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
88 | 88 | ||
89 | QMAKE_LIBS = | 89 | QMAKE_LIBS = $(LIBS_EXTRA) |
90 | QMAKE_LIBS_DYNLOAD= | 90 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf index 38ee5d8..17b6751 100644 --- a/mkspecs/irix-g++/qmake.conf +++ b/mkspecs/irix-g++/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf index 0f10c6a..6936fc9 100644 --- a/mkspecs/linux-cxx/qmake.conf +++ b/mkspecs/linux-cxx/qmake.conf | |||
@@ -52,3 +52,3 @@ QMAKE_LFLAGS_SONAME = -Wl,-soname, | |||
52 | 52 | ||
53 | QMAKE_LIBS = | 53 | QMAKE_LIBS = $(LIBS_EXTRA) |
54 | QMAKE_LIBS_DYNLOAD= -ldl | 54 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf index dcc993a..37a3f6e 100644 --- a/mkspecs/linux-g++/qmake.conf +++ b/mkspecs/linux-g++/qmake.conf | |||
@@ -57,3 +57,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
57 | 57 | ||
58 | QMAKE_LIBS = | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
59 | QMAKE_LIBS_DYNLOAD= -ldl | 59 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index f6b721d..9dc7480 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -Qoption,ld,-rpath, | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index 47ad018..5a2a670 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf | |||
@@ -63,3 +63,3 @@ QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE | |||
63 | 63 | ||
64 | QMAKE_LIBS = | 64 | QMAKE_LIBS = $(LIBS_EXTRA) |
65 | QMAKE_LIBS_DYNLOAD= -ldl | 65 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index e8161ae..a200f69 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -R | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/macx-mwerks/qmake.conf b/mkspecs/macx-mwerks/qmake.conf index 7f2770e..15f4325 100644 --- a/mkspecs/macx-mwerks/qmake.conf +++ b/mkspecs/macx-mwerks/qmake.conf | |||
@@ -18,3 +18,3 @@ QMAKE_CRT_OBJECTS = crt1.o | |||
18 | QMAKE_INCDIR_QT = $(QTDIR)/include | 18 | QMAKE_INCDIR_QT = $(QTDIR)/include |
19 | QMAKE_LIBS = -framework System | 19 | QMAKE_LIBS = $(LIBS_EXTRA) |
20 | QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt | 20 | QMAKE_LIBS_QT = -L$(QTDIR)/lib/ -lqt |
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index fcabcaf..6df9f06 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf | |||
@@ -57,3 +57,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
57 | 57 | ||
58 | QMAKE_LIBS = | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
59 | QMAKE_LIBS_DYNLOAD= | 59 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index 9b929b1..8f2dbf4 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf | |||
@@ -58,3 +58,3 @@ QMAKE_LFLAGS_THREAD = -pthread | |||
58 | 58 | ||
59 | QMAKE_LIBS = | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
60 | QMAKE_LIBS_DYNLOAD= | 60 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/qnx-g++/qmake.conf b/mkspecs/qnx-g++/qmake.conf index b34eaba..adca607 100644 --- a/mkspecs/qnx-g++/qmake.conf +++ b/mkspecs/qnx-g++/qmake.conf | |||
@@ -58,3 +58,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
58 | 58 | ||
59 | QMAKE_LIBS = -lunix | 59 | QMAKE_LIBS = $(LIBS_EXTRA) |
60 | QMAKE_LIBS_DYNLOAD= -ldl | 60 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/qws/freebsd-generic-g++/qmake.conf b/mkspecs/qws/freebsd-generic-g++/qmake.conf index 546166e..82b22d7 100644 --- a/mkspecs/qws/freebsd-generic-g++/qmake.conf +++ b/mkspecs/qws/freebsd-generic-g++/qmake.conf | |||
@@ -53,3 +53,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
53 | 53 | ||
54 | QMAKE_LIBS = | 54 | QMAKE_LIBS = $(LIBS_EXTRA) |
55 | QMAKE_LIBS_QT = -lqte | 55 | QMAKE_LIBS_QT = -lqte |
diff --git a/mkspecs/qws/linux-arm-g++/qmake.conf b/mkspecs/qws/linux-arm-g++/qmake.conf index 6a7a7a1..a5c08ae 100644 --- a/mkspecs/qws/linux-arm-g++/qmake.conf +++ b/mkspecs/qws/linux-arm-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
diff --git a/mkspecs/qws/linux-generic-g++/qmake.conf b/mkspecs/qws/linux-generic-g++/qmake.conf index 43f0d7f..40af4ad 100644 --- a/mkspecs/qws/linux-generic-g++/qmake.conf +++ b/mkspecs/qws/linux-generic-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
diff --git a/mkspecs/qws/linux-ipaq-g++/qmake.conf b/mkspecs/qws/linux-ipaq-g++/qmake.conf index c5bc655..d8e2a4e 100644 --- a/mkspecs/qws/linux-ipaq-g++/qmake.conf +++ b/mkspecs/qws/linux-ipaq-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
diff --git a/mkspecs/qws/linux-mips-g++/qmake.conf b/mkspecs/qws/linux-mips-g++/qmake.conf index a34b651..f5d2033 100644 --- a/mkspecs/qws/linux-mips-g++/qmake.conf +++ b/mkspecs/qws/linux-mips-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
diff --git a/mkspecs/qws/linux-sharp-g++/qmake.conf b/mkspecs/qws/linux-sharp-g++/qmake.conf index 538e243..06bf445 100644 --- a/mkspecs/qws/linux-sharp-g++/qmake.conf +++ b/mkspecs/qws/linux-sharp-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
diff --git a/mkspecs/qws/linux-x86-g++/qmake.conf b/mkspecs/qws/linux-x86-g++/qmake.conf index dfc5e30..fc5723a 100644 --- a/mkspecs/qws/linux-x86-g++/qmake.conf +++ b/mkspecs/qws/linux-x86-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD = -ldl | 56 | QMAKE_LIBS_DYNLOAD = -ldl |
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index aa6251f..3460a40 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_X11 = | 58 | QMAKE_LIBS_X11 = |
diff --git a/mkspecs/qws/qnx4-cc/qmake.conf b/mkspecs/qws/qnx4-cc/qmake.conf index ee4a9ec..1ca2029 100644 --- a/mkspecs/qws/qnx4-cc/qmake.conf +++ b/mkspecs/qws/qnx4-cc/qmake.conf | |||
@@ -51,3 +51,3 @@ QMAKE_RPATH = | |||
51 | 51 | ||
52 | QMAKE_LIBS = -lsocket | 52 | QMAKE_LIBS = $(LIBS_EXTRA) |
53 | QMAKE_LIBS_DYNLOAD= | 53 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/qws/qnx6-generic-cc/qmake.conf b/mkspecs/qws/qnx6-generic-cc/qmake.conf index ae113fd..51eb3fe 100644 --- a/mkspecs/qws/qnx6-generic-cc/qmake.conf +++ b/mkspecs/qws/qnx6-generic-cc/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = -lsocket -lcpp | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= | 56 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/qws/qnx6-generic-g++/qmake.conf b/mkspecs/qws/qnx6-generic-g++/qmake.conf index 6961345..3519a59 100644 --- a/mkspecs/qws/qnx6-generic-g++/qmake.conf +++ b/mkspecs/qws/qnx6-generic-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = -lsocket | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= | 56 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/qws/solaris-generic-g++/qmake.conf b/mkspecs/qws/solaris-generic-g++/qmake.conf index d286d5b..057e343 100644 --- a/mkspecs/qws/solaris-generic-g++/qmake.conf +++ b/mkspecs/qws/solaris-generic-g++/qmake.conf | |||
@@ -54,3 +54,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
54 | 54 | ||
55 | QMAKE_LIBS = -lsocket -lnsl -lresolv | 55 | QMAKE_LIBS = $(LIBS_EXTRA) |
56 | QMAKE_LIBS_DYNLOAD= -ldl | 56 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/reliant-cds-64/qmake.conf b/mkspecs/reliant-cds-64/qmake.conf index c3ee3a8..8bd4fa1 100644 --- a/mkspecs/reliant-cds-64/qmake.conf +++ b/mkspecs/reliant-cds-64/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -Wl,-Brpath=, | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/reliant-cds/qmake.conf b/mkspecs/reliant-cds/qmake.conf index 584bcf7..539cee7 100644 --- a/mkspecs/reliant-cds/qmake.conf +++ b/mkspecs/reliant-cds/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -Wl,-Brpath=, | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index 6c69a08..4da6809 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_LFLAGS_THREAD = -Kthread | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index 3044419..5a9c11a 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf | |||
@@ -55,3 +55,3 @@ QMAKE_RPATH = | |||
55 | 55 | ||
56 | QMAKE_LIBS = | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
57 | QMAKE_LIBS_DYNLOAD= -ldl | 57 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index b30f3e8..0da6a2d 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf | |||
@@ -74,3 +74,3 @@ QMAKE_RPATH = -R | |||
74 | 74 | ||
75 | QMAKE_LIBS = | 75 | QMAKE_LIBS = $(LIBS_EXTRA) |
76 | QMAKE_LIBS_DYNLOAD= -ldl | 76 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 8b096fe..bee60c9 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf | |||
@@ -57,3 +57,3 @@ QMAKE_RPATH = -R | |||
57 | 57 | ||
58 | QMAKE_LIBS = | 58 | QMAKE_LIBS = $(LIBS_EXTRA) |
59 | QMAKE_LIBS_DYNLOAD= -ldl | 59 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index da83d25..929de3e 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf | |||
@@ -79,3 +79,3 @@ QMAKE_RPATH = -Wl,-R, | |||
79 | 79 | ||
80 | QMAKE_LIBS = | 80 | QMAKE_LIBS = $(LIBS_EXTRA) |
81 | QMAKE_LIBS_DYNLOAD= -ldl | 81 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index 2f3c752..21d658f 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf | |||
@@ -62,3 +62,3 @@ QMAKE_RPATH = -Wl,-R, | |||
62 | 62 | ||
63 | QMAKE_LIBS = | 63 | QMAKE_LIBS = $(LIBS_EXTRA) |
64 | QMAKE_LIBS_DYNLOAD= -ldl | 64 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/solaris-kcc/qmake.conf b/mkspecs/solaris-kcc/qmake.conf index 2c325e8..e2a523d 100644 --- a/mkspecs/solaris-kcc/qmake.conf +++ b/mkspecs/solaris-kcc/qmake.conf | |||
@@ -67,3 +67,3 @@ QMAKE_RPATH = -R$$LITERAL_WHITESPACE | |||
67 | 67 | ||
68 | QMAKE_LIBS = | 68 | QMAKE_LIBS = $(LIBS_EXTRA) |
69 | QMAKE_LIBS_DYNLOAD= -ldl | 69 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index be67cf3..2a1163a 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -rpath$$LITERAL_WHITESPACE | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index c71b0ae..72b3d58 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_RPATH = -Wl,-rpath, | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= | 58 | QMAKE_LIBS_DYNLOAD= |
diff --git a/mkspecs/ultrix-g++/qmake.conf b/mkspecs/ultrix-g++/qmake.conf index 347c543..d8754c0 100644 --- a/mkspecs/ultrix-g++/qmake.conf +++ b/mkspecs/ultrix-g++/qmake.conf | |||
@@ -52,3 +52,3 @@ QMAKE_LFLAGS_DEBUG = | |||
52 | 52 | ||
53 | QMAKE_LIBS = | 53 | QMAKE_LIBS = $(LIBS_EXTRA) |
54 | QMAKE_LIBS_DYNLOAD= -ldl | 54 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index e2e73fe..5efb1a9 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf | |||
@@ -56,3 +56,3 @@ QMAKE_LFLAGS_THREAD = -Kthread | |||
56 | 56 | ||
57 | QMAKE_LIBS = | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_DYNLOAD= -ldl | 58 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index 93ad257..0298eef 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf | |||
@@ -55,3 +55,3 @@ QMAKE_LFLAGS_THREAD = | |||
55 | 55 | ||
56 | QMAKE_LIBS = | 56 | QMAKE_LIBS = $(LIBS_EXTRA) |
57 | QMAKE_LIBS_DYNLOAD= -ldl | 57 | QMAKE_LIBS_DYNLOAD= -ldl |
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf index a6339b9..c5d3ea5 100644 --- a/mkspecs/win32-borland/qmake.conf +++ b/mkspecs/win32-borland/qmake.conf | |||
@@ -72,3 +72,3 @@ QMAKE_LFLAGS_WINDOWS_DLL= -Gi -aa -Tpd c0d32.obj | |||
72 | 72 | ||
73 | QMAKE_LIBS = import32.lib | 73 | QMAKE_LIBS = $(LIBS_EXTRA) |
74 | QMAKE_LIBS_RT = cw32i.lib | 74 | QMAKE_LIBS_RT = cw32i.lib |
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index 2410e34..4bc603c 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf | |||
@@ -49,3 +49,3 @@ QMAKE_LFLAGS_WINDOWS_DLL= -Wl,-subsystem,windows | |||
49 | 49 | ||
50 | QMAKE_LIBS = | 50 | QMAKE_LIBS = $(LIBS_EXTRA) |
51 | QMAKE_LIBS_CONSOLE= | 51 | QMAKE_LIBS_CONSOLE= |
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index 0a7d113..f7b43b9 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf | |||
@@ -73,3 +73,3 @@ QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 | |||
73 | 73 | ||
74 | QMAKE_LIBS = | 74 | QMAKE_LIBS = $(LIBS_EXTRA) |
75 | QMAKE_LIBS_CONSOLE= | 75 | QMAKE_LIBS_CONSOLE= |
diff --git a/mkspecs/win32-msvc.net/qmake.conf b/mkspecs/win32-msvc.net/qmake.conf index 6c4185f..92f7cc6 100644 --- a/mkspecs/win32-msvc.net/qmake.conf +++ b/mkspecs/win32-msvc.net/qmake.conf | |||
@@ -77,3 +77,3 @@ QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 | |||
77 | 77 | ||
78 | QMAKE_LIBS = | 78 | QMAKE_LIBS = $(LIBS_EXTRA) |
79 | QMAKE_LIBS_CONSOLE= | 79 | QMAKE_LIBS_CONSOLE= |
diff --git a/mkspecs/win32-msvc/qmake.conf b/mkspecs/win32-msvc/qmake.conf index 3a6e650..6175be3 100644 --- a/mkspecs/win32-msvc/qmake.conf +++ b/mkspecs/win32-msvc/qmake.conf | |||
@@ -73,3 +73,3 @@ QMAKE_LFLAGS_QT_DLL = /BASE:0x39D00000 | |||
73 | 73 | ||
74 | QMAKE_LIBS = | 74 | QMAKE_LIBS = $(LIBS_EXTRA) |
75 | QMAKE_LIBS_CONSOLE= | 75 | QMAKE_LIBS_CONSOLE= |
diff --git a/mkspecs/win32-visage/qmake.conf b/mkspecs/win32-visage/qmake.conf index 87b3b8f..cbd0a7f 100644 --- a/mkspecs/win32-visage/qmake.conf +++ b/mkspecs/win32-visage/qmake.conf | |||
@@ -46,3 +46,3 @@ QMAKE_LFLAGS_WINDOWS_DLL= -DLL | |||
46 | 46 | ||
47 | QMAKE_LIBS = | 47 | QMAKE_LIBS = $(LIBS_EXTRA) |
48 | QMAKE_LIBS_CONSOLE= | 48 | QMAKE_LIBS_CONSOLE= |
diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index 1c4760f..fe6f3ed 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf | |||
@@ -44,3 +44,3 @@ QMAKE_LFLAGS_WINDOWS_DLL= sys nt_win | |||
44 | 44 | ||
45 | QMAKE_LIBS = | 45 | QMAKE_LIBS = $(LIBS_EXTRA) |
46 | QMAKE_LIBS_CONSOLE= | 46 | QMAKE_LIBS_CONSOLE= |