1 files changed, 415 insertions, 142 deletions

diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index e274481..caaddee 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -1,13 +1,11 @@
 /****************************************************************************
-** $Id$
+** 
 **
-** Definition of ________ class.
-**
-** Created : 970521
+** Implementation of UnixMakefileGenerator class.
 **
 ** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of the network module of the Qt GUI Toolkit.
+** This file is part of qmake.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
@@ -78,10 +76,24 @@ UnixMakefileGenerator::init()
             project->variables()["QMAKE_EXTENSION_SHLIB"].append( "dll" );
         }
     }
+    if( project->isEmpty("QMAKE_CFLAGS_PRECOMPILE"))
+        project->variables()["QMAKE_CFLAGS_PRECOMPILE"].append("-x c-header -c");
+    if( project->isEmpty("QMAKE_CXXFLAGS_PRECOMPILE"))
+        project->variables()["QMAKE_CXXFLAGS_PRECOMPILE"].append("-x c++-header -c");
+    if( project->isEmpty("QMAKE_CFLAGS_USE_PRECOMPILE"))
+        project->variables()["QMAKE_CFLAGS_USE_PRECOMPILE"].append("-include");
+    if( project->isEmpty("QMAKE_EXTENSION_PLUGIN") )
+        project->variables()["QMAKE_EXTENSION_PLUGIN"].append(project->first("QMAKE_EXTENSION_SHLIB"));
     if( project->isEmpty("QMAKE_COPY_FILE") )
-        project->variables()["QMAKE_COPY_FILE"].append( "$(COPY) -p" );
+        project->variables()["QMAKE_COPY_FILE"].append( "$(COPY)" );
     if( project->isEmpty("QMAKE_COPY_DIR") )
-        project->variables()["QMAKE_COPY_DIR"].append( "$(COPY) -pR" );
+        project->variables()["QMAKE_COPY_DIR"].append( "$(COPY) -R" );
+    if( project->isEmpty("QMAKE_INSTALL_FILE") )
+        project->variables()["QMAKE_INSTALL_FILE"].append( "$(COPY_FILE)" );
+    if( project->isEmpty("QMAKE_INSTALL_DIR") )
+        project->variables()["QMAKE_INSTALL_DIR"].append( "$(COPY_DIR)" );
+    if( project->isEmpty("QMAKE_LIBTOOL") )
+        project->variables()["QMAKE_LIBTOOL"].append( "libtool --silent" );
     //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET
     if(!project->isEmpty("TARGET")) {
         QString targ = project->first("TARGET");
@@ -103,8 +115,7 @@ UnixMakefileGenerator::init()
     bool extern_libs = !project->isEmpty("QMAKE_APP_FLAG") ||
                        (!project->isEmpty("QMAKE_LIB_FLAG") &&
                         project->isActiveConfig("dll")) || is_qt;
-    if(!project->isActiveConfig("global_init_link_order"))
-        project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
     if ( (!project->isEmpty("QMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib") ) ||
          (project->isActiveConfig("qt") &&  project->isActiveConfig( "plugin" ) )) {
         if(configs.findIndex("dll") == -1) configs.append("dll");
@@ -137,21 +148,22 @@ UnixMakefileGenerator::init()
         project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR"];
     if(!project->isEmpty("QMAKE_LIBDIR")) {
         if ( !project->isEmpty("QMAKE_RPATH") )
-            project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"),
-                                                                  " " + var("QMAKE_RPATH"), "");
+            project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR", " " + var("QMAKE_RPATH"),
+                                                            " " + var("QMAKE_RPATH"), "");
         project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue( "QMAKE_LIBDIR", "-L", " -L", "" );
     }
-    if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) {
-        if(configs.findIndex("x11lib") == -1)
-            configs.append("x11lib");
-        if ( project->isActiveConfig("opengl") && configs.findIndex("x11inc") == -1 )
-            configs.append("x11inc");
+    if ( project->isActiveConfig("qtopia") ) {
+        if(configs.findIndex("qtopialib") == -1)
+            configs.append("qtopialib");
+        if(configs.findIndex("qtopiainc") == -1)
+            configs.append("qtopiainc");
     }
-    if ( project->isActiveConfig("x11") ) {
-        if(configs.findIndex("x11lib") == -1)
-            configs.append("x11lib");
-        if(configs.findIndex("x11inc") == -1)
-            configs.append("x11inc");
+    if ( project->isActiveConfig("qtopiainc") )
+        project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+    if ( project->isActiveConfig("qtopialib") ) {
+        if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
+            project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QTOPIA", "-L", " -L", "");
+        project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
     }
     if ( project->isActiveConfig("qt") ) {
         if ( project->isActiveConfig("accessibility" ) )
@@ -163,19 +175,23 @@ UnixMakefileGenerator::init()
         if ( !project->isActiveConfig("debug") )
             project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
         if ( !is_qt ) {
-            if ( !project->isEmpty("QMAKE_LIBDIR_QT") ) {
-                if ( !project->isEmpty("QMAKE_RPATH") )
-                    project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"),
-                                                                          " " + var("QMAKE_RPATH"), "");
-                project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", "");
+            if ( !project->isEmpty("QMAKE_RPATH") ) {
+                if ( !project->isEmpty("QMAKE_RTLDIR_QT") )
+                    project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_RTLDIR_QT", " " + var("QMAKE_RPATH"),
+                                                                    " " + var("QMAKE_RPATH"), "");
+                else if ( !project->isEmpty("QMAKE_LIBDIR_QT") )
+                    project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"),
+                                                                    " " + var("QMAKE_RPATH"), "");
             }
-            if (project->isActiveConfig("thread") && !project->isEmpty("QMAKE_LIBS_QT_THREAD"))
+            if ( !project->isEmpty("QMAKE_LIBDIR_QT") )
+                project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", "");
+            if ( project->isActiveConfig("thread") && !project->isEmpty("QMAKE_LIBS_QT_THREAD") )
                 project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
             else
                 project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
         }
     }
-    if ( project->isActiveConfig("opengl") ) {
+    if ( project->isActiveConfig("opengl") && !project->isActiveConfig("dlopen_opengl")) {
         project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_OPENGL"];
         if(!project->isEmpty("QMAKE_LIBDIR_OPENGL"))
             project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_OPENGL", "-L", " -L", "");
@@ -184,8 +200,18 @@ UnixMakefileGenerator::init()
         else
             project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_OPENGL"];
     }
-    if(project->isActiveConfig("global_init_link_order"))
-        project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
+    if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) {
+        if(configs.findIndex("x11lib") == -1)
+            configs.append("x11lib");
+        if ( project->isActiveConfig("opengl") && configs.findIndex("x11inc") == -1 )
+            configs.append("x11inc");
+    }
+    if ( project->isActiveConfig("x11") ) {
+        if(configs.findIndex("x11lib") == -1)
+            configs.append("x11lib");
+        if(configs.findIndex("x11inc") == -1)
+            configs.append("x11inc");
+    }
     if ( project->isActiveConfig("x11inc") )
         project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_X11"];
     if ( project->isActiveConfig("x11lib") ) {
@@ -200,10 +226,14 @@ UnixMakefileGenerator::init()
     if ( project->isActiveConfig("thread") ) {
         if(project->isActiveConfig("qt"))
             project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_THREAD_SUPPORT");
-        if ( !project->isEmpty("QMAKE_CFLAGS_THREAD"))
+        if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) {
             project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
-        if( !project->isEmpty("QMAKE_CXXFLAGS_THREAD"))
+            project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
+        }
+        if( !project->isEmpty("QMAKE_CXXFLAGS_THREAD")) {
             project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+            project->variables()["PRL_EXPORT_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
+        }
         project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_THREAD"];
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_THREAD"];
         if(!project->isEmpty("QMAKE_LFLAGS_THREAD"))
@@ -211,24 +241,35 @@ UnixMakefileGenerator::init()
     }
     if ( project->isActiveConfig("moc") )
         setMocAware(TRUE);
-    if ( project->isEmpty("QMAKE_RUN_CC") )
-        project->variables()["QMAKE_RUN_CC"].append("$(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src");
-    if ( project->isEmpty("QMAKE_RUN_CC_IMP") )
-        project->variables()["QMAKE_RUN_CC_IMP"].append("$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<");
-    if ( project->isEmpty("QMAKE_RUN_CXX") )
-        project->variables()["QMAKE_RUN_CXX"].append("$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src");
-    if ( project->isEmpty("QMAKE_RUN_CXX_IMP") )
-        project->variables()["QMAKE_RUN_CXX_IMP"].append("$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<");
-    project->variables()["QMAKE_FILETAGS"] += QStringList::split("HEADERS SOURCES TARGET DESTDIR", " ");
-    if ( !project->isEmpty("PRECOMPH") ) {
-                initOutPaths(); // Need to fix MOC_DIR since we do this before init()
+    QString compile_flag = var("QMAKE_COMPILE_FLAG");
+    if(compile_flag.isEmpty())
+        compile_flag = "-c";
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
+        QString prefix_flags = project->first("QMAKE_CFLAGS_PREFIX_INCLUDE");
+        if(prefix_flags.isEmpty())
+            prefix_flags = "-include";
+        compile_flag += " " + prefix_flags + " " + project->first("QMAKE_ORIG_TARGET");
+    }
+    if(!project->isEmpty("ALLMOC_HEADER")) {
+                initOutPaths(); // Need to fix outdirs since we do this before init() (because we could add to SOURCES et al)
         QString allmoc = fileFixify(project->first("MOC_DIR") + "/allmoc.cpp", QDir::currentDirPath(), Option::output_dir);
         project->variables()["SOURCES"].prepend(allmoc);
         project->variables()["HEADERS_ORIG"] = project->variables()["HEADERS"];
         project->variables()["HEADERS"].clear();
     }
+    if ( project->isEmpty("QMAKE_RUN_CC") )
+        project->variables()["QMAKE_RUN_CC"].append("$(CC) " + compile_flag + " $(CFLAGS) $(INCPATH) -o $obj $src");
+    if ( project->isEmpty("QMAKE_RUN_CC_IMP") )
+        project->variables()["QMAKE_RUN_CC_IMP"].append("$(CC) " + compile_flag + " $(CFLAGS) $(INCPATH) -o $@ $<");
+    if ( project->isEmpty("QMAKE_RUN_CXX") )
+        project->variables()["QMAKE_RUN_CXX"].append("$(CXX) " + compile_flag + " $(CXXFLAGS) $(INCPATH) -o $obj $src");
+    if ( project->isEmpty("QMAKE_RUN_CXX_IMP") )
+        project->variables()["QMAKE_RUN_CXX_IMP"].append("$(CXX) " + compile_flag + " $(CXXFLAGS) $(INCPATH) -o $@ $<");
+    project->variables()["QMAKE_FILETAGS"] += QStringList::split("HEADERS SOURCES TARGET DESTDIR", " ");
     if( project->isActiveConfig("GNUmake") && !project->isEmpty("QMAKE_CFLAGS_DEPS"))
         include_deps = TRUE; //do not generate deps
+    if(project->isActiveConfig("compile_libtool"))
+        Option::obj_ext = ".lo"; //override the .o
 
     MakefileGenerator::init();
     if ( project->isActiveConfig("resource_fork") && !project->isActiveConfig("console")) {
@@ -240,10 +281,12 @@ UnixMakefileGenerator::init()
             project->variables()["QMAKE_PKGINFO"].append(project->first("DESTDIR") + "../PkgInfo");
             project->variables()["ALL_DEPS"] += project->first("QMAKE_PKGINFO");
 
-            QString plist = specdir() + QDir::separator() + "Info.plist." +
-                            project->first("TEMPLATE");
+            QString plist = fileFixify(project->first("QMAKE_INFO_PLIST"));
+            if(plist.isEmpty())
+                plist = specdir() + QDir::separator() + "Info.plist." + project->first("TEMPLATE");
             if(QFile::exists(Option::fixPathToLocalOS(plist))) {
-                project->variables()["QMAKE_INFO_PLIST"].append(plist);
+                if(project->isEmpty("QMAKE_INFO_PLIST"))
+                    project->variables()["QMAKE_INFO_PLIST"].append(plist);
                 project->variables()["QMAKE_INFO_PLIST_OUT"].append(project->first("DESTDIR") +
                                                                     "../Info.plist");
                 project->variables()["ALL_DEPS"] += project->first("QMAKE_INFO_PLIST_OUT");
@@ -283,49 +326,105 @@ UnixMakefileGenerator::init()
             project->variables()["QMAKE_INTERNAL_PRL_LIBS"] << "QMAKE_AR_SUBLIBS";
         }
     }
+
+    if(project->isActiveConfig("compile_libtool")) {
+        const QString libtoolify[] = { "QMAKE_RUN_CC", "QMAKE_RUN_CC_IMP",
+                                       "QMAKE_RUN_CXX", "QMAKE_RUN_CXX_IMP",
+                                       "QMAKE_LINK_THREAD", "QMAKE_LINK", "QMAKE_AR_CMD", "QMAKE_LINK_SHLIB_CMD",
+                                       QString::null };
+        for(int i = 0; !libtoolify[i].isNull(); i++) {
+            QStringList &l = project->variables()[libtoolify[i]];
+            if(!l.isEmpty()) {
+                QString libtool_flags, comp_flags;
+                if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
+                    libtool_flags += " --mode=link";
+                    if(project->isActiveConfig("staticlib")) {
+                        libtool_flags += " -static";
+                    } else {
+                        if(!project->isEmpty("QMAKE_LIB_FLAG")) {
+                            int maj = project->first("VER_MAJ").toInt();
+                            int min = project->first("VER_MIN").toInt();
+                            int pat = project->first("VER_PAT").toInt();
+                            comp_flags += " -version-info " + QString::number(10*maj + min) +
+                                          ":" + QString::number(pat) + ":0";
+                            if(libtoolify[i] != "QMAKE_AR_CMD") {
+                                QString rpath = Option::output_dir;
+                                if(!project->isEmpty("DESTDIR")) {
+                                    rpath = project->first("DESTDIR");
+                                    if(QDir::isRelativePath(rpath))
+                                        rpath.prepend(Option::output_dir + Option::dir_sep);
+                                }
+                                comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, FALSE);
+                            }
+                        }
+                    }
+                    if(project->isActiveConfig("plugin"))
+                        libtool_flags += " -module";
+                } else {
+                    libtool_flags += " --mode=compile";
+                }
+                l.first().prepend("$(LIBTOOL)" + libtool_flags + " ");
+                if(!comp_flags.isEmpty())
+                    l.first() += comp_flags;
+            }
+        }
+    }
 }
 
 QStringList
-UnixMakefileGenerator::uniqueSetLFlags(const QStringList &list1, QStringList &list2)
+UnixMakefileGenerator::combineSetLFlags(const QStringList &list1, const QStringList &list2)
 {
+    if(project->isActiveConfig("no_smart_library_merge"))
+        return list1 + list2;
+
     QStringList ret;
-    for(QStringList::ConstIterator it = list1.begin(); it != list1.end(); ++it) {
-        bool unique = TRUE;
-        if((*it).startsWith("-")) {
-            if((*it).startsWith("-l") || (*it).startsWith("-L")) {
-                unique = list2.findIndex((*it)) == -1;
-            } else if(project->isActiveConfig("macx") && (*it).startsWith("-framework")) {
-                int as_one = TRUE;
-                QString framework_in;
-                if((*it).length() > 11) {
-                    framework_in = (*it).mid(11);
-                } else {
-                    if(it != list1.end()) {
-                        ++it;
-                        as_one = FALSE;
-                        framework_in = (*it);
+    for(int i = 0; i < 2; i++) {
+        const QStringList *lst = i ? &list2 : &list1;
+        for(QStringList::ConstIterator it = lst->begin(); it != lst->end(); ++it) {
+            if((*it).startsWith("-")) {
+                if((*it).startsWith("-L")) {
+                    if(ret.findIndex((*it)) == -1)
+                        ret.append((*it));
+                } else if((*it).startsWith("-l")) {
+                    while(1) {
+                        QStringList::Iterator idx = ret.find((*it));
+                        if(idx == ret.end())
+                            break;
+                        ret.remove(idx);
                     }
-                }
-                if(!framework_in.isEmpty()) {
-                    for(QStringList::ConstIterator outit = list2.begin(); outit != list2.end(); ++outit) {
-                        if((*outit).startsWith("-framework")) {
-                            QString framework_out;
-                            if((*outit).length() > 11) {
-                                framework_out = (*outit).mid(11);
-                            } else {
-                                if(it != list2.end()) {
-                                    ++outit;
-                                    framework_out = (*outit);
+                    ret.append((*it));
+                } else if(project->isActiveConfig("macx") && (*it).startsWith("-framework")) {
+                    int as_one = TRUE;
+                    QString framework_in;
+                    if((*it).length() > 11) {
+                        framework_in = (*it).mid(11);
+                    } else {
+                        if(it != lst->end()) {
+                            ++it;
+                            as_one = FALSE;
+                            framework_in = (*it);
+                        }
+                    }
+                    if(!framework_in.isEmpty()) {
+                        for(QStringList::Iterator outit = ret.begin(); outit != ret.end(); ++outit) {
+                            if((*outit).startsWith("-framework")) {
+                                int found = 0;
+                                if((*outit).length() > 11) {
+                                    if(framework_in == (*outit).mid(11))
+                                        found = 1;
+                                } else {
+                                    if(it != lst->end()) {
+                                        ++outit;
+                                        if(framework_in == (*outit)) {
+                                            --outit;
+                                            found = 2;
+                                        }
+                                    }
                                 }
-                            }
-                            if(framework_out == framework_in) {
-                                unique = FALSE;
-                                break;
+                                for(int i = 0; i < found; i++)
+                                    outit = ret.remove(outit);
                             }
                         }
-                    }
-                    if(unique) {
-                        unique = FALSE; //because I'm about to just insert it myself
                         if(as_one) {
                             ret.append("-framework " + framework_in);
                         } else {
@@ -333,29 +432,107 @@ UnixMakefileGenerator::uniqueSetLFlags(const QStringList &list1, QStringList &li
                             ret.append(framework_in);
                         }
                     }
+                } else {
+#if 1
+                    while(1) {
+                        QStringList::Iterator idx = ret.find((*it));
+                        if(idx == ret.end())
+                            break;
+                        ret.remove(idx);
+                    }
+#endif
+                    ret.append((*it));
                 }
-            } else {
-                unique = (list2.findIndex((*it)) == -1);
+            } else /*if(QFile::exists((*it)))*/ {
+                while(1) {
+                    QStringList::Iterator idx = ret.find((*it));
+                    if(idx == ret.end())
+                        break;
+                    ret.remove(idx);
+                }
+                ret.append((*it));
             }
-        } else if(QFile::exists((*it))) {
-            unique = (list2.findIndex((*it)) == -1);
         }
-        if(unique)
-            ret.append((*it));
     }
     return ret;
 }
 
-
 void
 UnixMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
 {
     if(var == "QMAKE_PRL_LIBS")
-        project->variables()["QMAKE_CURRENT_PRL_LIBS"] += uniqueSetLFlags(l, project->variables()["QMAKE_LIBS"]);
+        project->variables()["QMAKE_CURRENT_PRL_LIBS"] = combineSetLFlags(project->variables()["QMAKE_CURRENT_PRL_LIBS"] +
+                                                                          project->variables()["QMAKE_LIBS"], l);
     else
         MakefileGenerator::processPrlVariable(var, l);
 }
 
+QString
+UnixMakefileGenerator::findDependency(const QString &dep)
+{
+    QStringList::Iterator it;
+    {
+        QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+        for(it = qut.begin(); it != qut.end(); ++it) {
+            QString targ = var((*it) + ".target");
+            if(targ.isEmpty())
+                targ = (*it);
+            if(targ.endsWith(dep))
+                return targ;
+        }
+    }
+    {
+        QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+        for(it = quc.begin(); it != quc.end(); ++it) {
+            QString tmp_out = project->variables()[(*it) + ".output"].first();
+            QString tmp_cmd = project->variables()[(*it) + ".commands"].join(" ");
+            if(tmp_out.isEmpty() || tmp_cmd.isEmpty())
+                continue;
+            QStringList &tmp = project->variables()[(*it) + ".input"];
+            for(QStringList::Iterator it2 = tmp.begin(); it2 != tmp.end(); ++it2) {
+                QStringList &inputs = project->variables()[(*it2)];
+                for(QStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) {
+                    QString out = tmp_out;
+                    QFileInfo fi(Option::fixPathToLocalOS((*input)));
+                    out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+                    out.replace("${QMAKE_FILE_NAME}", fi.fileName());
+                    if(out.endsWith(dep))
+                        return out;
+                }
+            }
+        }
+    }
+    return MakefileGenerator::findDependency(dep);
+}
+
+QStringList
+&UnixMakefileGenerator::findDependencies(const QString &file)
+{
+    QStringList &ret = MakefileGenerator::findDependencies(file);
+    // Note: The QMAKE_IMAGE_COLLECTION file have all images
+    // as dependency, so don't add precompiled header then
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")
+       && file != project->first("QMAKE_IMAGE_COLLECTION")) {
+        QString header_prefix = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep;
+        header_prefix += project->first("QMAKE_PRECOMP_PREFIX");
+        if(file.endsWith(".c")) {
+            QString precomp_h = header_prefix + "c";
+            if(!ret.contains(precomp_h))
+                ret += precomp_h;
+        } else {
+            for(QStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) {
+                if(file.endsWith(*it)) {
+                    QString precomp_h = header_prefix + "c++";
+                    if(!ret.contains(precomp_h))
+                        ret += precomp_h;
+                    break;
+                }
+            }
+        }
+    }
+    return ret;
+}
+
 bool
 UnixMakefileGenerator::findLibraries()
 {
@@ -400,7 +577,7 @@ UnixMakefileGenerator::findLibraries()
                 }
             }
             if(!stub.isEmpty()) {
-                const QString modifs[] = { "-mt", QString::null };
+                const QString modifs[] = { "", "-mt", QString::null };
                 for(int modif = 0; !modifs[modif].isNull(); modif++) {
                     bool found = FALSE;
                     QStringList extens;
@@ -431,8 +608,18 @@ UnixMakefileGenerator::findLibraries()
                             }
                         }
                     }
+                    if(!found && project->isActiveConfig("compile_libtool")) {
+                        for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
+                            if(QFile::exists(mdd->local_dir + Option::dir_sep + "lib" + stub + modifs[modif] + Option::libtool_ext)) {
+                                (*it) = mdd->real_dir + Option::dir_sep + "lib" + stub + modifs[modif] + Option::libtool_ext;
+                                found = TRUE;
+                                break;
+                            }
+                        }
+                    }
                     if(found)
                         break;
+
                 }
             }
         }
@@ -440,6 +627,14 @@ UnixMakefileGenerator::findLibraries()
     return FALSE;
 }
 
+QString linkLib(const QString &file, const QString &libName) {
+  QString ret;
+  QRegExp reg("^.*lib(" + libName + "[^./=]*).*$");
+  if(reg.exactMatch(file))
+    ret = "-l" + reg.cap(1);
+  return ret;
+}
+
 void
 UnixMakefileGenerator::processPrlFiles()
 {
@@ -453,7 +648,7 @@ UnixMakefileGenerator::processPrlFiles()
             QStringList &l = project->variables()[lflags[i]];
             for(QStringList::Iterator it = l.begin(); it != l.end(); ++it) {
                 project->variables()["QMAKE_CURRENT_PRL_LIBS"].clear();
-                QString opt = (*it).stripWhiteSpace();;
+                QString opt = (*it).stripWhiteSpace();
                 if(opt.startsWith("-")) {
                     if(opt.startsWith("-L")) {
                         QString r = opt.right(opt.length() - 2), l = r;
@@ -461,16 +656,22 @@ UnixMakefileGenerator::processPrlFiles()
                         libdirs.append(new MakefileDependDir(r.replace("\"",""),
                                                              l.replace("\"","")));
                     } else if(opt.startsWith("-l") && !processed[opt]) {
-                        QString lib = opt.right(opt.length() - 2), prl;
+                        QString lib = opt.right(opt.length() - 2);
                         for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) {
-                            prl = mdd->local_dir + Option::dir_sep + "lib" + lib + Option::prl_ext;
+                            if(!project->isActiveConfig("compile_libtool")) { //give them the .libs..
+                                QString la = mdd->local_dir + Option::dir_sep + "lib" + lib + Option::libtool_ext;
+                                if(QFile::exists(la) && QFile::exists(mdd->local_dir + Option::dir_sep + ".libs")) {
+                                    l_out.append("-L" + mdd->real_dir + Option::dir_sep + ".libs");
+                                    libdirs.append(new MakefileDependDir(mdd->real_dir +  Option::dir_sep + ".libs",
+                                                                         mdd->local_dir + Option::dir_sep + ".libs"));
+                                }
+                            }
+
+                            QString prl = mdd->local_dir + Option::dir_sep + "lib" + lib;
                             if(processPrlFile(prl)) {
                                 if(prl.startsWith(mdd->local_dir))
                                     prl.replace(0, mdd->local_dir.length(), mdd->real_dir);
-                                QRegExp reg("^.*lib(" + lib + "[^./=]*)\\..*$");
-                                if(reg.exactMatch(prl))
-                                    prl = "-l" + reg.cap(1);
-                                opt = prl;
+                                opt = linkLib(prl, lib);
                                 processed.insert(opt, (void*)1);
                                 ret = TRUE;
                                 break;
@@ -484,22 +685,27 @@ UnixMakefileGenerator::processPrlFiles()
                             opt = (*it);
                         }
                         QString prl = "/System/Library/Frameworks/" + opt +
-                                      ".framework/" + opt + Option::prl_ext;
+                                      ".framework/" + opt;
                         if(processPrlFile(prl))
                             ret = TRUE;
                         l_out.append("-framework");
                     }
                     if(!opt.isEmpty())
                         l_out.append(opt);
-                    l_out += uniqueSetLFlags(project->variables()["QMAKE_CURRENT_PRL_LIBS"], l_out);
+                    l_out = combineSetLFlags(l_out, project->variables()["QMAKE_CURRENT_PRL_LIBS"]);
                 } else {
-                    if(!processed[opt] && processPrlFile(opt)) {
-                        processed.insert(opt, (void*)1);
-                        ret = TRUE;
+                    QString lib = opt;
+                    if(!processed[lib] && processPrlFile(lib)) {
+                      processed.insert(lib, (void*)1);
+                      ret = TRUE;
                     }
+#if 0
+                    if(ret)
+                      opt = linkLib(lib, "");
+#endif
                     if(!opt.isEmpty())
-                        l_out.append(opt);
-                    l_out += uniqueSetLFlags(project->variables()["QMAKE_CURRENT_PRL_LIBS"], l_out);
+                      l_out.append(opt);
+                    l_out = combineSetLFlags(l_out, project->variables()["QMAKE_CURRENT_PRL_LIBS"]);
                 }
             }
             if(ret && l != l_out)
@@ -537,17 +743,65 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
             resource = TRUE;
         }
     } else if(project->first("TEMPLATE") == "lib") {
-        if(project->isActiveConfig("create_prl") && !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
+        if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") &&
+           !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
             QString dst_prl = project->first("QMAKE_INTERNAL_PRL_FILE");
             int slsh = dst_prl.findRev('/');
             if(slsh != -1)
                 dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
             dst_prl = root + targetdir + dst_prl;
-            ret += "-$(COPY) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
+            ret += "-$(INSTALL_FILE) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
             uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");
         }
+        if(project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool")) {
+            QString src_lt = var("QMAKE_ORIG_TARGET");
+            int slsh = src_lt.findRev(Option::dir_sep);
+            if(slsh != -1)
+                src_lt = src_lt.right(src_lt.length() - slsh);
+            int dot = src_lt.find('.');
+            if(dot != -1)
+                src_lt = src_lt.left(dot);
+            src_lt += Option::libtool_ext;
+            src_lt.prepend("lib");
+            QString dst_lt = root + targetdir + src_lt;
+            if(!project->isEmpty("DESTDIR")) {
+                src_lt.prepend(var("DESTDIR"));
+                src_lt = Option::fixPathToLocalOS(fileFixify(src_lt,
+                                                             QDir::currentDirPath(), Option::output_dir));
+            }
+            if(!ret.isEmpty())
+                ret += "\n\t";
+            ret += "-$(INSTALL_FILE) \"" + src_lt + "\" \"" + dst_lt + "\"";
+            if(!uninst.isEmpty())
+                uninst.append("\n\t");
+            uninst.append("-$(DEL_FILE) \"" + dst_lt + "\"");
+        }
+        if(project->isActiveConfig("create_pc")) {
+            QString src_pc = var("QMAKE_ORIG_TARGET");
+            int slsh = src_pc.findRev(Option::dir_sep);
+            if(slsh != -1)
+                src_pc = src_pc.right(src_pc.length() - slsh);
+            int dot = src_pc.find('.');
+            if(dot != -1)
+                src_pc = src_pc.left(dot);
+            src_pc += ".pc";
+            QString d = root + targetdir + "pkgconfig" + Option::dir_sep;
+            QString dst_pc = d + src_pc;
+            if(!project->isEmpty("DESTDIR")) {
+                src_pc.prepend(var("DESTDIR"));
+                src_pc = Option::fixPathToLocalOS(fileFixify(src_pc,
+                                                             QDir::currentDirPath(), Option::output_dir));
+            }
+            if(!ret.isEmpty())
+                ret += "\n\t";
+            ret += mkdir_p_asstring(d) + "\n\t";
+            ret += "-$(INSTALL_FILE) \"" + src_pc + "\" \"" + dst_pc + "\"";
+            if(!uninst.isEmpty())
+                uninst.append("\n\t");
+            uninst.append("-$(DEL_FILE) \"" + dst_pc + "\"");
+        }
         if ( project->isEmpty("QMAKE_CYGWIN_SHLIB") ) {
             if ( !project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin") ) {
                 if ( project->isEmpty("QMAKE_HPUX_SHLIB") ) {
@@ -558,47 +812,66 @@ UnixMakefileGenerator::defaultInstall(const QString &t)
             }
         }
     }
-    QString src_targ = target;
-    if(!destdir.isEmpty())
-        src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
-    QString dst_targ = root + fileFixify(targetdir + target);
-    if(!ret.isEmpty())
-        ret += "\n\t";
-    ret += QString(resource ? "-$(COPY_DIR)" : "-$(COPY)") + " \"" +
-           src_targ + "\" \"" + dst_targ + "\"";
-    if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP")) {
-        ret += "\n\t-" + var("QMAKE_STRIP");
-        if(!project->isEmpty("QMAKE_STRIPFLAGS_LIB") && project->first("TEMPLATE") == "lib")
-            ret += " " + var("QMAKE_STRIPFLAGS_LIB");
+
+    if(!resource && project->isActiveConfig("compile_libtool")) {
+        QString src_targ = target;
+        if(src_targ == "$(TARGET)")
+            src_targ = "$(TARGETL)";
+        QString dst_dir = fileFixify(targetdir);
+        if(QDir::isRelativePath(dst_dir))
+            dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir);
+        ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + root + dst_dir + "\"";
+        uninst.append("-$(LIBTOOL) --mode=uninstall \"" + src_targ + "\"");
+    } else {
+        QString src_targ = target;
+        if(!destdir.isEmpty())
+            src_targ = Option::fixPathToTargetOS(destdir + target, FALSE);
+        QString dst_targ = root + fileFixify(targetdir + target, 
+                                             QDir::currentDirPath(), Option::output_dir);
+        if(!ret.isEmpty())
+            ret += "\n\t";
         if(resource)
-            ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
+            ret += "$(DEL_FILE) -r \"" + dst_targ + "\"" + "\n\t";
+        if(!ret.isEmpty())
+            ret += "\n\t";
+        ret += QString(resource ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
+               src_targ + "\" \"" + dst_targ + "\"";
+        if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP") &&
+           (project->first("TEMPLATE") != "lib" || !project->isActiveConfig("staticlib"))) {
+            ret += "\n\t-" + var("QMAKE_STRIP");
+            if(project->first("TEMPLATE") == "lib" && !project->isEmpty("QMAKE_STRIPFLAGS_LIB"))
+                ret += " " + var("QMAKE_STRIPFLAGS_LIB");
+            else if(project->first("TEMPLATE") == "app" && !project->isEmpty("QMAKE_STRIPFLAGS_APP"))
+                ret += " " + var("QMAKE_STRIPFLAGS_APP");
+            if(resource)
+                ret = " \"" + dst_targ + "/Contents/MacOS/$(QMAKE_TARGET)\"";
+            else
+                ret += " \"" + dst_targ + "\"";
+        }
+        if(!uninst.isEmpty())
+            uninst.append("\n\t");
+        if(resource)
+            uninst.append("-$(DEL_FILE) -r \"" + dst_targ + "\"");
         else
-            ret += " \"" + dst_targ + "\"";
-    }
-    if(!uninst.isEmpty())
-        uninst.append("\n\t");
-    if(resource)
-        uninst.append("-$(DEL_FILE) -r \"" + dst_targ + "\"");
-    else
-        uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
-    if(!links.isEmpty()) {
-        for(QStringList::Iterator it = links.begin(); it != links.end(); it++) {
-            if(Option::target_mode == Option::TARG_WIN_MODE ||
-               Option::target_mode == Option::TARG_MAC9_MODE) {
-            } else if(Option::target_mode == Option::TARG_UNIX_MODE ||
-                      Option::target_mode == Option::TARG_MACX_MODE) {
-                QString link = Option::fixPathToTargetOS(destdir + (*it), FALSE);
-                int lslash = link.findRev(Option::dir_sep);
-                if(lslash != -1)
-                    link = link.right(link.length() - (lslash + 1));
-                QString dst_link = root + fileFixify(targetdir + link);
-                ret += "\n\t-$(SYMLINK) \"$(TARGET)\" \"" + dst_link + "\"";
-                if(!uninst.isEmpty())
-                    uninst.append("\n\t");
-                uninst.append("-$(DEL_FILE) \"" + dst_link + "\"");
+            uninst.append("-$(DEL_FILE) \"" + dst_targ + "\"");
+        if(!links.isEmpty()) {
+            for(QStringList::Iterator it = links.begin(); it != links.end(); it++) {
+                if(Option::target_mode == Option::TARG_WIN_MODE ||
+                   Option::target_mode == Option::TARG_MAC9_MODE) {
+                } else if(Option::target_mode == Option::TARG_UNIX_MODE ||
+                          Option::target_mode == Option::TARG_MACX_MODE) {
+                    QString link = Option::fixPathToTargetOS(destdir + (*it), FALSE);
+                    int lslash = link.findRev(Option::dir_sep);
+                    if(lslash != -1)
+                        link = link.right(link.length() - (lslash + 1));
+                    QString dst_link = root + targetdir + link;
+                    ret += "\n\t-$(SYMLINK) \"$(TARGET)\" \"" + dst_link + "\"";
+                    if(!uninst.isEmpty())
+                        uninst.append("\n\t");
+                    uninst.append("-$(DEL_FILE) \"" + dst_link + "\"");
+                }
             }
         }
     }
     return ret;
 }
-