From kde-commits  Tue Jan 17 17:57:15 2006
From: Alexander Neundorf <neundorf () kde ! org>
Date: Tue, 17 Jan 2006 17:57:15 +0000
To: kde-commits
Subject: branches/kdevelop/3.4/buildtools/custommakefiles
Message-Id: <1137520635.017269.26212.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=113752064609327

SVN commit 499385 by neundorf:

-improved regexp for makefile targets, see http://lists.kde.org/?l=kdevelop-devel&m=113398882810606&w=2

Alex




 M  +4 -4      customprojectpart.cpp  


--- branches/kdevelop/3.4/buildtools/custommakefiles/customprojectpart.cpp #499384:499385
@@ -802,8 +802,8 @@
       kdDebug(9025) << "could not open " << absFilename<<endl;
       return;
    }
-   QRegExp re("^([^($%.#][^)\\s]+) *:.*$");
-   re.setMinimal(true);
+   QRegExp targetRe("^ *([^\\t$.#]\\S+) *:.*$");
+   targetRe.setMinimal(true);
    
    QRegExp variablesRe("\\$\\(\\s*([^\\)\\s]+)\\s*\\)");
    QRegExp assignmentRe("^\\s*(\\S+)\\s*[:\\?]?=\\s*(\\S+)\\s*(#.*)?$");
@@ -840,9 +840,9 @@
          QString includedMakefile=includedMakefilesRe.cap(1).simplifyWhiteSpace();
          m_makefilesToParse.push(includedMakefile);
       }
-      else if (re.search(str) != -1)
+      else if (targetRe.search(str) != -1)
       {
-         QString tmpTarget=re.cap(1).simplifyWhiteSpace();
+         QString tmpTarget=targetRe.cap(1).simplifyWhiteSpace();
          if (tmpTarget.endsWith(".o"))
          {
             if (m_targetsObjectFiles.find(tmpTarget)==m_targetsObjectFiles.end())