From 30534b091960bbbf9e949c2434216b2d656a14d8 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Fri, 15 Mar 2013 14:20:32 +0100
Subject: fix deps for odkcommon.zip

Change-Id: I06667cbb1fe24356bb24b7781258ef2c194f0e4d
---
 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 +++++
 6 files changed, 11 insertions(+)

(limited to 'odk')

diff --git a/odk/CustomTarget_autodoc.mk b/odk/CustomTarget_autodoc.mk
index 594f10689e07..7bb2bd8a7893 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 1678247833a9..b009a5863014 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 0212508b036b..626d05519b3d 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 296ecf4aae10..3795a9ae580b 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 03c44abf0ca3..935f3ea4bab9 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 e6f6808663e3..a68aaffee679 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
-- 
cgit