diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
| commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
| tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /xmerge | |
| parent | a16060116346533923c607bd406d3fea511b41ec (diff) | |
gbuild: "use" vs. "add":
Naming convention for gbuild methods:
- "add" is used for stuff that is logically a part of the target
(i.e. not registered at the Module, but defined in the target's makefile)
- "use" is used for stuff that is logically a different target
(i.e. it is registered at the Module, has it's own makefile, may be
in a different module than the target)
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/Jar_XMergeBridge.mk | 2 | ||||
| -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 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk index b2c7eb7dd843..a346b05bea92 100644 --- a/xmerge/Jar_XMergeBridge.mk +++ b/xmerge/Jar_XMergeBridge.mk @@ -39,7 +39,7 @@ $(eval $(call gb_Jar_set_jarclasspath,XMergeBridge,\ xmerge.jar \ )) -$(eval $(call gb_Jar_add_jars,XMergeBridge,\ +$(eval $(call gb_Jar_use_jars,XMergeBridge,\ $(OUTDIR)/bin/xmerge.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/ridl.jar \ diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk index 0c639b30a1a3..8c079a99767c 100644 --- a/xmerge/Jar_aportisdoc.mk +++ b/xmerge/Jar_aportisdoc.mk @@ -33,7 +33,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_add_jars,aportisdoc,\ +$(eval $(call gb_Jar_use_jars,aportisdoc,\ $(OUTDIR)/bin/xmerge.jar \ )) diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk index 9f71977f72b9..da2c47cf89ce 100644 --- a/xmerge/Jar_pexcel.mk +++ b/xmerge/Jar_pexcel.mk @@ -33,7 +33,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_add_jars,pexcel,\ +$(eval $(call gb_Jar_use_jars,pexcel,\ $(OUTDIR)/bin/xmerge.jar \ )) diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk index 41734b630110..35ded736d617 100644 --- a/xmerge/Jar_pocketword.mk +++ b/xmerge/Jar_pocketword.mk @@ -33,7 +33,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_add_jars,pocketword,\ +$(eval $(call gb_Jar_use_jars,pocketword,\ $(OUTDIR)/bin/xmerge.jar \ )) diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk index 241a9990e94a..27de50bf06a3 100644 --- a/xmerge/Jar_xmerge.mk +++ b/xmerge/Jar_xmerge.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Jar_Jar,xmerge)) $(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf)) -$(eval $(call gb_Jar_add_jars,xmerge,\ +$(eval $(call gb_Jar_use_jars,xmerge,\ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/jurt.jar \ |