diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-24 21:58:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-25 11:42:40 +0200 |
| commit | 30fc3d6cff15ceabea6e1f9c4683cd383c322d72 (patch) | |
| tree | 69f026eb0cfd6c07e22c0862db468dd08be9af7d /solenv/gbuild/TargetLocations.mk | |
| parent | 4bd53d1a8011988920a33d89b4d70b7d232bdbeb (diff) | |
gbuild: refactor Jar target to stop using OUTDIR
- gb_Jar_get_target points to layer-specific location
- remove gb_Jar_get_outdir_target
- add OXT and NONE layers
- add a rule for every installed Jar to avoid problems with conflicting
pattern rules in instdir
Change-Id: Icf11869a454a7a52791c5ae257fc5da87aa46dc2
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 040dfdf4722a..6131af1ababe 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -36,7 +36,6 @@ gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT) gb_ResTarget_get_unittest_target = \ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb -gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar # instdir target patterns @@ -121,7 +120,7 @@ gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).fileli gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT) gb_InternalUnoApi_get_target = $(WORKDIR)/InternalUnoApi/$(1).done -gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar +gb_Jar_get_target = $(call gb_Jar_get_install_target,$(1)) gb_Jar_get_classsetname = Jar/$(1) gb_JavaClassSet_get_classdir = $(WORKDIR)/JavaClassSet/$(1) gb_JavaClassSet_get_repo_target = $(WORKDIR)/JavaClassSet/$(2)/$(1).done |