[Libreoffice-commits] core.git: 4 commits - desktop/Library_libreoffice.mk framework/source odk/CustomTarget_autodoc.mk odk/CustomTarget_classes.mk odk/CustomTarget_doxygen.mk odk/CustomTarget_javadoc.mk odk/CustomTarget_odkcommon.mk odk/Zip_odkcommon.mk odk/Zip_uno_loader_classes.mk

Fri Mar 15 06:31:24 PDT 2013

desktop/Library_libreoffice.mk             |    5 +++++
 framework/source/services/autorecovery.cxx |    2 --
 odk/CustomTarget_autodoc.mk                |    1 +
 odk/CustomTarget_classes.mk                |    2 ++
 odk/CustomTarget_doxygen.mk                |    1 +
 odk/CustomTarget_javadoc.mk                |    1 +
 odk/CustomTarget_odkcommon.mk              |    1 +
 odk/Zip_odkcommon.mk                       |    5 +++++
 odk/Zip_uno_loader_classes.mk              |    2 ++
 9 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 5d4bff48932aff38e978bce2d360b4bf740327ae
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Mar 15 14:29:52 2013 +0100

    fix deps for uno_loader_classes.zip
    
    Change-Id: I61ef0e13a38ebb82becf56ec8ae9e083571d2e53

diff --git a/odk/Zip_uno_loader_classes.mk b/odk/Zip_uno_loader_classes.mk
index a5587fe..b22aa4d 100644
--- a/odk/Zip_uno_loader_classes.mk
+++ b/odk/Zip_uno_loader_classes.mk
@@ -16,4 +16,6 @@ $(eval $(call gb_Zip_add_files,uno_loader_classes,\
 		win/unowinreg.dll \
 ))
 
+$(call gb_Zip_get_target,uno_loader_classes) : $(call gb_CustomTarget_get_target,odk/odkcommon/classes)
+
 # vim: set noet sw=4 ts=4:
commit 30534b091960bbbf9e949c2434216b2d656a14d8
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Mar 15 14:20:32 2013 +0100

    fix deps for odkcommon.zip
    
    Change-Id: I06667cbb1fe24356bb24b7781258ef2c194f0e4d

diff --git a/odk/CustomTarget_autodoc.mk b/odk/CustomTarget_autodoc.mk
index 594f106..7bb2bd8 100644
--- a/odk/CustomTarget_autodoc.mk
+++ b/odk/CustomTarget_autodoc.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/common/ref))
 
 odkcommon_ZIPLIST += docs/common/ref
+odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/common/ref/module-ix.html
 
 $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/docs/common/ref,module-ix.html))
 $(odk_WORKDIR)/docs/common/ref/module-ix.html: $(SRCDIR)/odk/pack/copying/idl_chapter_refs.txt \
diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk
index 1678247..b009a58 100644
--- a/odk/CustomTarget_classes.mk
+++ b/odk/CustomTarget_classes.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\
 ))
 
 odkcommon_ZIPLIST += classes/com/sun/star/lib/loader
+odkcommon_ZIPDEPS += $(odk_WORKDIR)/classes/java.done
+
 $(call gb_CustomTarget_get_target,odk/odkcommon/classes): $(odk_WORKDIR)/classes/java.done
 $(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader)
 	mkdir -p $(dir $@)
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 0212508..626d055 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/cpp/ref))
 
 odkcommon_ZIPLIST += docs/cpp/ref
+odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/cpp/ref/index.html
 
 CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
 
diff --git a/odk/CustomTarget_javadoc.mk b/odk/CustomTarget_javadoc.mk
index 296ecf4..3795a9a 100644
--- a/odk/CustomTarget_javadoc.mk
+++ b/odk/CustomTarget_javadoc.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/docs/java/ref))
 
 odkcommon_ZIPLIST += docs/java/ref
+odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/java/ref/index.html
 
 odk_JAVAPACKAGES := com.sun.star.comp.helper \
 	com.sun.star.lib.uno.helper \
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 03c44ab..935f3ea 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -9,6 +9,7 @@
 
 odk_WORKDIR := $(call gb_CustomTarget_get_workdir,odk/odkcommon)
 odkcommon_ZIPLIST :=
+odkcommon_ZIPDEPS :=
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon))
 
diff --git a/odk/Zip_odkcommon.mk b/odk/Zip_odkcommon.mk
index e6f6808..a68aaff 100644
--- a/odk/Zip_odkcommon.mk
+++ b/odk/Zip_odkcommon.mk
@@ -15,6 +15,11 @@ $(eval $(call gb_Zip_add_files,odkcommon,\
 
 $(eval $(call gb_Zip_add_commandoptions,odkcommon,-r))
 
+# Additional dependencies for the zip. Because we are zipping whole
+# directories, we cannot just depend on make to figure out from file
+# dependencies which custom targets need to be built.
+$(call gb_Zip_get_target,odkcommon) : $(odkcommon_ZIPDEPS)
+
 #FIXME: scp2 seems to require the zip to be in bin
 $(call gb_Zip_get_final_target,odkcommon) : $(OUTDIR)/bin/odkcommon.zip
 $(call gb_Zip_get_clean_target,odkcommon) : clean_odkcommon_zip
commit a4202d35235d409e81a7ae4768ace6c1aa80c8de
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Mar 15 05:26:50 2013 +0100

    drop unused include
    
    Change-Id: Icda3d24a67c8bbe5aafcf5c917d0f930e534c6be

diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 431b5a4..a1b38ab 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -88,8 +88,6 @@
 
 #include <fwkdllapi.h>
 
-#include <sfx2/objsh.hxx>
-
 //_______________________________________________
 // namespaces
 
commit 5bff31eb5ded4384f8297a9267ac1d5ff0fb84af
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 14 15:10:55 2013 +0100

    add missing dep on sal/types.h
    
    Change-Id: I7c3df5e82e05dc494e05a15a5f64b9f25b034f74

diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk
index dbe3e81..c18816f 100644
--- a/desktop/Library_libreoffice.mk
+++ b/desktop/Library_libreoffice.mk
@@ -9,6 +9,11 @@
 
 $(eval $(call gb_Library_Library,libreoffice))
 
+$(eval $(call gb_Library_use_packages,libreoffice,\
+	sal_generated \
+	sal_odk_headers \
+))
+
 $(eval $(call gb_Library_set_include,libreoffice,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/inc \
