Changeset 525

Timestamp:

Feb 4, 2010, 9:46:39 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake/os2: Makefiles for subdirs targets also need QMAKESPECDIR and MAKEFILE.

File:

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

trunk/qmake/generators/os2/gnumake.cpp

@@ -285 +285 @@
          "$(subst +,\\+,$(subst $(space),\\ ,$(subst \",,$(1)))))))" << endl << endl;
 
+
+
+
+
+
+
+
     if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {
         t << "all clean:" << "\n\t"
@@ -320 +327 @@
 void GNUMakefileGenerator::writeGNUParts(QTextStream &t)
 {
-    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;
-
     writeStandardParts(t);