Changeset 973

Timestamp:

Aug 12, 2011, 3:55:22 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: Make MakefileGenerator::writeHeader() virtual.

This lets generators have additional definitions common to
all generated makefiles in a single place. This is used by
e.g. the OS/2 GNUMAKE generator.

Location:

trunk/qmake/generators

Files:

• makefile.h (modified) (1 diff)
• os2/gnumake.cpp (modified) (2 diffs)
• os2/gnumake.h (modified) (1 diff)

trunk/qmake/generators/makefile.h

@@ -96 +96 @@
     void writeObj(QTextStream &, const QString &src);
     void writeInstalls(QTextStream &t, const QString &installs, bool noBuild=false);
-    void writeHeader(QTextStream &t);
+    void writeHeader(QTextStream &t);
     void writeSubDirs(QTextStream &t);
     void writeMakeQmake(QTextStream &t);

trunk/qmake/generators/os2/gnumake.cpp

@@ -290 +290 @@
 }
 
-bool GNUMakefileGenerator::writeMakefile(QTextStream &t)
-{
-    writeHeader(t);
+(QTextStream &t)
+{
+    writeHeader(t);
 
     /* function to convert from DOS-like to Unix-like space escaping in file
@@ -303 +303 @@
     t << "QMAKESPECDIR  = " << escapeFilePath(specdir()) << endl;
 
-    QString ofile = escapeFilePath(Option::output.fileName());
-    if(ofile.lastIndexOf(Option::dir_sep) != -1)
-        ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
-    t << "MAKEFILE      = " << ofile << endl << endl;
+    // MakefileGenerator::writeSubTargets() already puts the MAKEFILE definitoin
+    // but others don't; add it here since we use it within generated makefiles
+    if (project->first("TEMPLATE") != "subdirs") {
+        QString ofile = escapeFilePath(Option::output.fileName());
+        if(ofile.lastIndexOf(Option::dir_sep) != -1)
+            ofile = ofile.right(ofile.length() - ofile.lastIndexOf(Option::dir_sep) -1);
+        t << "MAKEFILE      = " << ofile << endl;
+    }
+
+    t << endl;
+}
+
+bool GNUMakefileGenerator::writeMakefile(QTextStream &t)
+{
+    writeHeader(t);
 
     if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {

trunk/qmake/generators/os2/gnumake.h

@@ -63 +63 @@
     void writeLibsPart(QTextStream &t);
     void writeLibDirPart(QTextStream &t);
+
     bool writeMakefile(QTextStream &);
     void writeObjectsPart(QTextStream &t);