summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-12-17 23:17:45 +0100
committerMichael Stahl <mstahl@redhat.com>2011-12-17 23:17:45 +0100
commit67d72f4c2d9163dcef8b6fc51368fdeed6af201b (patch)
tree44a464885af6906e9ed5b487cf2a93d9f5d3c33c
parentbee2690663cff923d1aa67b2b8e561ee6ca7457c (diff)
extensions: tweak spotlight makefiles
-rw-r--r--Repository.mk8
-rw-r--r--extensions/Zip_mdibundle.mk10
2 files changed, 12 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk
index e065c511684d..42960c6f46bd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -103,6 +103,14 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif # WITH_MOZILLA
+ifeq ($(OS),MACOSX)
+
+$(eval $(call gb_Helper_register_libraries,NONE, \
+ OOoSpotlightImporter \
+))
+
+endif
+
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
PptImporter \
adabas \
diff --git a/extensions/Zip_mdibundle.mk b/extensions/Zip_mdibundle.mk
index 56e9b727c151..b6ebf08ee021 100644
--- a/extensions/Zip_mdibundle.mk
+++ b/extensions/Zip_mdibundle.mk
@@ -28,13 +28,11 @@
# instead of those above.
#
-MDISRC := $(SRCDIR)/extensions/source/macosx/spotlight/mdimporter
-
$(eval $(call gb_Zip_Zip,mdibundle,$(WORKDIR)/Zip/mdibundle))
-$(eval $(call gb_Zip_add_file,mdibundle,schema.xml,$(MDISRC)/schema.xml))
-$(eval $(call gb_Zip_add_file,mdibundle,Info.plist,$(MDISRC)/Info.plist))
-$(eval $(call gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(MDISRC)/en.lproj/schema.strings))
-$(eval $(call gb_Zip_add_file,mdibundle,OOoSpotlightImporter,$(OUTDIR)/bin/OOoSpotlightImporter))
+$(eval $(call gb_Zip_add_file,mdibundle,schema.xml,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/schema.xml))
+$(eval $(call gb_Zip_add_file,mdibundle,Info.plist,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/Info.plist))
+$(eval $(call gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/en.lproj/schema.strings))
+$(eval $(call gb_Zip_add_file,mdibundle,MacOS/OOoSpotlightImporter,$(OUTDIR)/lib/libOOoSpotlightImporter.dylib))
# vim:set shiftwidth=4 softtabstop=4 expandtab: