add PRO = file.pro

to the Makefile

1 files changed, 17 insertions, 16 deletions

diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index cbe2014..9bb6f6b 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -18,185 +18,186 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** Licensees holding valid Qt Enterprise Edition licenses may use this
 ** file in accordance with the Qt Commercial License Agreement provided
 ** with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "unixmake.h"
 #include "option.h"
 #include <qregexp.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <time.h>
 
 
 UnixMakefileGenerator::UnixMakefileGenerator(QMakeProject *p) : MakefileGenerator(p), init_flag(FALSE), include_deps(FALSE)
 {
 
 }
 
 bool
 UnixMakefileGenerator::writeMakefile(QTextStream &t)
 {
     writeHeader(t);
     if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	t << "all clean:" << "\n\t"
 	  << "@echo \"Some of the required modules ("
 	  << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	writeMakeQmake(t);
 	return TRUE;
     }
 
     if (project->variables()["TEMPLATE"].first() == "app" ||
 	project->variables()["TEMPLATE"].first() == "lib") {
 	writeMakeParts(t);
 	return MakefileGenerator::writeMakefile(t);
     } else if(project->variables()["TEMPLATE"].first() == "subdirs") {
 	writeSubdirs(t);
 	return TRUE;
     }
     return FALSE;
 }
 
 void
 UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 {
     QString deps = fileFixify(Option::output.name()), prl;
     bool do_incremental = (project->isActiveConfig("incremental") &&
 			   !project->variables()["QMAKE_INCREMENTAL"].isEmpty() &&
 			   (!project->variables()["QMAKE_APP_FLAG"].isEmpty() ||
-			    !project->isActiveConfig("staticlib"))), 
+			    !project->isActiveConfig("staticlib"))),
 	 src_incremental=FALSE, moc_incremental=FALSE;
     QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
 
     t << "####### Compiler, tools and options" << endl << endl;
     t << "CC       = ";
     if (project->isActiveConfig("thread") &&
 	! project->variables()["QMAKE_CC_THREAD"].isEmpty())
 	t << var("QMAKE_CC_THREAD") << endl;
     else
 	t << var("QMAKE_CC") << endl;
 
     t << "CXX      = ";
     if (project->isActiveConfig("thread") &&
 	! project->variables()["QMAKE_CXX_THREAD"].isEmpty())
 	t << var("QMAKE_CXX_THREAD") << endl;
     else
 	t << var("QMAKE_CXX") << endl;
 
     t << "LEX      = " << var("QMAKE_LEX") << endl;
     t << "YACC     = " << var("QMAKE_YACC") << endl;
     t << "CFLAGS   = " << var("QMAKE_CFLAGS") << " "
       << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
       << varGlue("DEFINES","-D"," -D","") << endl;
     t << "CXXFLAGS = " << var("QMAKE_CXXFLAGS") << " "
       << varGlue("PRL_EXPORT_DEFINES","-D"," -D","") << " "
       << varGlue("DEFINES","-D"," -D","") << endl;
     t << "LEXFLAGS = " << var("QMAKE_LEXFLAGS") << endl;
     t << "YACCFLAGS= " << var("QMAKE_YACCFLAGS") << endl;
     t << "INCPATH  = " << varGlue("INCLUDEPATH","-I", " -I", "") << " -I" << specdir() << endl;
 
     if(!project->isActiveConfig("staticlib")) {
 	t << "LINK     = ";
 	if (project->isActiveConfig("thread") &&
 	    ! project->variables()["QMAKE_LINK_THREAD"].isEmpty())
 	    t << var("QMAKE_LINK_THREAD") << endl;
 	else
 	    t << var("QMAKE_LINK") << endl;
 
 	t << "LFLAGS   = " << var("QMAKE_LFLAGS") << endl;
 	t << "LIBS     = " << "$(SUBLIBS) " << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;
     }
 
     t << "AR       = " << var("QMAKE_AR") << endl;
     t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
     t << "MOC      = " << var("QMAKE_MOC") << endl;
     t << "UIC      = "	<< var("QMAKE_UIC") << endl;
     t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? QString("qmake") : var("QMAKE_QMAKE")) << endl;
     t << "TAR      = "	<< var("QMAKE_TAR") << endl;
     t << "GZIP     = " << var("QMAKE_GZIP") << endl;
     t << "COPY     = " << var("QMAKE_COPY") << endl;
     t << "COPY_FILE= " << var("QMAKE_COPY_FILE") << endl;
     t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl;
     t << "DEL_FILE = " << var("QMAKE_DEL_FILE") << endl;
     t << "SYMLINK  = " << var("QMAKE_SYMBOLIC_LINK") << endl;
     t << "DEL_DIR  = " << var("QMAKE_DEL_DIR") << endl;
     t << "MOVE     = " << var("QMAKE_MOVE") << endl;
+    t << "PRO      = " << fileFixify(project->projectFile()  )<< endl;
     t << endl;
 
     t << "####### Output directory" << endl << endl;
     if (! project->variables()["OBJECTS_DIR"].isEmpty())
 	t << "OBJECTS_DIR = " << var("OBJECTS_DIR") << endl;
     else
 	t << "OBJECTS_DIR = ./" << endl;
     t << endl;
 
     /* files */
     t << "####### Files" << endl << endl;
     t << "HEADERS = " << varList("HEADERS") << endl;
     t << "SOURCES = " << varList("SOURCES") << endl;
     if(do_incremental) {
 	QStringList &objs = project->variables()["OBJECTS"], &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
 	t << "OBJECTS = ";
 	for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
 	    bool increment = FALSE;
 	    for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
 		if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
 		    increment = TRUE;
 		    incrs_out.append((*objit));
 		    break;
 		}
 	    }
 	    if(!increment)
 		t << "\\\n\t\t" << (*objit);
 	}
 	if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
 	    t << incrs_out.join(" \\\n\t\t") << endl;
 	} else if(!incrs_out.count()) {
 	    t << endl;
 	} else {
 	    src_incremental = TRUE;
 	    t << endl;
 	    t << "INCREMENTAL_OBJECTS = " << incrs_out.join(" \\\n\t\t") << endl;
 	}
     } else {
 	t << "OBJECTS = " << varList("OBJECTS") << endl;
     }
     t << "FORMS = " << varList("FORMS") << endl;
     t << "UICDECLS = " << varList("UICDECLS") << endl;
     t << "UICIMPLS = " << varList("UICIMPLS") << endl;
     QString srcMoc = varList("SRCMOC"), objMoc = varList("OBJMOC");
     t << "SRCMOC   = " << srcMoc << endl;
     if(do_incremental) {
 	QStringList &objs = project->variables()["OBJMOC"],
 		   &incrs = project->variables()["QMAKE_INCREMENTAL"], incrs_out;
 	t << "OBJMOC = ";
 	for(QStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) {
 	    bool increment = FALSE;
 	    for(QStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) {
 		if((*objit).find(QRegExp((*incrit), TRUE, TRUE)) != -1) {
 		    increment = TRUE;
 		    incrs_out.append((*objit));
 		    break;
 		}
 	    }
 	    if(!increment)
 		t << "\\\n\t\t" << (*objit);
 	}
 	if(incrs_out.count() == objs.count()) { //we just switched places, no real incrementals to be done!
 	    t << incrs_out.join(" \\\n\t\t") << endl;
 	} else if(!incrs_out.count()) {
@@ -469,241 +470,241 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	}
 	if(!destdir.isEmpty())
 	    t << "\n\t" << "test -d " << destdir << " || mkdir -p " << destdir;
 	if(!project->isEmpty("QMAKE_PRE_LINK"))
 	    t << "\n\t" << var("QMAKE_PRE_LINK");
 
 	if(project->isActiveConfig("plugin")) {
 	    t << "\n\t"
 	      << "-$(DEL_FILE) $(TARGET)" << "\n\t"
 	      << var("QMAKE_LINK_SHLIB_CMD");
 	    if(!destdir.isEmpty())
 		t << "\n\t"
 		  << "-$(MOVE) $(TARGET) " << var("DESTDIR");
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK") << "\n\t";
 	    t << endl << endl;
 	} else if ( os == "hpux" ) {
 	    t << "\n\t"
 	      << "-$(DEL_FILE) $(TARGET) $(TARGET0)" << "\n\t"
 	      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
 	    t << varGlue("QMAKE_LN_SHLIB",""," "," $(TARGET) $(TARGET0)");
 	    if(!destdir.isEmpty())
 		t  << "\n\t"
 		   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
 		   << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
 		   << "-$(MOVE) $(TARGET) $(TARGET0) " << var("DESTDIR");
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK");
 	    t << endl << endl;
 	} else {
 	    t << "\n\t"
 	      << "-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)" << "\n\t"
 	      << var("QMAKE_LINK_SHLIB_CMD") << "\n\t";
 	    t << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET0)")  << "\n\t"
 	      << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET1)") << "\n\t"
 	      << varGlue("QMAKE_LN_SHLIB","-"," "," $(TARGET) $(TARGET2)");
 	    if(!destdir.isEmpty())
 		t << "\n\t"
 		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)\n\t"
 		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET0)\n\t"
 		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET1)\n\t"
 		  << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET2)\n\t"
 		  << "-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) " << var("DESTDIR");
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\n\t" << var("QMAKE_POST_LINK");
 	    t << endl << endl;
 	}
 	t << endl << endl;
 
 	if (! project->isActiveConfig("plugin")) {
 	    t << "staticlib: $(TARGETA)" << endl << endl;
 	    t << "$(TARGETA): $(UICDECLS) $(OBJECTS) $(OBJMOC)";
 	    if(do_incremental)
 		t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
 	    t << var("TARGETDEPS") << "\n\t"
 	      << "-$(DEL_FILE) $(TARGETA) " << "\n\t"
 	      << var("QMAKE_AR_CMD");
 	    if(do_incremental)
 		t << " $(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJMOC)";
 	    if(!project->isEmpty("QMAKE_RANLIB"))
 		t << "\n\t" << "$(RANLIB) $(TARGETA)";
 	    t << endl << endl;
 	}
     } else {
-	t << "all: " << deps << " " << varGlue("ALL_DEPS",""," "," ") << var("DESTDIR") << "$(TARGET) " 
+	t << "all: " << deps << " " << varGlue("ALL_DEPS",""," "," ") << var("DESTDIR") << "$(TARGET) "
 	  << varGlue("QMAKE_AR_SUBLIBS", var("DESTDIR"), " " + var("DESTDIR"), "") << "\n\n"
 	  << "staticlib: " << var("DESTDIR") << "$(TARGET)" << "\n\n";
 	if(project->isEmpty("QMAKE_AR_SUBLIBS")) {
 	    t << var("DESTDIR") << "$(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(TARGETDEPS) " << "\n\t";
 	    if(!project->isEmpty("DESTDIR")) {
 		QString destdir = project->first("DESTDIR");
 		t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
 	    }
 	    t << "-$(DEL_FILE) $(TARGET)" << "\n\t"
 	      << var("QMAKE_AR_CMD") << "\n";
 	    if(!project->isEmpty("QMAKE_POST_LINK"))
 		t << "\t" << var("QMAKE_POST_LINK") << "\n";
 	    if(!project->isEmpty("QMAKE_RANLIB"))
 		t << "\t" << "$(RANLIB) $(TARGET)" << "\n";
-	    if(!project->isEmpty("DESTDIR")) 
+	    if(!project->isEmpty("DESTDIR"))
 		t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << "$(TARGET)" << "\n"
 		  << "\t" << "-$(MOVE) $(TARGET) " << var("DESTDIR") << "\n";
 	} else {
 	    int cnt = 0, max_files = project->first("QMAKE_MAX_FILES_PER_AR").toInt();
 	    QStringList objs = project->variables()["OBJECTS"] + project->variables()["OBJMOC"],
 			libs = project->variables()["QMAKE_AR_SUBLIBS"];
 	    libs.prepend("$(TARGET)");
-	    for(QStringList::Iterator libit = libs.begin(), objit = objs.begin(); 
+	    for(QStringList::Iterator libit = libs.begin(), objit = objs.begin();
 		libit != libs.end(); ++libit) {
 		QStringList build;
-		for(cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++) 
+		for(cnt = 0; cnt < max_files && objit != objs.end(); ++objit, cnt++)
 		    build << (*objit);
 		QString ar;
 		if((*libit) == "$(TARGET)") {
-		    t << var("DESTDIR") << "$(TARGET): $(UICDECLS) " << " $(TARGETDEPS) " 
+		    t << var("DESTDIR") << "$(TARGET): $(UICDECLS) " << " $(TARGETDEPS) "
 		      << valList(build) << "\n\t";
 		    ar = project->variables()["QMAKE_AR_CMD"].first();
-		    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)", 
+		    ar = ar.replace("$(OBJMOC)", "").replace("$(OBJECTS)",
 							     build.join(" "));
 		} else {
 		    t << (*libit) << ": " << valList(build) << "\n\t";
 		    ar = "$(AR) " + (*libit) + " " + build.join(" ");
 		}
 		if(!project->isEmpty("DESTDIR")) {
 		    QString destdir = project->first("DESTDIR");
 		    t << "test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
 		}
 		t << "-$(DEL_FILE) " << (*libit) << "\n\t"
 		  << ar << "\n";
 		if(!project->isEmpty("QMAKE_POST_LINK"))
 		    t << "\t" << var("QMAKE_POST_LINK") << "\n";
 		if(!project->isEmpty("QMAKE_RANLIB"))
 		    t << "\t" << "$(RANLIB) " << (*libit) << "\n";
-		if(!project->isEmpty("DESTDIR")) 
+		if(!project->isEmpty("DESTDIR"))
 		    t << "\t" << "-$(DEL_FILE) " << var("DESTDIR") << (*libit) << "\n"
 		      << "\t" << "-$(MOVE) " << (*libit) << " " << var("DESTDIR") << "\n";
 	    }
 	}
 	t << endl << endl;
     }
 
     t << "mocables: $(SRCMOC)" << endl << endl;
 
     if(!project->isActiveConfig("no_mocdepend")) {
 	//this is an implicity depend on moc, so it will be built if necesary, however
 	//moc itself shouldn't have this dependancy - this is a little kludgy but it is
 	//better than the alternative for now.
 	QString moc = project->first("QMAKE_MOC"), target = project->first("TARGET");
 	fixEnvVariables(target);
 	fixEnvVariables(moc);
-	if(target != moc) 
+	if(target != moc)
 	    t << "$(MOC): \n\t"
 	      << "( cd $(QTDIR)/src/moc ; $(MAKE) )"  << endl << endl;
     }
 
     writeMakeQmake(t);
 
     if(!project->first("QMAKE_PKGINFO").isEmpty()) {
 	QString pkginfo = project->first("QMAKE_PKGINFO");
 	QString destdir = project->first("DESTDIR");
 	t << pkginfo << ": " << "\n\t";
 	if(!destdir.isEmpty())
 	    t << "@test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
 	t << "@$(DEL_FILE) " << pkginfo << "\n\t"
 	  << "@echo \"APPL????\" >" << pkginfo << endl;
     }
     if(!project->first("QMAKE_INFO_PLIST").isEmpty()) {
 	QString info_plist = project->first("QMAKE_INFO_PLIST"),
 	       info_plist_out = project->first("QMAKE_INFO_PLIST_OUT");
 	QString destdir = project->first("DESTDIR");
 	t << info_plist_out << ": " << "\n\t";
 	if(!destdir.isEmpty())
 	    t << "@test -d " << destdir << " || mkdir -p " << destdir << "\n\t";
 	t << "@$(DEL_FILE) " << info_plist_out << "\n\t"
 	  << "@cp \"" << info_plist << "\" \"" << info_plist_out << "\"" << endl;
 	if(!project->first("RC_FILE").isEmpty()) {
 	    QString dir = destdir + "../Resources/";
 	    t << dir << "application.icns:" << "\n\t"
 	      << "@test -d " << dir << " || mkdir -p " << dir << "\n\t"
 	      << "@cp " << var("RC_FILE") << " " << dir << "application.icns" << endl;
 	}
     }
 
     QString ddir = project->isEmpty("QMAKE_DISTDIR") ? project->first("QMAKE_ORIG_TARGET") :
 		   project->first("QMAKE_DISTDIR");
     QString ddir_c = fileFixify((project->isEmpty("OBJECTS_DIR") ? QString(".tmp/") :
 				 project->first("OBJECTS_DIR")) + ddir);
     t << "dist: " << "\n\t"
       << "@mkdir -p " << ddir_c << " && "
       << "$(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) " << ddir_c << Option::dir_sep << " && ";
     if(!project->isEmpty("TRANSLATIONS"))
 	t << "$(COPY_FILE) --parents " << var("TRANSLATIONS") << " " << ddir_c << Option::dir_sep << " && ";
     if(!project->isEmpty("FORMS")) {
 	QStringList &forms = project->variables()["FORMS"], ui_headers;
 	for(QStringList::Iterator formit = forms.begin(); formit != forms.end(); ++formit) {
 	    QString ui_h = fileFixify((*formit) + Option::h_ext.first());
-	    if(QFile::exists(ui_h) ) 
+	    if(QFile::exists(ui_h) )
 	       ui_headers << ui_h;
 	}
 	if(!ui_headers.isEmpty())
 	    t << "$(COPY_FILE) --parents " << val(ui_headers) << " " << ddir_c << Option::dir_sep << " && ";
     }
     t << "( cd `dirname " << ddir_c << "` && "
       << "$(TAR) " << var("QMAKE_ORIG_TARGET") << ".tar " << ddir << " && "
       << "$(GZIP) " << var("QMAKE_ORIG_TARGET") << ".tar ) && "
       << "$(MOVE) `dirname " << ddir_c << "`" << Option::dir_sep << var("QMAKE_ORIG_TARGET") << ".tar.gz . && "
       << "$(DEL_DIR) " << ddir_c
       << endl << endl;
 
     QString clean_targets;
     if(mocAware()) {
 	t << "mocclean:" << "\n";
 	if(!objMoc.isEmpty() || !srcMoc.isEmpty() || moc_incremental) {
 	    if(!objMoc.isEmpty())
 		t << "\t-$(DEL_FILE) $(OBJMOC)" << '\n';
 	    if(!srcMoc.isEmpty())
 		t << "\t-$(DEL_FILE) $(SRCMOC)" << '\n';
 	    if(moc_incremental)
 		t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJMOC)" << '\n';
 	    clean_targets += " mocclean";
 	}
 	t << endl;
     }
     t << "uiclean:" << "\n";
     if (!var("UICIMPLS").isEmpty() || !var("UICDECLS").isEmpty()) {
 	t << "\t-$(DEL_FILE) $(UICIMPLS) $(UICDECLS)" << "\n";
 	clean_targets += " uiclean";
     }
     t << endl;
 
     if(do_incremental) {
 	t << "incrclean:" << "\n";
 	if(src_incremental)
 	    t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJECTS)" << "\n";
 	if(moc_incremental)
 	    t << "\t-$(DEL_FILE) $(INCREMENTAL_OBJMOC)" << '\n';
 	t << endl;
     }
 
     t << "clean:" << clean_targets << "\n\t";
     if(!project->isEmpty("OBJECTS"))
 	t << "-$(DEL_FILE) $(OBJECTS) " << "\n\t";
     if(!project->isEmpty("IMAGES"))
 	t << varGlue("QMAKE_IMAGE_COLLECTION", "\t-$(DEL_FILE) ", " ", "") << "\n\t";
     if(src_incremental)
 	t << "-$(DEL_FILE) $(INCREMENTAL_OBJECTS)" << "\n\t";
     t << varGlue("QMAKE_CLEAN","-$(DEL_FILE) "," ","\n\t")
       << "-$(DEL_FILE) *~ core *.core" << "\n"
       << varGlue("CLEAN_FILES","\t-$(DEL_FILE) "," ","") << endl << endl;
     t << "####### Sub-libraries" << endl << endl;
     if ( !project->variables()["SUBLIBS"].isEmpty() ) {
 	QString libdir = "tmp/";
 	if(!project->isEmpty("SUBLIBS_DIR"))
 	    libdir = project->first("SUBLIBS_DIR");
 	QStringList &l = project->variables()["SUBLIBS"];
 	for(it = l.begin(); it != l.end(); ++it)
 	    t << libdir << "lib" << (*it) << ".a" << ":\n\t"
 	      << var(QString("MAKELIB") + (*it)) << endl << endl;
     }
 
     QString destdir = project->first("DESTDIR");
@@ -744,262 +745,262 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
 	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;
 	}
 	t << targ << ":" << deps << "\n\t"
 	  << cmd << endl << endl;
     }
     t <<"FORCE:" << endl << endl;
 }
 
 struct SubDir
 {
     QString directory, profile, target, makefile;
 };
 
 void
 UnixMakefileGenerator::writeSubdirs(QTextStream &t, bool direct)
 {
     QPtrList<SubDir> subdirs;
     {
 	QStringList subdirs_in = project->variables()["SUBDIRS"];
 	for(QStringList::Iterator it = subdirs_in.begin(); it != subdirs_in.end(); ++it) {
 	    QString file = (*it);
 	    fileFixify(file);
 	    SubDir *sd = new SubDir;
 	    subdirs.append(sd);
 	    sd->makefile = "$(MAKEFILE)";
 	    if((*it).right(4) == ".pro") {
 		int slsh = file.findRev(Option::dir_sep);
 		if(slsh != -1) {
 		    sd->directory = file.left(slsh+1);
 		    sd->profile = file.mid(slsh+1);
 		} else {
 		    sd->profile = file;
 		}
 	    } else {
 		sd->directory = file;
 	    }
 	    while(sd->directory.right(1) == Option::dir_sep)
 		sd->directory = sd->directory.left(sd->directory.length() - 1);
 	    if(!sd->profile.isEmpty()) {
 		QString basename = sd->directory;
 		int new_slsh = basename.findRev(Option::dir_sep);
 		if(new_slsh != -1)
 		    basename = basename.mid(new_slsh+1);
 		if(sd->profile != basename + ".pro")
 		    sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro
 	    }
 	    sd->target = "sub-" + (*it);
 	    sd->target.replace('/', '-');
 	    sd->target.replace('.', '_');
 	}
     }
     QPtrListIterator<SubDir> it(subdirs);
 
     QString ofile = Option::output.name();
     if(ofile.findRev(Option::dir_sep) != -1)
 	ofile = ofile.right(ofile.length() - ofile.findRev(Option::dir_sep) -1);
     t << "MAKEFILE =	" << var("MAKEFILE") << endl;
     t << "QMAKE    =	" << var("QMAKE") << endl;
     t << "DEL_FILE =    " << var("QMAKE_DEL_FILE") << endl;
     t << "SUBTARGETS =	";     // subdirectory targets are sub-directory
-    for( it.toFirst(); it.current(); ++it) 
+    for( it.toFirst(); it.current(); ++it)
 	t << " \\\n\t\t" << it.current()->target;
     t << endl << endl;
     t << "first: all\n\nall: " << ofile << " $(SUBTARGETS)" << endl << endl;
 
     // generate target rules
     for( it.toFirst(); it.current(); ++it) {
 	bool have_dir = !(*it)->directory.isEmpty();
 	QString mkfile = (*it)->makefile, out;
 	if(have_dir)
 	    mkfile.prepend((*it)->directory + Option::dir_sep);
 	if(direct || (*it)->makefile != "$(MAKEFILE)")
 	    out = " -o " + (*it)->makefile;
 	//qmake it
 	t << mkfile << ": " << "\n\t";
 	if(have_dir)
 	    t << "cd " << (*it)->directory << " && ";
 	t << "$(QMAKE) " << (*it)->profile << buildArgs() << out << endl;
 	//actually compile
 	t << (*it)->target << ": " << mkfile << " FORCE" << "\n\t";
 	if(have_dir)
 	    t << "cd " << (*it)->directory << " && ";
 	t << "$(MAKE) -f " << (*it)->makefile << endl << endl;
     }
 
     if (project->isActiveConfig("ordered")) { 	// generate dependencies
 	for( it.toFirst(); it.current(); ) {
 	    QString tar = it.current()->target;
 	    ++it;
-	    if (it.current()) 
+	    if (it.current())
 		t << it.current()->target << ": " << tar << endl;
 	}
 	t << endl;
     }
 
     writeMakeQmake(t);
 
     if(project->isEmpty("SUBDIRS")) {
 	t << "all qmake_all distclean install uiclean mocclean clean: FORCE" << endl;
     } else {
 	t << "all: $(SUBTARGETS)" << endl;
 	t << "qmake_all:";
 	for( it.toFirst(); it.current(); ++it) {
 	    t << " ";
 	    if(!(*it)->directory.isEmpty())
 		t << (*it)->directory << Option::dir_sep;
 	    t << (*it)->makefile;
 	}
 	for( it.toFirst(); it.current(); ++it) {
 	    t << "\n\t ( ";
 	    if(!(*it)->directory.isEmpty())
 		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
-	    t << "grep \"^qmake_all:\" " << (*it)->makefile 
+	    t << "grep \"^qmake_all:\" " << (*it)->makefile
 	      << " && $(MAKE) -f " << (*it)->makefile << " qmake_all" << "; ) || true";
 	}
 	t << endl;
 	t << "clean uninstall install uiclean mocclean: qmake_all FORCE";
 	for( it.toFirst(); it.current(); ++it) {
 	    t << "\n\t ( ";
 	    if(!(*it)->directory.isEmpty())
 		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
 	    t << "$(MAKE) -f " << (*it)->makefile << " $@" << "; ) || true";
 	}
 	t << endl;
 	t << "distclean: qmake_all FORCE";
 	for( it.toFirst(); it.current(); ++it) {
 	    t << "\n\t ( ";
 	    if(!(*it)->directory.isEmpty())
 		t << "[ -d " << (*it)->directory << " ] && cd " << (*it)->directory << " ; ";
 	    t << "$(MAKE) -f " << (*it)->makefile << " $@; $(DEL_FILE) " << (*it)->makefile << "; ) || true";
 	}
 	t << endl << endl;
     }
     t <<"FORCE:" << endl << endl;
 }
 
 void UnixMakefileGenerator::init2()
 {
     //version handling
     if(project->variables()["VERSION"].isEmpty())
 	project->variables()["VERSION"].append("1.0." +
 					       (project->isEmpty("VER_PAT") ? QString("0") :
 						project->first("VER_PAT")) );
     QStringList l = QStringList::split('.', project->first("VERSION"));
     l << "0" << "0"; //make sure there are three
     project->variables()["VER_MAJ"].append(l[0]);
     project->variables()["VER_MIN"].append(l[1]);
     project->variables()["VER_PAT"].append(l[2]);
 
     if ( !project->variables()["QMAKE_APP_FLAG"].isEmpty() ) {
 #if 0
 	if ( project->isActiveConfig("dll") ) {
 	    project->variables()["TARGET"] += project->variables()["TARGET.so"];
 	    if(project->variables()["QMAKE_LFLAGS_SHAPP"].isEmpty())
 		project->variables()["QMAKE_LFLAGS_SHAPP"] += project->variables()["QMAKE_LFLAGS_SHLIB"];
 	    if(!project->variables()["QMAKE_LFLAGS_SONAME"].isEmpty())
 		project->variables()["QMAKE_LFLAGS_SONAME"].first() += project->first("TARGET");
 	}
 #endif
 	project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
     } else if ( project->isActiveConfig("staticlib") ) {
 	project->variables()["TARGET"].first().prepend("lib");
 	project->variables()["TARGET"].first() += ".a";
 	if(project->variables()["QMAKE_AR_CMD"].isEmpty())
 	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGET) $(OBJECTS) $(OBJMOC)");
     } else {
 	project->variables()["TARGETA"].append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
 	if ( !project->variables()["QMAKE_AR_CMD"].isEmpty() )
 	    project->variables()["QMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)");
 	else
 	    project->variables()["QMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJMOC)");
 	QString os = project->variables()["QMAKESPEC"].first().section( '-', 0, 0 );
 	if( project->isActiveConfig("plugin") ) {
 	    project->variables()["TARGET_x.y.z"].append("lib" +
 							project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_SHLIB"));
 	    if(project->isActiveConfig("lib_version_first"))
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
-							project->first("VER_MAJ") + "." + 
+							project->first("VER_MAJ") + "." +
 							project->first("QMAKE_EXTENSION_SHLIB"));
 	    else
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 							project->first("QMAKE_EXTENSION_SHLIB") +
 							"." + project->first("VER_MAJ"));
 
 	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
 	    if(project->isActiveConfig("qt"))
 		project->variables()["DEFINES"].append("QT_PLUGIN");
 	} else if ( os == "hpux" ) {
 	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".sl");
 	    if(project->isActiveConfig("lib_version_first"))
-		project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." + 
+		project->variables()["TARGET_x"].append("lib" + project->first("VER_MAJ") + "." +
 							project->first("TARGET"));
 	    else
-		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." + 
+		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 							project->first("VER_MAJ"));
 	    project->variables()["TARGET"] = project->variables()["TARGET_x"];
 	} else if ( os == "aix" ) {
 	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + ".a");
 	    if(project->isActiveConfig("lib_version_first")) {
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 							project->first("VER_MAJ") + "." +
 							project->first("QMAKE_EXTENSION_SHLIB"));
 		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
 							  project->first("VER_MAJ") +
 							  "." + project->first("VER_MIN") + "." +
 							  project->first("QMAKE_EXTENSION_SHLIB"));
 		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
 							    project->first("VER_MAJ") + "." +
 							    project->first("VER_MIN") + "." +
 							    project->first("VER_PAT") + "." +
 							    project->first("QMAKE_EXTENSION_SHLIB"));
 	    } else {
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 							project->first("QMAKE_EXTENSION_SHLIB") +
 							"." + project->first("VER_MAJ"));
 		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
 							  project->first("QMAKE_EXTENSION_SHLIB") +
 							  "." + project->first("VER_MAJ") +
 							  "." + project->first("VER_MIN"));
 		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
 							    project->first("QMAKE_EXTENSION_SHLIB") + "." +
 							    project->first("VER_MAJ") + "." +
 							    project->first("VER_MIN") + "." +
 							    project->first("VER_PAT"));
 	    }
 	    project->variables()["TARGET"] = project->variables()["TARGET_x.y.z"];
 	} else {
 	    project->variables()["TARGET_"].append("lib" + project->first("TARGET") + "." +
 						   project->first("QMAKE_EXTENSION_SHLIB"));
 	    if(project->isActiveConfig("lib_version_first")) {
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 							project->first("VER_MAJ") + "." +
 							project->first("QMAKE_EXTENSION_SHLIB"));
 		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
 							  project->first("VER_MAJ") +
 							  "." + project->first("VER_MIN") + "." +
 							  project->first("QMAKE_EXTENSION_SHLIB"));
 		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") + "." +
 							    project->first("VER_MAJ") + "." +
 							    project->first("VER_MIN") +  "." +
 							    project->first("VER_PAT") + "." +
 							    project->variables()["QMAKE_EXTENSION_SHLIB"].first());
 	    } else {
 		project->variables()["TARGET_x"].append("lib" + project->first("TARGET") + "." +
 							project->first("QMAKE_EXTENSION_SHLIB") +
 							"." + project->first("VER_MAJ"));
 		project->variables()["TARGET_x.y"].append("lib" + project->first("TARGET") + "." +
 						      project->first("QMAKE_EXTENSION_SHLIB")
 						      + "." + project->first("VER_MAJ") +
 						      "." + project->first("VER_MIN"));
 		project->variables()["TARGET_x.y.z"].append("lib" + project->first("TARGET") +
 							    "." +
 							    project->variables()[
 								"QMAKE_EXTENSION_SHLIB"].first() + "." +
 							    project->first("VER_MAJ") + "." +
 							    project->first("VER_MIN") +  "." +
 							    project->first("VER_PAT"));
 	    }