1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
$NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 adam Exp $
* Libtoolized
--- qmake/generators/unix/unixmake2.cpp.orig 2015-06-29 20:03:23.000000000 +0000
+++ qmake/generators/unix/unixmake2.cpp
@@ -178,12 +178,12 @@ UnixMakefileGenerator::writeMakeParts(QT
t << "####### Compiler, tools and options\n\n";
t << "CC = " << var("QMAKE_CC") << endl;
t << "CXX = " << var("QMAKE_CXX") << endl;
- t << "DEFINES = "
+ t << "DEFINES += "
<< varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
<< varGlue("DEFINES","-D"," -D","") << endl;
- t << "CFLAGS = " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
- t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
- t << "INCPATH =";
+ t << "CFLAGS += " << var("QMAKE_CFLAGS") << " $(DEFINES)\n";
+ t << "CXXFLAGS += " << var("QMAKE_CXXFLAGS") << " $(DEFINES)\n";
+ t << "INCPATH +=";
{
QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
const ProStringList &incs = project->values("INCLUDEPATH");
@@ -207,8 +207,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isActiveConfig("staticlib")) {
t << "LINK = " << var("QMAKE_LINK") << endl;
- t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl;
- t << "LIBS = $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
+ t << "LFLAGS += " << var("QMAKE_LFLAGS") << endl;
+ t << "LIBS += $(SUBLIBS) " << fixLibFlags("QMAKE_LIBS").join(' ') << ' '
<< fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
}
@@ -284,6 +284,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isEmpty("QMAKE_BUNDLE")) {
t << "TARGETD = " << fileVar("TARGET_x.y") << endl;
t << "TARGET0 = " << fileVar("TARGET_") << endl;
+ } else if(project->isActiveConfig("compile_libtool")) {
+ t << "TARGETD = " << var("TARGET_la") << endl;
} else if (!project->isActiveConfig("unversioned_libname")) {
t << "TARGET0 = " << fileVar("TARGET_") << endl;
if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
@@ -1185,8 +1187,12 @@ void UnixMakefileGenerator::init2()
} else if (project->isActiveConfig("staticlib")) {
project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
- if(project->values("QMAKE_AR_CMD").isEmpty())
+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
+ if(project->isActiveConfig("compile_libtool"))
+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
+ else
project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
+ }
} else {
project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
+ project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
|
