Changeset 10 for trunk/qmake/generators/os2/gnumake.cpp

Timestamp:

May 19, 2009, 1:12:24 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

Tailored qmake/Makefile.os2-g++.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (18 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -40 +40 @@
 ****************************************************************************/
 
-#include "mingw_make.h"
+#include "gnumake.h"
 #include "option.h"
 #include "meta.h"
@@ -50 +50 @@
 QT_BEGIN_NAMESPACE
 
-MingwMakefileGenerator::MingwMakefileGenerator() : Win32MakefileGenerator(), init_flag(false)
+GNUMakefileGenerator::GNUMakefileGenerator() : Win32MakefileGenerator(), init_flag(false)
 {
     if (Option::shellPath.isEmpty())
@@ -58 +58 @@
 }
 
-bool MingwMakefileGenerator::isWindowsShell() const
+bool GNUMakefileGenerator::isWindowsShell() const
 {
 #ifdef Q_OS_WIN
@@ -67 +67 @@
 }
 
-QString MingwMakefileGenerator::escapeDependencyPath(const QString &path) const
+QString GNUMakefileGenerator::escapeDependencyPath(const QString &path) const
 {
     QString ret = path;
@@ -76 +76 @@
 }
 
-QString MingwMakefileGenerator::getLibTarget()
+QString GNUMakefileGenerator::getLibTarget()
 {
     return QString("lib" + project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".a");
 }
 
-bool MingwMakefileGenerator::findLibraries()
+bool GNUMakefileGenerator::findLibraries()
 {
     QStringList &l = project->values("QMAKE_LIBS");
@@ -124 +124 @@
 }
 
-bool MingwMakefileGenerator::writeMakefile(QTextStream &t)
+bool GNUMakefileGenerator::writeMakefile(QTextStream &t)
 {
     writeHeader(t);
@@ -150 +150 @@
             return true;
         }
-        writeMingwParts(t);
+        writeGNUParts(t);
         return MakefileGenerator::writeMakefile(t);
     }
@@ -198 +198 @@
 }
 
-void MingwMakefileGenerator::writeMingwParts(QTextStream &t)
+void GNUMakefileGenerator::writeGNUParts(QTextStream &t)
 {
     writeStandardParts(t);
@@ -219 +219 @@
 }
 
-void MingwMakefileGenerator::init()
+void GNUMakefileGenerator::init()
 {
     if(init_flag)
@@ -309 +309 @@
 }
 
-void MingwMakefileGenerator::fixTargetExt()
+void GNUMakefileGenerator::fixTargetExt()
 {
     if (project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
@@ -320 +320 @@
 }
 
-void MingwMakefileGenerator::writeIncPart(QTextStream &t)
+void GNUMakefileGenerator::writeIncPart(QTextStream &t)
 {
     t << "INCPATH       = ";
@@ -335 +335 @@
 }
 
-void MingwMakefileGenerator::writeLibsPart(QTextStream &t)
+void GNUMakefileGenerator::writeLibsPart(QTextStream &t)
 {
     if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") {
@@ -349 +349 @@
 }
 
-void MingwMakefileGenerator::writeLibDirPart(QTextStream &t)
+void GNUMakefileGenerator::writeLibDirPart(QTextStream &t)
 {
     QStringList libDirs = project->values("QMAKE_LIBDIR");
@@ -357 +357 @@
 }
 
-void MingwMakefileGenerator::writeObjectsPart(QTextStream &t)
+void GNUMakefileGenerator::writeObjectsPart(QTextStream &t)
 {
     if (project->values("OBJECTS").count() < var("QMAKE_LINK_OBJECT_MAX").toInt()) {
@@ -379 +379 @@
 }
 
-void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t)
+void GNUMakefileGenerator::writeBuildRulesPart(QTextStream &t)
 {
     t << "first: all" << endl;
@@ -400 +400 @@
 }
 
-void MingwMakefileGenerator::writeRcFilePart(QTextStream &t)
+void GNUMakefileGenerator::writeRcFilePart(QTextStream &t)
 {
     const QString rc_file = fileFixify(project->first("RC_FILE"));
@@ -410 +410 @@
     if (!rc_file.isEmpty()) {
         t << escapeDependencyPath(var("RES_FILE")) << ": " << rc_file << "\n\t"
-          << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE") 
+          << var("QMAKE_RC") << " -i " << rc_file << " -o " << var("RES_FILE")
           << " --include-dir=" << incPathStr << endl << endl;
     }
 }
 
-void MingwMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
+void GNUMakefileGenerator::processPrlVariable(const QString &var, const QStringList &l)
 {
     if (var == "QMAKE_PRL_LIBS") {
@@ -431 +431 @@
 }
 
-QStringList &MingwMakefileGenerator::findDependencies(const QString &file)
+QStringList &GNUMakefileGenerator::findDependencies(const QString &file)
 {
     QStringList &aList = MakefileGenerator::findDependencies(file);