From 323e9a7472a110b4befba7320540263147505bae Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Thu, 15 Jul 2004 17:36:57 +0000
Subject: Manually updatet to qmake1.06a which includes support for precompiled

headers.
Opies 'PRO' keyword was already reintroduced
---
(limited to 'qmake/generators/unix')

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;
 }
-
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 3d00214..91ec3b1 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -1,13 +1,11 @@
 /****************************************************************************
-** $Id$
+** 
 **
-** Definition of ________ class.
+** Definition of UnixMakefileGenerator class.
 **
-** Created : 970521
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
-** Copyright (C) 1992-2000 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
@@ -34,6 +32,7 @@
 ** not clear to you.
 **
 **********************************************************************/
+
 #ifndef __UNIXMAKE_H__
 #define __UNIXMAKE_H__
 
@@ -43,19 +42,30 @@ class UnixMakefileGenerator : public MakefileGenerator
 {
     bool init_flag, include_deps;
     bool writeMakefile(QTextStream &);
-    QStringList uniqueSetLFlags(const QStringList &list1, QStringList &list2);
+    void writeExtraVariables(QTextStream &);
+    QString libtoolFileName();
+    void writeLibtoolFile();     // for libtool
+    QString pkgConfigPrefix() const;
+    QString pkgConfigFileName();
+    QString pkgConfigFixPath(QString) const;
+    void writePkgConfigFile();   // for pkg-config
+    QStringList combineSetLFlags(const QStringList &list1, const QStringList &list2);
+    void writePrlFile(QTextStream &);
 
 public:
     UnixMakefileGenerator(QMakeProject *p);
     ~UnixMakefileGenerator();
 
 protected:
+    virtual bool doPrecompiledHeaders() const { return project->isActiveConfig("precompile_header"); }
     virtual bool doDepends() const { return !include_deps && MakefileGenerator::doDepends(); }
     virtual QString defaultInstall(const QString &);
     virtual void processPrlVariable(const QString &, const QStringList &);
     virtual void processPrlFiles();
 
     virtual bool findLibraries();
+    virtual QString findDependency(const QString &);
+    virtual QStringList &findDependencies(const QString &);
     virtual void init();
 
     void writeMakeParts(QTextStream &);
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index d8a4a0d..21348a6 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -1,13 +1,11 @@
 /****************************************************************************
-** $Id$
 **
-** Definition of ________ class.
 **
-** Created : 970521
+** Implementation of UnixMakefileGenerator class.
 **
-** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
+** 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
@@ -37,23 +35,49 @@
 
 #include "unixmake.h"
 #include "option.h"
+#include "meta.h"
 #include <qregexp.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <time.h>
 
+QString mkdir_p_asstring(const QString &dir);
 
 UnixMakefileGenerator::UnixMakefileGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE), include_deps(FALSE)
 {
 
 }
 
+void
+UnixMakefileGenerator::writePrlFile(QTextStream &t)
+{
+    MakefileGenerator::writePrlFile(t);
+    // libtool support
+    if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib") { //write .la
+	if(project->isActiveConfig("compile_libtool"))
+	    warn_msg(WarnLogic, "create_libtool specified with compile_libtool can lead to conflicting .la\n"
+		     "formats, create_libtool has been disabled\n");
+	else
+	    writeLibtoolFile();
+    }
+    // pkg-config support
+    if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib")
+	writePkgConfigFile();
+}
+
 bool
 UnixMakefileGenerator::writeMakefile(QTextStream &t)
 {
+
     writeHeader(t);
     if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
-	t << "all clean:" << "\n\t"
+	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
+	{ //write the extra unix targets..
+	    QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+	    for(QStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
+		t << *it << " ";
+	}
+	t << "all clean install distclean mocables uninstall uicables:" << "\n\t"
 	  << "@echo \"Some of the required modules ("
 	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
@@ -73,13 +97,35 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
 }
 
 void
+UnixMakefileGenerator::writeExtraVariables(QTextStream &t)
+{
+    bool first = TRUE;
+    QMap<QString, QStringList> &vars = project->variables();
+    QStringList &exports = project->variables()["QMAKE_EXTRA_UNIX_VARIABLES"];
+    for(QMap<QString, QStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) {
+	for(QStringList::Iterator exp_it = exports.begin(); exp_it != exports.end(); ++exp_it) {
+	    QRegExp rx((*exp_it), FALSE, TRUE);
+	    if(rx.exactMatch(it.key())) {
+		if(first) {
+		    t << "\n####### Custom Variables" << endl;
+		    first = FALSE;
+		}
+		t << "EXPORT_" << it.key() << " = " << it.data().join(" ") << endl;
+	    }
+	}
+    }
+    if(!first)
+	t << endl;
+}
+
+void
 UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 {
-    QString deps = fileFixify(Option::output.name()), prl;
+    QString deps = fileFixify(Option::output.name()), target_deps, 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;
 
     t << "####### Compiler, tools and options" << endl << endl;
@@ -135,9 +181,14 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
     t << "TAR      = "	<< var("QMAKE_TAR") << endl;
     t << "GZIP     = " << var("QMAKE_GZIP") << endl;
+    if(project->isActiveConfig("compile_libtool"))
+	t << "LIBTOOL	= " << var("QMAKE_LIBTOOL") << endl;
     t << "COPY     = " << var("QMAKE_COPY") << endl;
     t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl;
     t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_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;
@@ -220,9 +271,25 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     }
     if(do_incremental && !moc_incremental && !src_incremental)
 	do_incremental = FALSE;
+    if(!project->isEmpty("QMAKE_EXTRA_UNIX_COMPILERS")) {
+	t << "OBJCOMP = " << varList("OBJCOMP") << endl;
+	target_deps += " $(OBJCOMP)";
+
+	QStringList &comps = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+	for(QStringList::Iterator compit = comps.begin(); compit != comps.end(); ++compit) {
+	    QStringList &vars = project->variables()[(*compit) + ".variables"];
+	    for(QStringList::Iterator varit = vars.begin(); varit != vars.end(); ++varit) {
+		QStringList vals = project->variables()[(*varit)];
+		if(!vals.isEmpty())
+		    t << "QMAKE_COMP_" << (*varit) << " = " << valList(vals) << endl;
+	    }
+	}
+    }
     t << "DIST	   = " << valList(fileFixify(project->variables()["DISTFILES"])) << endl;
     t << "QMAKE_TARGET = " << var("QMAKE_ORIG_TARGET") << endl;
     t << "DESTDIR  = " << var("DESTDIR") << endl;
+    if(project->isActiveConfig("compile_libtool"))
+	t << "TARGETL	= " << var("TARGET_la") << endl;
     t << "TARGET   = " << var("TARGET") << endl;
     if(project->isActiveConfig("plugin") ) {
 	t << "TARGETD   = " << var("TARGET") << endl;
@@ -238,9 +305,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    t << "TARGET0	= " << var("TARGET_") << endl;
 	}
     }
+    writeExtraVariables(t);
     t << endl;
 
-    // blasted incldues
+    // blasted includes
     QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
     QStringList::Iterator it;
     for( it = qeui.begin(); it != qeui.end(); ++it)
@@ -249,14 +317,14 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     /* rules */
     t << "first: all" << endl;
     t << "####### Implicit rules" << endl << endl;
-    t << ".SUFFIXES: .c";
+    t << ".SUFFIXES: .c " << Option::obj_ext;
     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;
+	t << (*cppit) << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CXX_IMP") << endl << endl;
+    t << ".c" << Option::obj_ext << ":\n\t" << var("QMAKE_RUN_CC_IMP") << endl << endl;
 
     if(include_deps) {
 	QString cmd=var("QMAKE_CFLAGS_DEPS") + " ";
@@ -278,7 +346,6 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &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]];
@@ -298,10 +365,10 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		    }
 		    if(!d_file.isEmpty()) {
 			d_file = odir + ".deps/" + d_file + ".d";
-			QStringList deps = findDependencies((*it)).grep(QRegExp(Option::moc_ext + "$"));
+			QStringList deps = findDependencies((*it)).grep(QRegExp(Option::cpp_moc_ext + "$"));
 			if(!deps.isEmpty())
 			    t << d_file << ": " << deps.join(" ") << endl;
-			t << "-include " << d_file << endl;
+			t << var("QMAKE_CFLAGS_USE_PRECOMPILE") << " " << d_file << endl;
 		    }
 		}
 	    }
@@ -323,17 +390,17 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	QStringList &l = project->variables()["QMAKE_PRL_INTERNAL_FILES"];
 	QStringList::Iterator it;
 	for(it = l.begin(); it != l.end(); ++it) {
-	    QMakeProject proj;
-	    if(proj.read((*it), QDir::currentDirPath()) && !proj.isEmpty("QMAKE_PRL_BUILD_DIR")) {
+	    QMakeMetaInfo libinfo;
+	    if(libinfo.readLib((*it)) && !libinfo.isEmpty("QMAKE_PRL_BUILD_DIR")) {
 		QString dir;
 		int slsh = (*it).findRev(Option::dir_sep);
 		if(slsh != -1)
 		    dir = (*it).left(slsh + 1);
-		QString targ = dir + proj.first("QMAKE_PRL_TARGET");
+		QString targ = dir + libinfo.first("QMAKE_PRL_TARGET");
 		deps += " " + targ;
 		t << targ << ":" << "\n\t"
 		  << "@echo \"Creating '" << targ << "'\"" << "\n\t"
-		  << "(cd " << proj.first("QMAKE_PRL_BUILD_DIR") << ";"
+		  << "(cd " << libinfo.first("QMAKE_PRL_BUILD_DIR") << ";"
 		  << "$(MAKE) )" << endl;
 	    }
 	}
@@ -392,13 +459,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	      << endl << endl;
 
 	    //real target
-	    t << var("TARGET") << ": " << var("PRE_TARGETDEPS") << " " << incr_deps 
+	    t << var("TARGET") << ": " << var("PRE_TARGETDEPS") << " " << incr_deps << " " << target_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)";
+	    t << "$(LINK) $(LFLAGS) -o $(TARGET) " << incr_deps << " " << incr_objs << " $(OBJCOMP) $(LIBS)";
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK");
 	    t << endl << endl;
@@ -406,13 +473,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    t << "all: " << deps <<  " " << varGlue("ALL_DEPS",""," "," ") <<  "$(TARGET)"
 	      << endl << endl;
 
-	    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " 
-	      << var("POST_TARGETDEPS") << "\n\t";
+	    t << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) "
+	      << target_deps << " " << 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)";
+	    t << "$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(OBJCOMP) $(LIBS)";
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK");
 	    t << endl << endl;
@@ -468,20 +535,24 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	      << " " <<  var("DESTDIR_TARGET") << endl << endl;
 
 	    //real target
-	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") << " " 
-	      << incr_deps << " $(SUBLIBS) " << var("POST_TARGETDEPS");
+	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") << " "
+	      << incr_deps << " $(SUBLIBS) " << target_deps << " " << var("POST_TARGETDEPS");
 	} else {
 	    t << "all: " << deps << " " << varGlue("ALL_DEPS",""," ","") << " " <<
 		var("DESTDIR_TARGET") << endl << endl;
-	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS") 
-	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) " << var("POST_TARGETDEPS");
+	    t << var("DESTDIR_TARGET") << ": " << var("PRE_TARGETDEPS")
+	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS) $(OBJCOMP) " << target_deps
+	      << " " << 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")) {
+	if(project->isActiveConfig("compile_libtool")) {
+	    t << "\n\t"
+	      << var("QMAKE_LINK_SHLIB_CMD");
+	} else if(project->isActiveConfig("plugin")) {
 	    t << "\n\t"
 	      << "-$(DEL_FILE) $(TARGET)" << "\n\t"
 	      << var("QMAKE_LINK_SHLIB_CMD");
@@ -526,7 +597,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 
 	if (! project->isActiveConfig("plugin")) {
 	    t << "staticlib: $(TARGETA)" << endl << endl;
-	    t << "$(TARGETA): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC)";
+	    t << "$(TARGETA): " << var("PRE_TARGETDEPS") << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP)";
 	    if(do_incremental)
 		t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
 	    t << var("POST_TARGETDEPS") << "\n\t"
@@ -539,12 +610,12 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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): " << var("PRE_TARGETDEPS") 
-	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) " << var("POST_TARGETDEPS") << "\n\t";
+	    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS")
+	      << " $(UICDECLS) $(OBJECTS) $(OBJMOC) $(OBJCOMP) " << var("POST_TARGETDEPS") << "\n\t";
 	    if(!project->isEmpty("DESTDIR")) {
 		QString destdir = project->first("DESTDIR");
 		t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
@@ -555,25 +626,26 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		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 max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
-	    QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"],
+	    QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"] +
+			       project->variables()["OBJCOMP"],
 			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(int 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): " << var("PRE_TARGETDEPS") 
+		    t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS")
 		      << " $(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";
@@ -589,7 +661,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		    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";
 	    }
@@ -597,21 +669,44 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	t << endl << endl;
     }
 
-    t << "mocables: $(SRCMOC)" << endl << endl;
+    t << "mocables: $(SRCMOC)" << endl
+      << "uicables: $(UICDECLS) $(UICIMPLS)" << 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 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");
+	QString moc = project->first("QMAKE_MOC"), target = project->first("TARGET"),
+	    moc_dir = "$(QTDIR)/src/moc";
+	if(!project->isEmpty("QMAKE_MOC_SRC"))
+	    moc_dir = project->first("QMAKE_MOC_SRC");
 	fixEnvVariables(target);
 	fixEnvVariables(moc);
-	if(target != moc) 
+	if(target != moc)
 	    t << "$(MOC): \n\t"
-	      << "( cd $(QTDIR)/src/moc ; $(MAKE) )"  << endl << endl;
+	      << "( cd " << moc_dir << " && $(MAKE) )"  << endl << endl;
     }
 
     writeMakeQmake(t);
+    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) {
+	QString meta_files;
+	if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" &&
+	   !project->isActiveConfig("compile_libtool")) { //libtool
+	    if(!meta_files.isEmpty())
+		meta_files += " ";
+	    meta_files += libtoolFileName();
+	}
+	if(project->isActiveConfig("create_pc") && project->first("TEMPLATE") == "lib") { //pkg-config
+	    if(!meta_files.isEmpty())
+		meta_files += " ";
+	    meta_files += pkgConfigFileName();
+	}
+	if(!meta_files.isEmpty()) {
+	    QStringList files = fileFixify(Option::mkfile::project_files);
+	    t << meta_files << ": " << "\n\t"
+	      << "@$(QMAKE) -prl " << buildArgs() << " " << files.join(" ") << endl;
+	}
+    }
 
     if(!project->first("QMAKE_PKGINFO").isEmpty()) {
 	QString pkginfo = project->first("QMAKE_PKGINFO");
@@ -624,18 +719,20 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     }
     if(!project->first("QMAKE_INFO_PLIST").isEmpty()) {
 	QString info_plist = project->first("QMAKE_INFO_PLIST"),
-	       info_plist_out = project->first("QMAKE_INFO_PLIST_OUT");
+	    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;
+	  << "@sed -e \"s,@ICON@,application.icns,g\" -e \"s,@EXECUTABLE@," << var("QMAKE_ORIG_TARGET")
+	  << ",g\" \"" << info_plist << "\" >\"" << info_plist_out << "\"" << endl;
 	if(!project->first("RC_FILE").isEmpty()) {
 	    QString dir = destdir + "../Resources/";
-	    t << dir << "application.icns:" << "\n\t"
+	    t << dir << "application.icns: " << var("RC_FILE") << "\n\t"
 	      << "@test -d " << dir << " || mkdir -p " << dir << "\n\t"
-	      << "@cp " << var("RC_FILE") << " " << dir << "application.icns" << endl;
+	      << "@$(DEL_FILE) " << dir << "application.icns" << "\n\t"
+	      << "@$(COPY_FILE) " << var("RC_FILE") << " " << dir << "application.icns" << endl;
 	}
     }
 
@@ -648,11 +745,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
       << "$(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("IMAGES"))
+	t << "$(COPY_FILE) --parents " << var("IMAGES") << " " << 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())
@@ -666,8 +765,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
       << endl << endl;
 
     QString clean_targets;
+    t << "mocclean:" << "\n";
     if(mocAware()) {
-	t << "mocclean:" << "\n";
 	if(!objMoc.isEmpty() || !srcMoc.isEmpty() || moc_incremental) {
 	    if(!objMoc.isEmpty())
 		t << "\t-$(DEL_FILE) $(OBJMOC)" << '\n';
@@ -697,8 +796,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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();
+	    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";
@@ -717,7 +816,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	    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();
+	    clean << ( dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first() );
 	}
 	if(!clean.isEmpty()) {
 	    t << "\t-$(DEL_FILE) " << clean.join(" ") << "\n";
@@ -735,8 +834,18 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     }
 
     t << "clean:" << clean_targets << "\n\t";
-    if(!project->isEmpty("OBJECTS"))
-	t << "-$(DEL_FILE) $(OBJECTS) " << "\n\t";
+    if(!project->isEmpty("OBJECTS")) {
+	if(project->isActiveConfig("compile_libtool"))
+	    t << "-$(LIBTOOL) --mode=clean $(DEL_FILE) $(OBJECTS)" << "\n\t";
+	else
+	    t << "-$(DEL_FILE) $(OBJECTS)" << "\n\t";
+    }
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER")) {
+	QString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
+	QString precomph_out_dir = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep;
+	t << "-$(DEL_FILE) " << precomph_out_dir << header_prefix + "c "
+	  << precomph_out_dir << header_prefix << "c++" << "\n\t";
+    }
     if(!project->isEmpty("IMAGES"))
 	t << varGlue("QMAKE_IMAGE_COLLECTION", "\t-$(DEL_FILE) ", " ", "") << "\n\t";
     if(src_incremental)
@@ -762,31 +871,55 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
     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 if(project->isActiveConfig("compile_libtool"))
+	t << "\t-$(LIBTOOL) --mode=clean $(DEL_FILE) " << "$(TARGET)" << "\n";
     else
 	t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << "$(TARGET)" << "\n";
     if(!project->isActiveConfig("staticlib") && project->variables()["QMAKE_APP_FLAG"].isEmpty() &&
-       !project->isActiveConfig("plugin"))
+       !project->isActiveConfig("plugin") && !project->isActiveConfig("compile_libtool"))
 	t << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
 	  << destdir << "$(TARGET2) $(TARGETA)" << "\n";
     t << endl << endl;
 
-    if ( !project->isEmpty("PRECOMPH") ) {
+    if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER") ) {
+	QString precomph = fileFixify(project->first("PRECOMPILED_HEADER"));
+	t << "###### Prefix headers" << endl;
+	QString comps[] = { "C", "CXX", QString::null };
+	for(int i = 0; !comps[i].isNull(); i++) {
+	    QString flags = var("QMAKE_" + comps[i] + "FLAGS_PRECOMPILE");
+	    flags += " $(" + comps[i] + "FLAGS)";
+
+	    QString header_prefix = project->first("QMAKE_PRECOMP_PREFIX");
+	    QString outdir = project->first("QMAKE_ORIG_TARGET") + ".gch" + Option::dir_sep, outfile = outdir;
+	    QString compiler;
+	    if(comps[i] == "C") {
+		outfile += header_prefix + "c";
+		compiler = "$(CC) ";
+	    } else {
+		outfile += header_prefix + "c++";
+		compiler = "$(CXX) ";
+	    }
+	    t << outfile << ": " << precomph << " " << findDependencies(precomph).join(" \\\n\t\t")
+	      << "\n\t" << "test -d " << outdir << " || mkdir -p " << outdir
+	      << "\n\t" << compiler << flags << " $(INCPATH) " << precomph << " -o " << outfile << endl << endl;
+	}
+    }
+    if(!project->isEmpty("ALLMOC_HEADER")) {
 	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 << " "
+	QString precomph = fileFixify(project->first("ALLMOC_HEADER"));
+	t << "###### Combined headers" << endl << endl
+	  << outdir << "allmoc.cpp: " << precomph << " "
 	  << varList("HEADERS_ORIG") << "\n\t"
-	  << "echo '#include \"" << qt_dot_h << "\"' >" << outdir << "allmoc.cpp" << "\n\t"
+	  << "echo '#include \"" << precomph << "\"' >" << outdir << "allmoc.cpp" << "\n\t"
 	  << "$(CXX) -E -DQT_MOC_CPP -DQT_NO_STL $(CXXFLAGS) $(INCPATH) >" << outdir << "allmoc.h "
-	     << outdir << "allmoc.cpp" << "\n\t"
+	  << 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"
+	  << precomph << "\"}' " << outdir << "allmoc.cpp" << "\n\t"
 	  << "$(DEL_FILE) " << outdir << "allmoc.h" << endl << endl;
     }
 
-    // blasted user defined targets
+    // user defined targets
     QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
     for(it = qut.begin(); it != qut.end(); ++it) {
 	QString targ = var((*it) + ".target"),
@@ -800,9 +933,59 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 		dep = (*dep_it);
 	    deps += " " + dep;
 	}
+	if(project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
 	t << targ << ":" << deps << "\n\t"
 	  << cmd << endl << endl;
     }
+    // user defined compilers
+    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(" ");
+	QString tmp_dep = project->variables()[(*it) + ".depends"].join(" ");
+	QStringList &vars = project->variables()[(*it) + ".variables"];
+	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) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out, cmd = tmp_cmd, deps;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.fileName());
+		cmd.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		cmd.replace("${QMAKE_FILE_OUT}", out);
+		cmd.replace("${QMAKE_FILE_NAME}", fi.fileName());
+		for(QStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3)
+		    cmd.replace("$(" + (*it3) + ")", "$(QMAKE_COMP_" + (*it3)+")");
+		if(!tmp_dep.isEmpty()) {
+		    char buff[256];
+		    QString dep_cmd = tmp_dep;
+		    dep_cmd.replace("${QMAKE_FILE_NAME}", fi.fileName());
+		    if(FILE *proc = QT_POPEN(dep_cmd.latin1(), "r")) {
+			while(!feof(proc)) {
+			    int read_in = int(fread(buff, 1, 255, proc));
+			    if(!read_in)
+				break;
+			    int l = 0;
+			    for(int i = 0; i < read_in; i++) {
+				if(buff[i] == '\n' || buff[i] == ' ') {
+				    deps += " " + QCString(buff+l, (i - l) + 1);
+				    l = i;
+				}
+			    }
+			}
+			fclose(proc);
+		    }
+		}
+		t << out << ": " << in << deps << "\n\t"
+		  << cmd << endl << endl;
+	    }
+	}
+    }
     t <<"FORCE:" << endl << endl;
 }
 
@@ -814,6 +997,12 @@ struct SubDir
 void
 UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 {
+    // blasted includes
+    QStringList &qeui = project->variables()["QMAKE_EXTRA_UNIX_INCLUDES"];
+    for(QStringList::Iterator qeui_it = qeui.begin(); qeui_it != qeui.end(); ++qeui_it)
+	t << "include " << (*qeui_it) << endl;
+    writeExtraVariables(t);
+
     QPtrList<SubDir> subdirs;
     {
 	QStringList subdirs_in = project->variables()["SUBDIRS"];
@@ -832,6 +1021,8 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 		    sd->profile = file;
 		}
 	    } else {
+		if(!file.isEmpty())
+		    sd->profile = file.section(Option::dir_sep, -1) + ".pro";
 		sd->directory = file;
 	    }
 	    while(sd->directory.right(1) == Option::dir_sep)
@@ -857,8 +1048,12 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     t << "MAKEFILE =	" << var("MAKEFILE") << endl;
     t << "QMAKE    =	" << var("QMAKE") << endl;
     t << "DEL_FILE =    " << var("QMAKE_DEL_FILE") << endl;
+    t << "CHK_DIR_EXISTS= " << var("QMAKE_CHK_DIR_EXISTS") << endl;
+    t << "MKDIR    = " << var("QMAKE_MKDIR") << endl;
+    t << "INSTALL_FILE= " << var("QMAKE_INSTALL_FILE") << endl;
+    t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << 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;
@@ -874,8 +1069,10 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	//qmake it
 	t << mkfile << ": " << "\n\t";
 	if(have_dir)
-	    t << "cd " << (*it)->directory << " && ";
-	t << "$(QMAKE) " << (*it)->profile << buildArgs() << out << endl;
+	    t << mkdir_p_asstring((*it)->directory) << "\n\t"
+	      << "cd " << (*it)->directory << " && ";
+	QString profile = fileFixify((*it)->profile, (*it)->directory, (*it)->directory);
+	t << "$(QMAKE) " << profile << buildArgs() << out << endl;
 	//actually compile
 	t << (*it)->target << ": " << mkfile << " FORCE" << "\n\t";
 	if(have_dir)
@@ -887,7 +1084,7 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	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;
@@ -896,7 +1093,8 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
     writeMakeQmake(t);
 
     if(project->isEmpty("SUBDIRS")) {
-	t << "all qmake_all distclean install uiclean mocclean lexclean yaccclean clean: FORCE" << endl;
+	t << "all qmake_all distclean uicables mocables install_subdirs uninstall_subdirs"
+	  << " uiclean mocclean lexclean yaccclean clean " << var("SUBDIR_TARGETS") << ": FORCE" << endl;
     } else {
 	t << "all: $(SUBTARGETS)" << endl;
 	t << "qmake_all:";
@@ -910,11 +1108,12 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	    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 lexclean yaccclean: qmake_all FORCE";
+	t << "clean uicables mocables uiclean mocclean lexclean yaccclean "
+	  << var("SUBDIR_TARGETS") << ": qmake_all FORCE";
 	for( it.toFirst(); it.current(); ++it) {
 	    t << "\n\t ( ";
 	    if(!(*it)->directory.isEmpty())
@@ -922,6 +1121,22 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	    t << "$(MAKE) -f " << (*it)->makefile << " $@" << "; ) || true";
 	}
 	t << endl;
+	t << "uninstall_subdirs: 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 << " uninstall" << "; ) || true";
+	}
+	t << endl;
+	t << "install_subdirs: 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 << " install" << "; ) || true";
+	}
+	t << endl;
 	t << "distclean: qmake_all FORCE";
 	for( it.toFirst(); it.current(); ++it) {
 	    t << "\n\t ( ";
@@ -931,6 +1146,31 @@ UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 	}
 	t << endl << endl;
     }
+
+    //installations
+    project->variables()["INSTALLDEPS"]   += "install_subdirs";
+    project->variables()["UNINSTALLDEPS"] += "uninstall_subdirs";
+    writeInstalls(t, "INSTALLS");
+
+    // user defined targets
+    QStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
+    for(QStringList::Iterator qut_it = qut.begin(); qut_it != qut.end(); ++qut_it) {
+	QString targ = var((*qut_it) + ".target"),
+		 cmd = var((*qut_it) + ".commands"), deps;
+	if(targ.isEmpty())
+	    targ = (*qut_it);
+	QStringList &deplist = project->variables()[(*qut_it) + ".depends"];
+	for(QStringList::Iterator dep_it = deplist.begin(); dep_it != deplist.end(); ++dep_it) {
+	    QString dep = var((*dep_it) + ".target");
+	    if(dep.isEmpty())
+		dep = (*dep_it);
+	    deps += " " + dep;
+	}
+	if(project->variables()[(*qut_it) + ".CONFIG"].findIndex("phony") != -1)
+	    deps += QString(" ") + "FORCE";
+	t << targ << ":" << deps << "\n\t"
+	  << cmd << endl << endl;
+    }
     t <<"FORCE:" << endl << endl;
 }
 
@@ -967,20 +1207,26 @@ void UnixMakefileGenerator::init2()
 	    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->isActiveConfig("compile_libtool") )
+	    project->variables()["TARGET_la"] = project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext;
+
 	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)");
-	if( project->isActiveConfig("plugin") ) {
+	if( project->isActiveConfig("compile_libtool") ) {
+	    project->variables()["TARGET"] = project->variables()["TARGET_la"];
+	} else if( project->isActiveConfig("plugin") ) {
 	    project->variables()["TARGET_x.y.z"].append("lib" +
-							project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_SHLIB"));
+							project->first("TARGET") + "." +
+							project->first("QMAKE_EXTENSION_PLUGIN"));
 	    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->first("VER_MAJ") + "." +
+							project->first("QMAKE_EXTENSION_PLUGIN"));
 	    else
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
-							project->first("QMAKE_EXTENSION_SHLIB") +
+							project->first("QMAKE_EXTENSION_PLUGIN") +
 							"." + project->first("VER_MAJ"));
 
 	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
@@ -989,10 +1235,10 @@ void UnixMakefileGenerator::init2()
 	} 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 ( !project->isEmpty("QMAKE_AIX_SHLIB") ) {
@@ -1075,22 +1321,44 @@ void UnixMakefileGenerator::init2()
 	}
 	if ( project->variables()["QMAKE_LINK_SHLIB_CMD"].isEmpty() )
 	    project->variables()["QMAKE_LINK_SHLIB_CMD"].append(
-		"$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS)");
+		"$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJMOC) $(LIBS) $(OBJCOMP)");
     }
     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"];
+	project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_APP"];
+	project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_APP"];
+	project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_APP"];
     } 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->isActiveConfig("plugin_no_share_shlib_cflags")) {
+	    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_CFLAGS"] += project->variables()["QMAKE_CFLAGS_PLUGIN"];
+	    project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_PLUGIN"];
 	    project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_PLUGIN"];
-	    if( !project->isActiveConfig("plugin_no_soname") )
+	    if( project->isActiveConfig("plugin_with_soname") && !project->isActiveConfig("compile_libtool"))
 		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"];
+	    if(!project->isEmpty("QMAKE_LFLAGS_COMPAT_VERSION")) {
+		if(project->isEmpty("COMPAT_VERSION"))
+		    project->variables()["QMAKE_LFLAGS"] += QString(project->first("QMAKE_LFLAGS_COMPAT_VERSION") +
+								    project->first("VER_MAJ") + "." +
+								    project->first("VER_MIN"));
+		else
+		    project->variables()["QMAKE_LFLAGS"] += QString(project->first("QMAKE_LFLAGS_COMPAT_VERSION") +
+								    project->first("COMPATIBILITY_VERSION"));
+	    }
+	    if(!project->isEmpty("QMAKE_LFLAGS_VERSION")) {
+		project->variables()["QMAKE_LFLAGS"] += QString(project->first("QMAKE_LFLAGS_VERSION") +
+								project->first("VER_MAJ") + "." +
+								project->first("VER_MIN") + "." +
+								project->first("VER_PAT"));
+	    }
+	    if(!project->isActiveConfig("compile_libtool"))
+		project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_SONAME"];
 	}
 	QString destdir = project->first("DESTDIR");
 	if ( !destdir.isEmpty() && !project->variables()["QMAKE_RPATH"].isEmpty() ) {
@@ -1107,4 +1375,214 @@ void UnixMakefileGenerator::init2()
 	    project->variables()["QMAKE_LFLAGS"] += project->first("QMAKE_RPATH") + rpath_destdir;
 	}
     }
+    QStringList &quc = project->variables()["QMAKE_EXTRA_UNIX_COMPILERS"];
+    for(QStringList::Iterator it = quc.begin(); it != quc.end(); ++it) {
+	QString tmp_out = project->variables()[(*it) + ".output"].first();
+	if(tmp_out.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) {
+		QFileInfo fi(Option::fixPathToLocalOS((*input)));
+		QString in = Option::fixPathToTargetOS((*input), FALSE),
+		       out = tmp_out;
+		out.replace("${QMAKE_FILE_BASE}", fi.baseName());
+		out.replace("${QMAKE_FILE_NAME}", fi.fileName());
+		if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1)
+		    project->variables()["OBJCOMP"] += out;
+	    }
+	}
+    }
+}
+
+QString
+UnixMakefileGenerator::libtoolFileName()
+{
+    QString ret = var("TARGET");
+    int slsh = ret.findRev(Option::dir_sep);
+    if(slsh != -1)
+	ret = ret.right(ret.length() - slsh);
+    int dot = ret.find('.');
+    if(dot != -1)
+	ret = ret.left(dot);
+    ret += Option::libtool_ext;
+    if(!project->isEmpty("DESTDIR"))
+	ret.prepend(var("DESTDIR"));
+    return ret;
+}
+
+void
+UnixMakefileGenerator::writeLibtoolFile()
+{
+    QString fname = libtoolFileName(), lname = fname;
+    int slsh = lname.findRev(Option::dir_sep);
+    if(slsh != -1)
+	lname = lname.right(lname.length() - slsh - 1);
+    QFile ft(fname);
+    if(!ft.open(IO_WriteOnly))
+	return;
+    project->variables()["ALL_DEPS"].append(fname);
+
+    QTextStream t(&ft);
+    t << "# " << lname << " - a libtool library file\n";
+    time_t now = time(NULL);
+    t << "# Generated by qmake/libtool (" << qmake_version() << ") (Qt "
+      << QT_VERSION_STR << ") on: " << ctime(&now) << "\n";
+
+    t << "# The name that we can dlopen(3).\n"
+      << "dlname='" << var(project->isActiveConfig("plugin") ? "TARGET" : "TARGET_x")
+      << "'\n\n";
+
+    t << "# Names of this library.\n";
+    t << "library_names='";
+    if(project->isActiveConfig("plugin")) {
+	t << var("TARGET");
+    } else {
+    	if (project->isEmpty("QMAKE_HPUX_SHLIB"))
+	    t << var("TARGET_x.y.z") << " ";
+    	t << var("TARGET_x") << " " << var("TARGET_");
+    }
+    t << "'\n\n";
+
+    t << "# The name of the static archive.\n"
+      << "old_library='" << lname.left(lname.length()-Option::libtool_ext.length()) << ".a'\n\n";
+
+    t << "# Libraries that this one depends upon.\n";
+    QStringList libs;
+    if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	libs = project->variables()["QMAKE_INTERNAL_PRL_LIBS"];
+    else
+	libs << "QMAKE_LIBS"; //obvious one
+    t << "dependency_libs='";
+    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
+	t << project->variables()[(*it)].join(" ") << " ";
+    t << "'\n\n";
+
+    t << "# Version information for " << lname << "\n";
+    int maj = project->first("VER_MAJ").toInt();
+    int min = project->first("VER_MIN").toInt();
+    int pat = project->first("VER_PAT").toInt();
+    t << "current=" << (10*maj + min) << "\n" // best I can think of
+      << "age=0\n"
+      << "revision=" << pat << "\n\n";
+
+    t << "# Is this an already installed library.\n"
+	"installed=yes\n\n"; // ###
+
+    t << "# Files to dlopen/dlpreopen.\n"
+	"dlopen=''\n"
+	"dlpreopen=''\n\n";
+
+    QString install_dir = project->first("target.path");
+    if(install_dir.isEmpty())
+	install_dir = project->first("DESTDIR");
+    t << "# Directory that this library needs to be installed in:\n"
+	"libdir='" << Option::fixPathToTargetOS(install_dir, FALSE) << "'\n";
+}
+
+QString
+UnixMakefileGenerator::pkgConfigFileName()
+{
+    QString ret = var("TARGET");
+    int slsh = ret.findRev(Option::dir_sep);
+    if(slsh != -1)
+	ret = ret.right(ret.length() - slsh);
+    if(ret.startsWith("lib"))
+	ret = ret.mid(3);
+    int dot = ret.find('.');
+    if(dot != -1)
+	ret = ret.left(dot);
+    ret += Option::pkgcfg_ext;
+    if(!project->isEmpty("DESTDIR")) {
+	ret.prepend(var("DESTDIR"));
+	ret = Option::fixPathToLocalOS(fileFixify(ret,QDir::currentDirPath(), Option::output_dir));
+    }
+    return ret;
+}
+
+QString
+UnixMakefileGenerator::pkgConfigPrefix() const
+{
+    if(!project->isEmpty("QMAKE_PKGCONFIG_PREFIX"))
+	return project->first("QMAKE_PKGCONFIG_PREFIX");
+    return qInstallPath();
+}
+
+QString
+UnixMakefileGenerator::pkgConfigFixPath(QString path) const
+{
+    QString prefix = pkgConfigPrefix();
+    if(path.startsWith(prefix))
+	path = path.replace(prefix, "${prefix}");
+    return path;
+}
+
+void
+UnixMakefileGenerator::writePkgConfigFile()     // ### does make sense only for libqt so far
+{
+    QString fname = pkgConfigFileName(), lname = fname;
+    int slsh = lname.findRev(Option::dir_sep);
+    if(slsh != -1)
+	lname = lname.right(lname.length() - slsh - 1);
+    QFile ft(fname);
+    if(!ft.open(IO_WriteOnly))
+	return;
+    project->variables()["ALL_DEPS"].append(fname);
+    QTextStream t(&ft);
+
+    QString prefix = pkgConfigPrefix();
+    QString libDir = project->first("QMAKE_PKGCONFIG_LIBDIR");
+    if(libDir.isEmpty())
+	libDir = prefix + "/lib";
+    QString includeDir = project->first("QMAKE_PKGCONFIG_INCDIR");
+    if(includeDir.isEmpty())
+	includeDir = prefix + "/include";
+
+    t << "prefix=" << prefix << endl;
+    t << "exec_prefix=${prefix}\n"
+      << "libdir=" << pkgConfigFixPath(libDir) << "\n"
+      << "includedir=" << pkgConfigFixPath(includeDir) << endl;
+    // non-standard entry. Provides useful info normally only
+    // contained in the internal .qmake.cache file
+    t << varGlue("CONFIG", "qt_config=", " ", "") << endl << endl;
+
+    t << "Name: Qt" << endl;
+    QString desc = project->first("QMAKE_PKGCONFIG_DESCRIPTION");
+    if(desc.isEmpty()) {
+	desc = project->first("TARGET").lower();
+	desc.replace(0, 1, desc[0].upper());
+	if(project->first("TEMPLATE") == "lib") {
+	    if(project->isActiveConfig("plugin"))
+	       desc += " Plugin";
+	    else
+	       desc += " Library";
+	} else if(project->first("TEMPLATE") == "app") {
+	    desc += " Application";
+	}
+    }
+    t << "Description: " << desc << endl;
+    t << "Version: " << project->first("VERSION") << endl;
+
+    // libs
+    QStringList libs;
+    if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
+	libs = project->variables()["QMAKE_INTERNAL_PRL_LIBS"];
+    else
+	libs << "QMAKE_LIBS"; //obvious one
+    if(project->isActiveConfig("thread"))
+	libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
+    t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " ";
+    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
+	t << project->variables()[(*it)].join(" ") << " ";
+    t << endl;
+
+    // flags
+    // ### too many
+    t << "Cflags: "
+	// << var("QMAKE_CXXFLAGS") << " "
+      << varGlue("PRL_EXPORT_DEFINES","-D"," -D"," ")
+      << project->variables()["PRL_EXPORT_CXXFLAGS"].join(" ")
+	//      << varGlue("DEFINES","-D"," -D"," ")
+      << " -I${includedir}";
 }
--
cgit v0.9.0.2