diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-08-17 11:02:49 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-08-17 12:52:25 +0200 |
| commit | 5a4bcd3b7578523af6a2754369231ca1cf413f82 (patch) | |
| tree | 6d055022ed60cb89e8419f97610eb465a46cb91b /xmerge | |
| parent | 79c9ea3818334b39eda6996cf488143a5dc586d4 (diff) | |
gbuild: register all jars
Change-Id: I9f49970e5e06d1afd3fc066a20d1671c93e262fc
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/Jar_XMergeBridge.mk | 10 | ||||
| -rw-r--r-- | xmerge/Jar_aportisdoc.mk | 2 | ||||
| -rw-r--r-- | xmerge/Jar_pexcel.mk | 2 | ||||
| -rw-r--r-- | xmerge/Jar_pocketword.mk | 2 | ||||
| -rw-r--r-- | xmerge/Jar_xmerge.mk | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk index 5bc4c03f2d28..2b0270667ce7 100644 --- a/xmerge/Jar_XMergeBridge.mk +++ b/xmerge/Jar_XMergeBridge.mk @@ -36,11 +36,11 @@ $(eval $(call gb_Jar_set_manifest,XMergeBridge,$(SRCDIR)/xmerge/source/bridge/ma $(eval $(call gb_Jar_set_packageroot,XMergeBridge,*.class)) $(eval $(call gb_Jar_use_jars,XMergeBridge,\ - $(OUTDIR)/bin/xmerge.jar \ - $(OUTDIR)/bin/unoil.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/jurt.jar \ - $(OUTDIR)/bin/juh.jar \ + xmerge \ + unoil \ + ridl \ + jurt \ + juh \ )) $(eval $(call gb_Jar_add_sourcefiles,XMergeBridge,\ diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk index 8c079a99767c..282b339186ce 100644 --- a/xmerge/Jar_aportisdoc.mk +++ b/xmerge/Jar_aportisdoc.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR) $(eval $(call gb_Jar_set_packageroot,aportisdoc,org)) $(eval $(call gb_Jar_use_jars,aportisdoc,\ - $(OUTDIR)/bin/xmerge.jar \ + xmerge \ )) $(eval $(call gb_Jar_add_sourcefiles,aportisdoc,\ diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk index da2c47cf89ce..0f79852aa0b3 100644 --- a/xmerge/Jar_pexcel.mk +++ b/xmerge/Jar_pexcel.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xme $(eval $(call gb_Jar_set_packageroot,pexcel,org)) $(eval $(call gb_Jar_use_jars,pexcel,\ - $(OUTDIR)/bin/xmerge.jar \ + xmerge \ )) $(eval $(call gb_Jar_add_sourcefiles,pexcel,\ diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk index 35ded736d617..2aba7807438a 100644 --- a/xmerge/Jar_pocketword.mk +++ b/xmerge/Jar_pocketword.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR) $(eval $(call gb_Jar_set_packageroot,pocketword,org)) $(eval $(call gb_Jar_use_jars,pocketword,\ - $(OUTDIR)/bin/xmerge.jar \ + xmerge \ )) $(eval $(call gb_Jar_add_sourcefiles,pocketword,\ diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk index 34f644c5b546..03256d86768d 100644 --- a/xmerge/Jar_xmerge.mk +++ b/xmerge/Jar_xmerge.mk @@ -32,10 +32,10 @@ $(eval $(call gb_Jar_Jar,xmerge)) $(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf)) $(eval $(call gb_Jar_use_jars,xmerge,\ - $(OUTDIR)/bin/unoil.jar \ - $(OUTDIR)/bin/ridl.jar \ - $(OUTDIR)/bin/jurt.jar \ - $(OUTDIR)/bin/juh.jar \ + unoil \ + ridl \ + jurt \ + juh \ )) $(eval $(call gb_Jar_set_packageroot,xmerge,org)) |