diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-01 15:04:48 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-01 16:55:40 +0200 |
| commit | 0773c8c77af0ea1e884b2498ea8a5ed7d7dfa9ef (patch) | |
| tree | 912fb35511fe032f44eaba99e092c05c5d236720 /solenv | |
| parent | f45c3418d11009dbe9a78e59aa9e5fcbbdad5f91 (diff) | |
gbuild: add group NONE for jars without comp. file
This is mainly to avoid polluting instdir because these jars are only
used during build.
Change-Id: Ia5bab3155787b690bd915f3e83e6b6144715948b
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Helper.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 3130bf704baa..e0a61ccb4a83 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -120,7 +120,7 @@ gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS gb_Library_VALIDINSTALLMODULES := OOO URE WRITER gb_StaticLibrary_VALIDGROUPS := PLAINLIBS -gb_Jar_VALIDGROUPS := URE OOO OXT +gb_Jar_VALIDGROUPS := URE OOO OXT NONE $$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=)) $$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=)) diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index cdc6813502f9..17dfd3dfa09c 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -113,7 +113,7 @@ $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1)) $(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir ifneq ($(gb_RUNNABLE_INSTDIR),) -$(if $(filter-out OXT,$(call gb_Jar__get_layer,$(1))),\ +$(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\ $(call gb_Jar__Jar_package,$(1),$(call gb_Jar_get_packagename,$(1)),$(notdir $(call gb_Jar_get_target,$(1)))) \ ) endif |