diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-24 23:05:03 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-26 11:46:55 +0200 |
| commit | dd38937ba4dcfe6cdfce581ed2ac51398087e5d3 (patch) | |
| tree | 4186e63ec16ffdd99f0b725da00cf878760eddd1 | |
| parent | 599a94827e2b3957db3abf758d48ff7b3977e2f2 (diff) | |
gbuild: use include directly; it's even shorter
Change-Id: Id56efb715c9bd27b389b0fa9f38bcd0fe12ac9d4
| -rw-r--r-- | solenv/gbuild/Helper.mk | 12 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
2 files changed, 3 insertions, 13 deletions
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index fa742ce16456..377160586b82 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -95,18 +95,6 @@ define gb_Helper_get_outdir_clean_target $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1)) endef -# RepositoryExternal.mk is optional -define gb_Helper_add_repository -include $(1)/Repository.mk --include $(1)/RepositoryExternal.mk - -endef - -define gb_Helper_add_repositories -$(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo))) - -endef - define gb_Helper_init_registries gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS EXTENSIONLIBS diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 3ab221f36410..5afce294464c 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -157,7 +157,9 @@ include $(GBUILDDIR)/Helper.mk include $(GBUILDDIR)/TargetLocations.mk $(eval $(call gb_Helper_init_registries)) -$(eval $(call gb_Helper_add_repositories,$(SRCDIR))) +# RepositoryExternal.mk is optional +include $(SRCDIR)/Repository.mk +-include $(SRCDIR)/RepositoryExternal.mk gb_Library_DLLPOSTFIX := lo |