[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sdext/source

[Andras Timar]

 sdext/source/minimizer/makefile.mk |    5 ++++-
 sdext/source/pdfimport/makefile.mk |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit f6c3626822852cef831f1aca4c33187aaaa66b0c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Dec 16 19:55:37 2011 +0100

    fix racecondition in sdext/source/pdfimport/makefile.mk
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 641e90f..d33680f 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -156,11 +156,14 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
     $(COPY) $< $@
 
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
+
+$(MISC)/descriptions : $(DESCRIPTION)
     $(COPY) description-en-US.txt $(EXTENSIONDIR)
 .IF "$(WITH_LANG)" != ""
     $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
 .ENDIF
+    $(TOUCH) $@
 
 $(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
     @@-$(MKDIRHIER) $(@:d)
commit bb8185737c1a8ece6fde51511dedc6825020a444
Author: Andras Timar <atimar at suse.com>
Date:   Mon Dec 19 15:42:04 2011 +0100

    fix racecondition in sdext/source/minimizer/makefile.mk
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/sdext/source/minimizer/makefile.mk b/sdext/source/minimizer/makefile.mk
index f28b41e..ea9e043 100644
--- a/sdext/source/minimizer/makefile.mk
+++ b/sdext/source/minimizer/makefile.mk
@@ -146,10 +146,13 @@ $(DESCRIPTION_SRC) : description.xml
     $(COPY) $< $@
 .ENDIF
 
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
+$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions
+
+$(MISC)/descriptions : $(DESCRIPTION)
     $(COPY) description-en-US.txt $(EXTENSIONDIR)
 .IF "$(WITH_LANG)" != ""
     $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR)
 .ENDIF
+    $(TOUCH) $@
 	 
 .ENDIF # L10N_framework