summaryrefslogtreecommitdiff
path: root/xmerge
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2011-10-22 16:54:01 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2011-10-23 13:20:29 +0200
commitc77a9254dde41f222bc65af957c91fa5bc166103 (patch)
treee3b00ea22e19b9fa509e750a6af5beff3d3946d2 /xmerge
parenteba6bc1b985c6caede347e48d636fd161b6413c0 (diff)
no need for SRCDIR parameter here
Diffstat (limited to 'xmerge')
-rw-r--r--xmerge/Jar_XMergeBridge.mk2
-rw-r--r--xmerge/Jar_aportisdoc.mk2
-rw-r--r--xmerge/Jar_htmlsoff.mk2
-rw-r--r--xmerge/Jar_pexcel.mk2
-rw-r--r--xmerge/Jar_pocketword.mk2
-rw-r--r--xmerge/Jar_xmerge.mk2
6 files changed, 6 insertions, 6 deletions
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk
index 858b0e47da28..b2c7eb7dd843 100644
--- a/xmerge/Jar_XMergeBridge.mk
+++ b/xmerge/Jar_XMergeBridge.mk
@@ -27,7 +27,7 @@
# instead of those above.
#
-$(eval $(call gb_Jar_Jar,XMergeBridge,SRCDIR))
+$(eval $(call gb_Jar_Jar,XMergeBridge))
$(eval $(call gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO))
diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk
index f9a13e8b4dd7..70b8b0de6b40 100644
--- a/xmerge/Jar_aportisdoc.mk
+++ b/xmerge/Jar_aportisdoc.mk
@@ -27,7 +27,7 @@
# instead of those above.
#
-$(eval $(call gb_Jar_Jar,aportisdoc,SRCDIR))
+$(eval $(call gb_Jar_Jar,aportisdoc))
$(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR)/xmerge/source/aportisdoc/converter.xml))
diff --git a/xmerge/Jar_htmlsoff.mk b/xmerge/Jar_htmlsoff.mk
index 501e77415b97..fca57f670e9f 100644
--- a/xmerge/Jar_htmlsoff.mk
+++ b/xmerge/Jar_htmlsoff.mk
@@ -27,7 +27,7 @@
# instead of those above.
#
-$(eval $(call gb_Jar_Jar,htmlsoff,SRCDIR))
+$(eval $(call gb_Jar_Jar,htmlsoff))
$(eval $(call gb_Jar_add_packagefile,htmlsoff,META-INF/converter.xml,$(SRCDIR)/xmerge/source/htmlsoff/converter.xml))
$(eval $(call gb_Jar_add_packagefile,htmlsoff,htmltosoff.xsl,$(SRCDIR)/xmerge/source/htmlsoff/htmltosoff.xsl))
diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk
index 8f18b3363ea5..c3f4758323c7 100644
--- a/xmerge/Jar_pexcel.mk
+++ b/xmerge/Jar_pexcel.mk
@@ -27,7 +27,7 @@
# instead of those above.
#
-$(eval $(call gb_Jar_Jar,pexcel,SRCDIR))
+$(eval $(call gb_Jar_Jar,pexcel))
$(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pexcel/converter.xml))
diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk
index ecbfe8efaaf0..74038381aee9 100644
--- a/xmerge/Jar_pocketword.mk
+++ b/xmerge/Jar_pocketword.mk
@@ -27,7 +27,7 @@
# instead of those above.
#
-$(eval $(call gb_Jar_Jar,pocketword,SRCDIR))
+$(eval $(call gb_Jar_Jar,pocketword))
$(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pocketword/converter.xml))
diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk
index 943f8b5045b4..2846d4c0000e 100644
--- a/xmerge/Jar_xmerge.mk
+++ b/xmerge/Jar_xmerge.mk
@@ -27,7 +27,7 @@
# instead of those above.
#
-$(eval $(call gb_Jar_Jar,xmerge,SRCDIR))
+$(eval $(call gb_Jar_Jar,xmerge))
$(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))