1 files changed, 28 insertions, 11 deletions

diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 4fdabe8..e818089 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -1,16 +1,14 @@
 /****************************************************************************
-** $Id$
 **
-** Definition of ________ class.
 **
-** Created : 970521
+** Definition of MakefileGenerator 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
 ** LICENSE.QPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -38,19 +36,27 @@
 #define __MAKEFILE_H__
 
 #include "option.h"
 #include "project.h"
 #include <qtextstream.h>
 
+#ifdef Q_OS_WIN32
+#define QT_POPEN _popen
+#else
+#define QT_POPEN popen
+#endif
+
 class MakefileGenerator
 {
     QString spec;
     bool init_opath_already, init_already, moc_aware, no_io;
     QStringList createObjectList(const QString &var);
     QString build_args();
-    QMap<QString, QString> depHeuristics, depKeyMap, fileFixed;
+    QString dependencyKey(const QString &file) const;
+    QMap<QString, bool> depProcessed;
+    QMap<QString, QString> depHeuristics, fileFixed;
     QMap<QString, QString> mocablesToMOC, mocablesFromMOC;
     QMap<QString, QStringList> depends;
 
 protected:
     void writeObj(QTextStream &, const QString &obj, const QString &src);
     void writeUicSrc(QTextStream &, const QString &ui);
@@ -78,13 +84,13 @@ protected:
     QString specdir();
     QString cleanFilePath(const QString &file) const;
     bool generateMocList(const QString &fn);
 
     QString findMocSource(const QString &moc_file) const;
     QString findMocDestination(const QString &src_file) const;
-    QStringList &findDependencies(const QString &file);
+    virtual QStringList &findDependencies(const QString &file);
 
     void setNoIO(bool o);
     bool noIO() const;
 
     void setMocAware(bool o);
     bool mocAware() const;
@@ -94,42 +100,49 @@ protected:
     bool writeHeader(QTextStream &);
     virtual bool writeMakefile(QTextStream &);
     virtual bool writeMakeQmake(QTextStream &);
     void initOutPaths();
     virtual void init();
 
+    //for cross-platform dependent directories
+    virtual void usePlatformDir();
+
     //for installs
     virtual QString defaultInstall(const QString &);
 
     //for prl
     bool processPrlFile(QString &);
     virtual void processPrlVariable(const QString &, const QStringList &);
     virtual void processPrlFiles();
     virtual void writePrlFile(QTextStream &);
 
     //make sure libraries are found
     virtual bool findLibraries();
+    virtual QString findDependency(const QString &);
+
+    void setProcessedDependencies(const QString &file, bool b);
+    bool processedDependencies(const QString &file);
 
-    QString var(const QString &var);
+    virtual QString var(const QString &var);
     QString varGlue(const QString &var, const QString &before, const QString &glue, const QString &after);
     QString varList(const QString &var);
     QString val(const QStringList &varList);
     QString valGlue(const QStringList &varList, const QString &before, const QString &glue, const QString &after);
     QString valList(const QStringList &varList);
 
 
     QString fileFixify(const QString& file, const QString &out_dir=QString::null, 
-                    const QString &in_dir=QString::null, bool force_fix=FALSE) const;
+                       const QString &in_dir=QString::null, bool force_fix=FALSE, bool canon=TRUE) const;
     QStringList fileFixify(const QStringList& files, const QString &out_dir=QString::null, 
-                    const QString &in_dir=QString::null, bool force_fix=FALSE) const;
+                           const QString &in_dir=QString::null, bool force_fix=FALSE, bool canon=TRUE) const;
 public:
     MakefileGenerator(QMakeProject *p);
     virtual ~MakefileGenerator();
 
     static MakefileGenerator *create(QMakeProject *);
-    bool write();
+    virtual bool write();
     virtual bool openOutput(QFile &) const;
 };
 
 inline QString MakefileGenerator::findMocSource(const QString &moc_file) const
 {
     QString tmp = cleanFilePath(moc_file);
@@ -163,11 +176,15 @@ inline bool MakefileGenerator::noIO() const
 inline QString MakefileGenerator::defaultInstall(const QString &)
 { return QString(""); }
 
 inline bool MakefileGenerator::findLibraries()
 { return TRUE; }
 
+inline QString MakefileGenerator::findDependency(const QString &)
+{ return QString(""); }
+
 inline MakefileGenerator::~MakefileGenerator()
 { }
 
+QString mkdir_p_asstring(const QString &dir);
 
 #endif /* __MAKEFILE_H__ */