1 files changed, 122 insertions, 63 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 9bb6f6b..7fbb9f4 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -58,106 +58,113 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
          << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
          << "@echo \"Skipped.\"" << endl << endl;
        writeMakeQmake(t);
        return TRUE;
    }
    if (project->variables()["TEMPLATE"].first() == "app" ||
        project->variables()["TEMPLATE"].first() == "lib") {
        writeMakeParts(t);
        return MakefileGenerator::writeMakefile(t);
    } else if(project->variables()["TEMPLATE"].first() == "subdirs") {
        writeSubdirs(t);
        return TRUE;
    }
    return FALSE;
 }
 void
 UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 {
    QString deps = fileFixify(Option::output.name()), prl;
    bool do_incremental = (project->isActiveConfig("incremental") &&
                           !project->variables()["QMAKE_INCREMENTAL"].isEmpty() &&
                           (!project->variables()["QMAKE_APP_FLAG"].isEmpty() ||
-                            !project->isActiveConfig("staticlib"))),
+                            !project->isActiveConfig("staticlib"))), 
         src_incremental=FALSE, moc_incremental=FALSE;
-    QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
    t << "####### Compiler, tools and options" << endl << endl;
    t << "CC       = ";
    if (project->isActiveConfig("thread") &&
        ! project->variables()["QMAKE_CC_THREAD"].isEmpty())
        t << var("QMAKE_CC_THREAD") << endl;
    else
        t << var("QMAKE_CC") << endl;
    t << "CXX      = ";
    if (project->isActiveConfig("thread") &&
        ! project->variables()["QMAKE_CXX_THREAD"].isEmpty())
        t << var("QMAKE_CXX_THREAD") << endl;
    else
        t << var("QMAKE_CXX") << endl;
    t << "LEX      = " << var("QMAKE_LEX") << endl;
    t << "YACC     = " << var("QMAKE_YACC") << endl;
    t << "CFLAGS   = " << var("QMAKE_CFLAGS") << " "
      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
      << varGlue("DEFINES","-D"," -D","") << endl;
    t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " "
      << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
      << varGlue("DEFINES","-D"," -D","") << endl;
    t << "LEXFLAGS = " << var("QMAKE_LEXFLAGS") << endl;
    t << "YACCFLAGS= " << var("QMAKE_YACCFLAGS") << endl;
-    t << "INCPATH  = " << varGlue("INCLUDEPATH","-I", " -I", "") << " -I" << specdir() << endl;
+    t << "INCPATH  = " << "-I" << specdir();
+    if(!project->isActiveConfig("no_include_pwd")) {
+        QString pwd = fileFixify(QDir::currentDirPath());
+        if(pwd.isEmpty())
+            pwd = ".";
+        t << " -I" << pwd;
+    }
+    t << varGlue("INCLUDEPATH"," -I", " -I", "") << endl;
    if(!project->isActiveConfig("staticlib")) {
        t << "LINK     = ";
        if (project->isActiveConfig("thread") &&
            ! project->variables()["QMAKE_LINK_THREAD"].isEmpty())
            t << var("QMAKE_LINK_THREAD") << endl;
        else
            t << var("QMAKE_LINK") << endl;
        t << "LFLAGS   = " << var("QMAKE_LFLAGS") << endl;
        t << "LIBS     = " << "$(SUBLIBS) " << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
    }
    t << "AR       = " << var("QMAKE_AR") << endl;
    t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
    t << "MOC      = " << var("QMAKE_MOC") << endl;
            t << "UIC      = "<< var("QMAKE_UIC") << endl;
            t << "QMAKE    = "<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
            t << "TAR      = "<< var("QMAKE_TAR") << endl;
    t << "GZIP     = " << var("QMAKE_GZIP") << endl;
    t << "COPY     = " << var("QMAKE_COPY") << endl;
    t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl;
    t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl;
    t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
    t << "SYMLINK  = " << var("QMAKE_SYMBOLIC_LINK") << endl;
    t << "DEL_DIR  = " << var("QMAKE_DEL_DIR") << endl;
    t << "MOVE     = " << var("QMAKE_MOVE") << endl;
-    t << "PRO      = " << fileFixify(project->projectFile()  )<< endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR    = " << var("QMAKE_MKDIR") << endl;
    t << endl;
    t << "####### Output directory" << endl << endl;
    if (! project->variables()["OBJECTS_DIR"].isEmpty())
        t << "OBJECTS_DIR = " << var("OBJECTS_DIR") << endl;
    else
        t << "OBJECTS_DIR = ./" << endl;
    t << endl;
    /* files */
    t << "####### Files" << endl << endl;
    t << "HEADERS = " << varList("HEADERS") << endl;
    t << "SOURCES = " << varList("SOURCES") << endl;
    if(do_incremental) {
        QStringList &objs = project->variables()["OBJECTS"], &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
        t << "OBJECTS = ";
        for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
            bool increment = FALSE;
            for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
                if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
                    increment = TRUE;
                    incrs_out.append((*objit));
                    break;
                }
@@ -191,98 +198,96 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
            for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
                if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
                    increment = TRUE;
                    incrs_out.append((*objit));
                    break;
                }
            }
            if(!increment)
                t << "\\\n\t\t" << (*objit);
        }
        if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
            t << incrs_out.join(" \\\n\t\t") << endl;
        } else if(!incrs_out.count()) {
            t << endl;
        } else {
            moc_incremental = TRUE;
            t << endl;
            t << "INCREMENTAL_OBJMOC = " << incrs_out.join(" \\\n\t\t") << endl;
        }
    } else {
        t << "OBJMOC = " << objMoc << endl;
    }
    if(do_incremental && !moc_incremental && !src_incremental)
        do_incremental = FALSE;
-            t << "DIST   = " << varList("DISTFILES") << endl;
+            t << "DIST   = " << valList(fileFixify(project->variables()["DISTFILES"])) << endl;
-    t << "PRO      = " << fileFixify(project->projectFile()) << endl;
    t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl;
    t << "DESTDIR  = " << var("DESTDIR") << endl;
    t << "TARGET   = " << var("TARGET") << endl;
    if(project->isActiveConfig("plugin") ) {
        t << "TARGETD   = " << var("TARGET") << endl;
    } else if (!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty()) {
                t << "TARGETA= " << var("TARGETA") << endl;
-        if (os == "hpux") {
+        if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
-                    t << "TARGETD= " << var("TARGET_x") << endl;
-                    t << "TARGET0= " << var("TARGET_") << endl;
-        }
-        else {
                    t << "TARGETD= " << var("TARGET_x.y.z") << endl;
                    t << "TARGET0= " << var("TARGET_") << endl;
                    t << "TARGET1= " << var("TARGET_x") << endl;
                    t << "TARGET2= " << var("TARGET_x.y") << endl;
+        } else {
+                    t << "TARGETD= " << var("TARGET_x") << endl;
+                    t << "TARGET0= " << var("TARGET_") << endl;
        }
    }
    t << endl;
    // blasted incldues
    QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
    QStringList::Iterator it;
    for( it = qeui.begin(); it != qeui.end(); ++it)
        t << "include " << (*it) << endl;
    /* rules */
    t << "first: all" << endl;
    t << "####### Implicit rules" << endl << endl;
    t << ".SUFFIXES: .c";
    QStringList::Iterator cppit;
    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
        t << " " << (*cppit);
    t << endl << endl;
    for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit)
        t << (*cppit) << ".o:\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
    t << ".c.o:\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
    if(include_deps) {
        QString cmd=var("QMAKE_CFLAGS_DEPS") + " ";
        cmd += varGlue("DEFINES","-D"," -D","") + varGlue("PRL_EXPORT_DEFINES"," -D"," -D","");
        if(!project->isEmpty("QMAKE_ABSOLUTE_SOURCE_PATH"))
            cmd += " -I" + project->first("QMAKE_ABSOLUTE_SOURCE_PATH") + " ";
        cmd += " $(INCPATH) " + varGlue("DEPENDPATH", "-I", " -I", "");
        QString odir;
        if(!project->variables()["OBJECTS_DIR"].isEmpty())
            odir = project->first("OBJECTS_DIR");
-        t << "###### Dependancies" << endl << endl;
+        t << "###### Dependencies" << endl << endl;
        t << odir << ".deps/%.d: %.cpp\n\t"
          << "@echo Creating depend for $<" << "\n\t"
          << "@test -d $(@D) || mkdir -p $(@D)" << "\n\t"
          << "@$(CXX) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
        t << odir << ".deps/%.d: %.c\n\t"
          << "@echo Creating depend for $<" << "\n\t"
          << "@test -d $(@D) || mkdir -p $(@D)" << "\n\t"
          << "@$(CC) " << cmd << " $< | sed \"s,^\\($(*F).o\\):," << odir << "\\1:,g\" >$@" << endl << endl;
        QString src[] = { "SOURCES", "UICIMPLS", "SRCMOC", QString::null };
        for(int x = 0; !src[x].isNull(); x++) {
            QStringList &l = project->variables()[src[x]];
            for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                if(!(*it).isEmpty()) {
                    QString d_file;
                    if((*it).endsWith(".c")) {
                        d_file = (*it).left((*it).length() - 2);
                    } else {
                        for(QStringList::Iterator cppit = Option::cpp_ext.begin();
                            cppit != Option::cpp_ext.end(); ++cppit) {
                            if((*it).endsWith((*cppit))) {
                                d_file = (*it).left((*it).length() - (*cppit).length());
@@ -365,62 +370,64 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                if(!destdir.isEmpty())
                    t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
                t << "$(LINK) " << incr_lflags << " -o "<< incr_target_dir <<
                    " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << endl;
                //communicated below
                if(!destdir.isEmpty()) {
                    if(!incr_objs.isEmpty())
                        incr_objs += " ";
                    incr_objs += "-L" + destdir;
                } else {
                    if(!incr_objs.isEmpty())
                        incr_objs += " ";
                    incr_objs += "-L" + QDir::currentDirPath();
                }
                if(!incr_objs.isEmpty())
                    incr_objs += " ";
                incr_objs += " -l" + incr_target;
                deps.prepend(incr_target_dir + " ");
                incr_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
            }
            t << "all: " << deps <<  " " << varGlue("ALL_DEPS",""," "," ") <<  "$(TARGET)"
              << endl << endl;
            //real target
-            t << var("TARGET") << ": " << " " << incr_deps << " " << var("TARGETDEPS") << "\n\t";
+            t << var("TARGET") << ": " << var("PRE_TARGETDEPS") << " " << incr_deps 
+              << " " << var("POST_TARGETDEPS") << "\n\t";
            if(!destdir.isEmpty())
                t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
            if(!project->isEmpty("QMAKE_PRE_LINK"))
                t << var("QMAKE_PRE_LINK") << "\n\t";
            t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(LIBS)";
            if(!project->isEmpty("QMAKE_POST_LINK"))
                t << "\n\t" << var("QMAKE_POST_LINK");
            t << endl << endl;
        } else {
            t << "all: " << deps <<  " " << varGlue("ALL_DEPS",""," "," ") <<  "$(TARGET)"
              << endl << endl;
-            t << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("TARGETDEPS") << "\n\t";
+            t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
+              << var("POST_TARGETDEPS") << "\n\t";
            if(!destdir.isEmpty())
                t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
            if(!project->isEmpty("QMAKE_PRE_LINK"))
                t << var("QMAKE_PRE_LINK") << "\n\t";
            t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)";
            if(!project->isEmpty("QMAKE_POST_LINK"))
                t << "\n\t" << var("QMAKE_POST_LINK");
            t << endl << endl;
        }
    } else if(!project->isActiveConfig("staticlib")) {
        QString destdir = project->first("DESTDIR"), incr_deps;
        if(do_incremental) {
            QString s_ext = project->variables()["QMAKE_EXTENSION_SHLIB"].first();
            QString incr_target = var("QMAKE_ORIG_TARGET").replace(
                QRegExp("\\." + s_ext), "").replace(QRegExp("^lib"), "") + "_incremental";
            if(incr_target.find(Option::dir_sep) != -1)
                incr_target = incr_target.right(incr_target.length() -
                                                (incr_target.findRev(Option::dir_sep) + 1));
            if(project->first("QMAKE_INCREMENTAL_STYLE") == "ld") {
                QString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext;
                //actual target
                const QString link_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
                t << incr_target_dir << ": " << link_deps << "\n\t"
@@ -439,300 +446,344 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
                if(!project->isEmpty("QMAKE_LFLAGS_INCREMENTAL"))
                    incr_lflags += var("QMAKE_LFLAGS_INCREMENTAL") + " ";
                if(project->isActiveConfig("debug"))
                    incr_lflags += var("QMAKE_LFLAGS_DEBUG");
                else
                    incr_lflags += var("QMAKE_LFLAGS_RELEASE");
                t << incr_target_dir << ": $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << "\n\t";
                if(!destdir.isEmpty())
                    t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
                t << "$(LINK) " << incr_lflags << " -o "<< incr_target_dir <<
                    " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)" << endl;
                //communicated below
                QStringList &cmd = project->variables()["QMAKE_LINK_SHLIB_CMD"];
                if(!destdir.isEmpty())
                    cmd.append(" -L" + destdir);
                cmd.append(" -l" + incr_target);
                deps.prepend(incr_target_dir + " ");
                incr_deps = "$(UICDECLS) $(OBJECTS) $(OBJMOC)";
            }
            t << "all: " << " " << deps << " " << varGlue("ALL_DEPS",""," ","")
              << " " <<  var("DESTDIR_TARGET") << endl << endl;
            //real target
-            t << var("DESTDIR_TARGET") << ": " << incr_deps << " $(SUBLIBS) " <<
+            t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") << " " 
-                var("TARGETDEPS");
+              << incr_deps << " $(SUBLIBS) " << var("POST_TARGETDEPS");
        } else {
            t << "all: " << deps << " " << varGlue("ALL_DEPS",""," ","") << " " <<
                var("DESTDIR_TARGET") << endl << endl;
-            t << var("DESTDIR_TARGET") << ":  $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " <<
+            t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") 
-                var("TARGETDEPS");
+              << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " << var("POST_TARGETDEPS");
        }
        if(!destdir.isEmpty())
            t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir;
        if(!project->isEmpty("QMAKE_PRE_LINK"))
            t << "\n\t" << var("QMAKE_PRE_LINK");
        if(project->isActiveConfig("plugin")) {
            t << "\n\t"
              << "-$(DEL_FILE) $(TARGET)" << "\n\t"
              << var("QMAKE_LINK_SHLIB_CMD");
            if(!destdir.isEmpty())
                t << "\n\t"
                  << "-$(MOVE) $(TARGET) " << var("DESTDIR");
            if(!project->isEmpty("QMAKE_POST_LINK"))
                t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
            t << endl << endl;
-        } else if ( os == "hpux" ) {
+        } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
-            t << "\n\t"
-              << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t"
-              << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
-            t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)");
-            if(!destdir.isEmpty())
-                t  << "\n\t"
-                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
-                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
-                   << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR");
-            if(!project->isEmpty("QMAKE_POST_LINK"))
-                t << "\n\t" << var("QMAKE_POST_LINK");
-            t << endl << endl;
-        } else {
            t << "\n\t"
              << "-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)" << "\n\t"
              << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
            t << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET0)")  << "\n\t"
              << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET1)") << "\n\t"
              << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET2)");
            if(!destdir.isEmpty())
                t << "\n\t"
                  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
                  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
                  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET1)\n\t"
                  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET2)\n\t"
                  << "-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) " << var("DESTDIR");
            if(!project->isEmpty("QMAKE_POST_LINK"))
                t << "\n\t" << var("QMAKE_POST_LINK");
            t << endl << endl;
+        } else {
+            t << "\n\t"
+              << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t"
+              << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
+            t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)");
+            if(!destdir.isEmpty())
+                t  << "\n\t"
+                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
+                   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
+                   << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR");
+            if(!project->isEmpty("QMAKE_POST_LINK"))
+                t << "\n\t" << var("QMAKE_POST_LINK");
+            t << endl << endl;
        }
        t << endl << endl;
        if (! project->isActiveConfig("plugin")) {
            t << "staticlib: $(TARGETA)" << endl << endl;
-            t << "$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)";
+            t << "$(TARGETA): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC)";
            if(do_incremental)
                t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
-            t << var("TARGETDEPS") << "\n\t"
+            t << var("POST_TARGETDEPS") << "\n\t"
              << "-$(DEL_FILE) $(TARGETA) " << "\n\t"
              << var("QMAKE_AR_CMD");
            if(do_incremental)
                t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
            if(!project->isEmpty("QMAKE_RANLIB"))
                t << "\n\t" << "$(RANLIB) $(TARGETA)";
            t << endl << endl;
        }
    } else {
-        t << "all: " << deps << " " << varGlue("ALL_DEPS",""," "," ") << var("DESTDIR") << "$(TARGET) "
+        t << "all: " << deps << " " << varGlue("ALL_DEPS",""," "," ") << var("DESTDIR") << "$(TARGET) " 
          << varGlue("QMAKE_AR_SUBLIBS", var("DESTDIR"), " " + var("DESTDIR"), "") << "\n\n"
          << "staticlib: " << var("DESTDIR") << "$(TARGET)" << "\n\n";
        if(project->isEmpty("QMAKE_AR_SUBLIBS")) {
-            t << var("DESTDIR") << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(TARGETDEPS) " << "\n\t";
+            t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS") 
+              << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("POST_TARGETDEPS") << "\n\t";
            if(!project->isEmpty("DESTDIR")) {
                QString destdir = project->first("DESTDIR");
                t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
            }
            t << "-$(DEL_FILE) $(TARGET)" << "\n\t"
              << var("QMAKE_AR_CMD") << "\n";
            if(!project->isEmpty("QMAKE_POST_LINK"))
                t << "\t" << var("QMAKE_POST_LINK") << "\n";
            if(!project->isEmpty("QMAKE_RANLIB"))
                t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
-            if(!project->isEmpty("DESTDIR"))
+            if(!project->isEmpty("DESTDIR")) 
                t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)" << "\n"
                  << "\t" << "-$(MOVE) $(TARGET) " << var("DESTDIR") << "\n";
        } else {
-            int cnt = 0, max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
+            int max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
            QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"],
                        libs = project->variables()["QMAKE_AR_SUBLIBS"];
            libs.prepend("$(TARGET)");
-            for(QStringList::Iterator libit = libs.begin(), objit = objs.begin();
+            for(QStringList::Iterator libit = libs.begin(), objit = objs.begin(); 
                libit != libs.end(); ++libit) {
                QStringList build;
-                for(cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++)
+                for(int cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++) 
                    build << (*objit);
                QString ar;
                if((*libit) == "$(TARGET)") {
-                    t << var("DESTDIR") << "$(TARGET): $(UICDECLS) " << " $(TARGETDEPS) "
+                    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS") 
-                      << valList(build) << "\n\t";
+                      << " $(UICDECLS) " << var("POST_TARGETDEPS") << valList(build) << "\n\t";
                    ar = project->variables()["QMAKE_AR_CMD"].first();
-                    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)",
+                    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)", 
                                                             build.join(" "));
                } else {
                    t << (*libit) << ": " << valList(build) << "\n\t";
                    ar = "$(AR) " + (*libit) + " " + build.join(" ");
                }
                if(!project->isEmpty("DESTDIR")) {
                    QString destdir = project->first("DESTDIR");
                    t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
                }
                t << "-$(DEL_FILE) " << (*libit) << "\n\t"
                  << ar << "\n";
                if(!project->isEmpty("QMAKE_POST_LINK"))
                    t << "\t" << var("QMAKE_POST_LINK") << "\n";
                if(!project->isEmpty("QMAKE_RANLIB"))
                    t << "\t" << "$(RANLIB) " << (*libit) << "\n";
-                if(!project->isEmpty("DESTDIR"))
+                if(!project->isEmpty("DESTDIR")) 
                    t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << (*libit) << "\n"
                      << "\t" << "-$(MOVE) " << (*libit) << " " << var("DESTDIR") << "\n";
            }
        }
        t << endl << endl;
    }
    t << "mocables: $(SRCMOC)" << endl << endl;
    if(!project->isActiveConfig("no_mocdepend")) {
        //this is an implicity depend on moc, so it will be built if necesary, however
-        //moc itself shouldn't have this dependancy - this is a little kludgy but it is
+        //moc itself shouldn't have this dependency - this is a little kludgy but it is
        //better than the alternative for now.
        QString moc = project->first("QMAKE_MOC"), target = project->first("TARGET");
        fixEnvVariables(target);
        fixEnvVariables(moc);
-        if(target != moc)
+        if(target != moc) 
            t << "$(MOC): \n\t"
              << "( cd $(QTDIR)/src/moc ; $(MAKE) )"  << endl << endl;
    }
    writeMakeQmake(t);
    if(!project->first("QMAKE_PKGINFO").isEmpty()) {
        QString pkginfo = project->first("QMAKE_PKGINFO");
        QString destdir = project->first("DESTDIR");
        t << pkginfo << ": " << "\n\t";
        if(!destdir.isEmpty())
            t << "@test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
        t << "@$(DEL_FILE) " << pkginfo << "\n\t"
          << "@echo \"APPL????\" >" << pkginfo << endl;
    }
    if(!project->first("QMAKE_INFO_PLIST").isEmpty()) {
        QString info_plist = project->first("QMAKE_INFO_PLIST"),
               info_plist_out = project->first("QMAKE_INFO_PLIST_OUT");
        QString destdir = project->first("DESTDIR");
        t << info_plist_out << ": " << "\n\t";
        if(!destdir.isEmpty())
            t << "@test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
        t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
          << "@cp \"" << info_plist << "\" \"" << info_plist_out << "\"" << endl;
        if(!project->first("RC_FILE").isEmpty()) {
            QString dir = destdir + "../Resources/";
            t << dir << "application.icns:" << "\n\t"
              << "@test -d " << dir << " || mkdir -p " << dir << "\n\t"
              << "@cp " << var("RC_FILE") << " " << dir << "application.icns" << endl;
        }
    }
    QString ddir = project->isEmpty("QMAKE_DISTDIR") ? project->first("QMAKE_ORIG_TARGET") :
                   project->first("QMAKE_DISTDIR");
    QString ddir_c = fileFixify((project->isEmpty("OBJECTS_DIR") ? QString(".tmp/") :
                                 project->first("OBJECTS_DIR")) + ddir);
    t << "dist: " << "\n\t"
      << "@mkdir -p " << ddir_c << " && "
      << "$(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) " << ddir_c << Option::dir_sep << " && ";
    if(!project->isEmpty("TRANSLATIONS"))
        t << "$(COPY_FILE) --parents " << var("TRANSLATIONS") << " " << ddir_c << Option::dir_sep << " && ";
    if(!project->isEmpty("FORMS")) {
        QStringList &forms = project->variables()["FORMS"], ui_headers;
        for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
            QString ui_h = fileFixify((*formit) + Option::h_ext.first());
-            if(QFile::exists(ui_h) )
+            if(QFile::exists(ui_h) ) 
               ui_headers << ui_h;
        }
        if(!ui_headers.isEmpty())
            t << "$(COPY_FILE) --parents " << val(ui_headers) << " " << ddir_c << Option::dir_sep << " && ";
    }
    t << "( cd `dirname " << ddir_c << "` && "
      << "$(TAR) " << var("QMAKE_ORIG_TARGET") << ".tar " << ddir << " && "
      << "$(GZIP) " << var("QMAKE_ORIG_TARGET") << ".tar ) && "
      << "$(MOVE) `dirname " << ddir_c << "`" << Option::dir_sep << var("QMAKE_ORIG_TARGET") << ".tar.gz . && "
-      << "$(DEL_DIR) " << ddir_c
+      << "$(DEL_FILE) -r " << ddir_c
      << endl << endl;
    QString clean_targets;
    if(mocAware()) {
        t << "mocclean:" << "\n";
        if(!objMoc.isEmpty() || !srcMoc.isEmpty() || moc_incremental) {
            if(!objMoc.isEmpty())
                t << "\t-$(DEL_FILE) $(OBJMOC)" << '\n';
            if(!srcMoc.isEmpty())
                t << "\t-$(DEL_FILE) $(SRCMOC)" << '\n';
            if(moc_incremental)
                t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJMOC)" << '\n';
            clean_targets += " mocclean";
        }
        t << endl;
    }
    t << "uiclean:" << "\n";
    if (!var("UICIMPLS").isEmpty() || !var("UICDECLS").isEmpty()) {
        t << "\t-$(DEL_FILE) $(UICIMPLS) $(UICDECLS)" << "\n";
        clean_targets += " uiclean";
    }
    t << endl;
+    t << "yaccclean:" << "\n";
+    if(!var("YACCSOURCES").isEmpty()) {
+        QStringList clean, &l = project->variables()["YACCSOURCES"];
+        for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QFileInfo fi((*it));
+            QString dir;
+            if(fi.dirPath() != ".")
+                dir = fi.dirPath() + Option::dir_sep;
+            dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+            if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+                dir += Option::dir_sep;
+            clean <<  dir + fi.baseName(TRUE) + Option::yacc_mod + Option::cpp_ext.first();
+            clean << dir + fi.baseName(TRUE) + Option::yacc_mod + Option::h_ext.first();
+        }
+        if(!clean.isEmpty()) {
+            t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+            clean_targets += " yaccclean";
+        }
+    }
+    t << "lexclean:" << "\n";
+    if(!var("LEXSOURCES").isEmpty()) {
+        QStringList clean, &l = project->variables()["LEXSOURCES"];
+        for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
+            QFileInfo fi((*it));
+            QString dir;
+            if(fi.dirPath() != ".")
+                dir = fi.dirPath() + Option::dir_sep;
+            dir = fileFixify(dir, QDir::currentDirPath(), Option::output_dir);
+            if(!dir.isEmpty() && dir.right(Option::dir_sep.length()) != Option::dir_sep)
+                dir += Option::dir_sep;
+            clean <<  dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first();
+        }
+        if(!clean.isEmpty()) {
+            t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
+            clean_targets += " lexclean";
+        }
+    }
    if(do_incremental) {
        t << "incrclean:" << "\n";
        if(src_incremental)
            t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJECTS)" << "\n";
        if(moc_incremental)
            t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJMOC)" << '\n';
        t << endl;
    }
    t << "clean:" << clean_targets << "\n\t";
    if(!project->isEmpty("OBJECTS"))
        t << "-$(DEL_FILE) $(OBJECTS) " << "\n\t";
    if(!project->isEmpty("IMAGES"))
        t << varGlue("QMAKE_IMAGE_COLLECTION", "\t-$(DEL_FILE) ", " ", "") << "\n\t";
    if(src_incremental)
        t << "-$(DEL_FILE) $(INCREMENTAL_OBJECTS)" << "\n\t";
    t << varGlue("QMAKE_CLEAN","-$(DEL_FILE) "," ","\n\t")
      << "-$(DEL_FILE) *~ core *.core" << "\n"
      << varGlue("CLEAN_FILES","\t-$(DEL_FILE) "," ","") << endl << endl;
    t << "####### Sub-libraries" << endl << endl;
    if ( !project->variables()["SUBLIBS"].isEmpty() ) {
        QString libdir = "tmp/";
        if(!project->isEmpty("SUBLIBS_DIR"))
            libdir = project->first("SUBLIBS_DIR");
        QStringList &l = project->variables()["SUBLIBS"];
        for(it = l.begin(); it != l.end(); ++it)
            t << libdir << "lib" << (*it) << ".a" << ":\n\t"
              << var(QString("MAKELIB") + (*it)) << endl << endl;
    }
    QString destdir = project->first("DESTDIR");
    if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
        destdir += Option::dir_sep;
-    t << "distclean: " << "clean\n\t"
+    t << "distclean: " << "clean\n";
-      << "-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
+    if(project->first("TEMPLATE") == "app" &&
+       project->isActiveConfig("resource_fork") && !project->isActiveConfig("console"))
+        t << "\t-$(DEL_FILE) -r " << destdir.section(Option::dir_sep, 0, -4) << "\n";
+    else
+        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
    if(!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty() &&
       !project->isActiveConfig("plugin"))
        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
          << destdir << "$(TARGET2) $(TARGETA)" << "\n";
    t << endl << endl;
    if ( !project->isEmpty("PRECOMPH") ) {
        QString outdir = project->first("MOC_DIR");
        QString qt_dot_h = Option::fixPathToLocalOS(project->first("PRECOMPH"));
        t << "###### Combined headers" << endl << endl;
        //XXX
        t << outdir << "allmoc.cpp: " << qt_dot_h << " "
          << varList("HEADERS_ORIG") << "\n\t"
          << "echo '#include \"" << qt_dot_h << "\"' >" << outdir << "allmoc.cpp" << "\n\t"
          << "$(CXX) -E -DQT_MOC_CPP -DQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h "
             << outdir << "allmoc.cpp" << "\n\t"
          << "$(MOC) -o " << outdir << "allmoc.cpp " << outdir << "allmoc.h" << "\n\t"
          << "perl -pi -e 's{#include \"allmoc.h\"}{#define QT_H_CPP\\n#include \""
             << qt_dot_h << "\"}' " << outdir << "allmoc.cpp" << "\n\t"
          << "$(DEL_FILE) " << outdir << "allmoc.h" << endl << endl;
    }
    // blasted user defined targets
    QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
@@ -785,185 +836,186 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
            while(sd->directory.right(1) == Option::dir_sep)
                sd->directory = sd->directory.left(sd->directory.length() - 1);
            if(!sd->profile.isEmpty()) {
                QString basename = sd->directory;
                int new_slsh = basename.findRev(Option::dir_sep);
                if(new_slsh != -1)
                    basename = basename.mid(new_slsh+1);
                if(sd->profile != basename + ".pro")
                    sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
            }
            sd->target = "sub-" + (*it);
            sd->target.replace('/', '-');
            sd->target.replace('.', '_');
        }
    }
    QPtrListIterator<SubDir> it(subdirs);
    QString ofile = Option::output.name();
    if(ofile.findRev(Option::dir_sep) != -1)
        ofile = ofile.right(ofile.length() - ofile.findRev(Option::dir_sep) -1);
            t << "MAKEFILE =" << var("MAKEFILE") << endl;
            t << "QMAKE    =" << var("QMAKE") << endl;
    t << "DEL_FILE =    " << var("QMAKE_DEL_FILE") << endl;
            t << "SUBTARGETS =";     // subdirectory targets are sub-directory
-    for( it.toFirst(); it.current(); ++it)
+    for( it.toFirst(); it.current(); ++it) 
        t << " \\\n\t\t" << it.current()->target;
    t << endl << endl;
    t << "first: all\n\nall: " << ofile << " $(SUBTARGETS)" << endl << endl;
    // generate target rules
    for( it.toFirst(); it.current(); ++it) {
        bool have_dir = !(*it)->directory.isEmpty();
        QString mkfile = (*it)->makefile, out;
        if(have_dir)
            mkfile.prepend((*it)->directory + Option::dir_sep);
        if(direct || (*it)->makefile != "$(MAKEFILE)")
            out = " -o " + (*it)->makefile;
        //qmake it
        t << mkfile << ": " << "\n\t";
        if(have_dir)
            t << "cd " << (*it)->directory << " && ";
        t << "$(QMAKE) " << (*it)->profile << buildArgs() << out << endl;
        //actually compile
        t << (*it)->target << ": " << mkfile << " FORCE" << "\n\t";
        if(have_dir)
            t << "cd " << (*it)->directory << " && ";
        t << "$(MAKE) -f " << (*it)->makefile << endl << endl;
    }
            if (project->isActiveConfig("ordered")) { // generate dependencies
        for( it.toFirst(); it.current(); ) {
            QString tar = it.current()->target;
            ++it;
-            if (it.current())
+            if (it.current()) 
                t << it.current()->target << ": " << tar << endl;
        }
        t << endl;
    }
    writeMakeQmake(t);
    if(project->isEmpty("SUBDIRS")) {
-        t << "all qmake_all distclean install uiclean mocclean clean: FORCE" << endl;
+        t << "all qmake_all distclean install uiclean mocclean lexclean yaccclean clean: FORCE" << endl;
    } else {
        t << "all: $(SUBTARGETS)" << endl;
        t << "qmake_all:";
        for( it.toFirst(); it.current(); ++it) {
            t << " ";
            if(!(*it)->directory.isEmpty())
                t << (*it)->directory << Option::dir_sep;
            t << (*it)->makefile;
        }
        for( it.toFirst(); it.current(); ++it) {
            t << "\n\t ( ";
            if(!(*it)->directory.isEmpty())
                t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
-            t << "grep \"^qmake_all:\" " << (*it)->makefile
+            t << "grep \"^qmake_all:\" " << (*it)->makefile 
              << " && $(MAKE) -f " << (*it)->makefile << " qmake_all" << "; ) || true";
        }
        t << endl;
-        t << "clean uninstall install uiclean mocclean: qmake_all FORCE";
+        t << "clean uninstall install uiclean mocclean lexclean yaccclean: qmake_all FORCE";
        for( it.toFirst(); it.current(); ++it) {
            t << "\n\t ( ";
            if(!(*it)->directory.isEmpty())
                t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
            t << "$(MAKE) -f " << (*it)->makefile << " $@" << "; ) || true";
        }
        t << endl;
        t << "distclean: qmake_all FORCE";
        for( it.toFirst(); it.current(); ++it) {
            t << "\n\t ( ";
            if(!(*it)->directory.isEmpty())
                t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
            t << "$(MAKE) -f " << (*it)->makefile << " $@; $(DEL_FILE) " << (*it)->makefile << "; ) || true";
        }
        t << endl << endl;
    }
    t <<"FORCE:" << endl << endl;
 }
 void UnixMakefileGenerator::init2()
 {
    //version handling
    if(project->variables()["VERSION"].isEmpty())
        project->variables()["VERSION"].append("1.0." +
                                               (project->isEmpty("VER_PAT") ? QString("0") :
                                                project->first("VER_PAT")) );
    QStringList l = QStringList::split('.', project->first("VERSION"));
    l << "0" << "0"; //make sure there are three
    project->variables()["VER_MAJ"].append(l[0]);
    project->variables()["VER_MIN"].append(l[1]);
    project->variables()["VER_PAT"].append(l[2]);
    if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
 #if 0
        if ( project->isActiveConfig("dll") ) {
            project->variables()["TARGET"] += project->variables()["TARGET.so"];
            if(project->variables()["QMAKE_LFLAGS_SHAPP"].isEmpty())
                project->variables()["QMAKE_LFLAGS_SHAPP"] += project->variables()["QMAKE_LFLAGS_SHLIB"];
            if(!project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty())
                project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET");
        }
 #endif
        project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
+       if ( !project->variables()["QMAKE_CYGWIN_EXE"].isEmpty() )
+            project->variables()["TARGET_EXT"].append(".exe");
    } else if ( project->isActiveConfig("staticlib") ) {
        project->variables()["TARGET"].first().prepend("lib");
        project->variables()["TARGET"].first() += ".a";
        if(project->variables()["QMAKE_AR_CMD"].isEmpty())
            project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)");
    } else {
        project->variables()["TARGETA"].append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
        if ( !project->variables()["QMAKE_AR_CMD"].isEmpty() )
            project->variables()["QMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)");
        else
            project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)");
-        QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
        if( project->isActiveConfig("plugin") ) {
            project->variables()["TARGET_x.y.z"].append("lib" +
                                                        project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_SHLIB"));
            if(project->isActiveConfig("lib_version_first"))
                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
-                                                        project->first("VER_MAJ") + "." +
+                                                        project->first("VER_MAJ") + "." + 
                                                        project->first("QMAKE_EXTENSION_SHLIB"));
            else
                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
                                                        project->first("QMAKE_EXTENSION_SHLIB") +
                                                        "." + project->first("VER_MAJ"));
            project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
            if(project->isActiveConfig("qt"))
                project->variables()["DEFINES"].append("QT_PLUGIN");
-        } else if ( os == "hpux" ) {
+        } else if ( !project->isEmpty("QMAKE_HPUX_SHLIB") ) {
            project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".sl");
            if(project->isActiveConfig("lib_version_first"))
-                project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." +
+                project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." + 
                                                        project->first("TARGET"));
            else
-                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
+                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + 
                                                        project->first("VER_MAJ"));
            project->variables()["TARGET"] = project->variables()["TARGET_x"];
-        } else if ( os == "aix" ) {
+        } else if ( !project->isEmpty("QMAKE_AIX_SHLIB") ) {
            project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".a");
            if(project->isActiveConfig("lib_version_first")) {
                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
                                                        project->first("VER_MAJ") + "." +
                                                        project->first("QMAKE_EXTENSION_SHLIB"));
                project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
                                                          project->first("VER_MAJ") +
                                                          "." + project->first("VER_MIN") + "." +
                                                          project->first("QMAKE_EXTENSION_SHLIB"));
                project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
                                                            project->first("VER_MAJ") + "." +
                                                            project->first("VER_MIN") + "." +
                                                            project->first("VER_PAT") + "." +
                                                            project->first("QMAKE_EXTENSION_SHLIB"));
            } else {
                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
                                                        project->first("QMAKE_EXTENSION_SHLIB") +
                                                        "." + project->first("VER_MAJ"));
                project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
                                                          project->first("QMAKE_EXTENSION_SHLIB") +
                                                          "." + project->first("VER_MAJ") +
                                                          "." + project->first("VER_MIN"));
                project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
                                                            project->first("QMAKE_EXTENSION_SHLIB") + "." +
@@ -990,50 +1042,57 @@ void UnixMakefileGenerator::init2()
                                                            project->variables()["QMAKE_EXTENSION_SHLIB"].first());
            } else {
                project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
                                                        project->first("QMAKE_EXTENSION_SHLIB") +
                                                        "." + project->first("VER_MAJ"));
                project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
                                                      project->first("QMAKE_EXTENSION_SHLIB")
                                                      + "." + project->first("VER_MAJ") +
                                                      "." + project->first("VER_MIN"));
                project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") +
                                                            "." +
                                                            project->variables()[
                                                                "QMAKE_EXTENSION_SHLIB"].first() + "." +
                                                            project->first("VER_MAJ") + "." +
                                                            project->first("VER_MIN") +  "." +
                                                            project->first("VER_PAT"));
            }
            project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
        }
        if(project->isEmpty("QMAKE_LN_SHLIB"))
            project->variables()["QMAKE_LN_SHLIB"].append("ln -s");
        project->variables()["DESTDIR_TARGET"].append("$(TARGET)");
        if ( !project->variables()["DESTDIR"].isEmpty() )
            project->variables()["DESTDIR_TARGET"].first().prepend(project->first("DESTDIR"));
-        if ( !project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty() && !project->variables()["TARGET_x"].isEmpty() )
+        if ( !project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty()) {
-            project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET_x");
+            if(project->isActiveConfig("plugin")) {
+                if(!project->variables()["TARGET"].isEmpty() )
+                    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET");
+            } else {
+                if(!project->variables()["TARGET_x"].isEmpty() )
+                    project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET_x");
+            }
+        }
        if ( project->variables()["QMAKE_LINK_SHLIB_CMD"].isEmpty() )
            project->variables()["QMAKE_LINK_SHLIB_CMD"].append(
                "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)");
    }
    if(project->isEmpty("QMAKE_SYMBOLIC_LINK"))
        project->variables()["QMAKE_SYMBOLIC_LINK"].append("ln -sf");
    if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
        project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SHAPP"];
    } else if ( project->isActiveConfig("dll") ) {
        project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_SHLIB"];
        project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_SHLIB"];
        if ( project->isActiveConfig("plugin") ) {
            project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_PLUGIN"];
            if( !project->isActiveConfig("plugin_no_soname") )
                project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
        } else {
            project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SHLIB"];
            project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
        }
        QString destdir = project->first("DESTDIR");
        if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) {
            QString rpath_destdir = destdir;
            if(QDir::isRelativePath(rpath_destdir)) {
                QFileInfo fi(Option::fixPathToLocalOS(rpath_destdir));