[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    PATCH: am_edit
From:       Dirk Mueller <mueller () kde ! org>
Date:       2001-05-18 15:50:48
[Download RAW message or body]

Hi, 

most likely this will fix Bernd Gehrmanns problem of moc files mentioned in 
.ui files getting picked up twice. 

--- am_edit     2001/05/16 22:09:13     1.252
+++ am_edit     2001/05/18 15:47:43
@@ -261,9 +261,9 @@ sub processMakefile ($)
         $depedmocs{$program} = "";
         $important{$program} = "";
        tag_IDLFILES();             # Sorts out idl rules
-       tag_UIFILES();             # Sorts out ui rules
        tag_CLOSURE();
         tag_METASOURCES ();         # Sorts out the moc rules
+       tag_UIFILES();             # Sorts out ui rules
         if ($sources_changed{$program}) {


as tag_UIFILES removes the .ui variant from the sources line and replaces it 
with the generated .cpp file, the file gets later found by tag_METASOURCES 
where it generates a rule for it. 

swapping these two operations should fix the described problem, although I 
was unable to reproduce it. 

Patch survived a short test (kdetoys). 


Dirk

[prev in list] [next in list] [prev in thread] [next in thread]