diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-13 23:38:59 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-15 19:31:40 +0100 |
| commit | c743324292a9994e20353734846b5045199d8e93 (patch) | |
| tree | 503e4194dcf0f017b229babdfc0136dac1687adc /Repository.mk | |
| parent | 1b13c952f50aab2b907dab13395ab23d0955c238 (diff) | |
Remove the need to manually register libs in scp2
- we have all the needed information in gbuild
- reduce the amount of double and triple bookkeeping
- hopefully the generated files for scp2 are only a intermediate step
and we can do whatever perl voodoo scp2 does directly in gbuild
- currently using basctl as an example
- this also means we have to be more strict in Repository.mk with what
we register:
- if we dont build a libs, it shouldnt be registered (otherwise scp2
will want the nonexisting lib)
- in the end, this is a Good Thing(tm): we dont want anyone trying to
e.g. link against a lib we dont build
- should now hopefully work on all platforms
- added module bookkeeping to gbuild
Change-Id: I241ca67edbfabae83859274f9aa35d2d26165ef6
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index d0307f5eb011..a488a46cfd36 100644 --- a/Repository.mk +++ b/Repository.mk @@ -222,6 +222,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ endif +ifeq ($(DISABLE_SCRIPTING),) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ + basctl \ +)) +endif + $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ abp \ acc \ @@ -231,7 +237,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ agg \ analysis \ animcore \ - basctl \ $(if $(filter $(OS),ANDROID),, \ basebmp \ ) \ |