diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:37:10 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:37:10 +0200 |
| commit | c3dc8ab4ccf3370bf3903760bd46212a5a820c51 (patch) | |
| tree | ab39c625e9382807ee637547d393b2450d11d42f | |
| parent | a95376174ec70c4a75569ce6dafacb0f696b21bc (diff) | |
| parent | cdc123f616cbbec1e7df3f8f2bc0a515203c364d (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/bootstrap
| -rw-r--r-- | Repository.mk | 4 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 24 | ||||
| -rw-r--r-- | RepositoryModule_ooo.mk | 5 | ||||
| -rwxr-xr-x | solenv/bin/create-ids | 2 | ||||
| -rwxr-xr-x | solenv/bin/create-tags | 2 |
5 files changed, 34 insertions, 3 deletions
diff --git a/Repository.mk b/Repository.mk index 94d4b7dbee34..be48a4cec074 100644 --- a/Repository.mk +++ b/Repository.mk @@ -45,9 +45,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ agg \ + analysis \ animcore \ + basctl \ basebmp \ canvastools \ + date \ forui \ odbc \ odbcbase \ @@ -106,6 +109,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sfx \ sm \ smd \ + solver \ sot \ spa \ svl \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 795e553cf65f..0eb3f61c7ef5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -437,6 +437,30 @@ endef endif # SYSTEM_OPENSSL + +ifeq ($(SYSTEM_LPSOLVE),YES) + +define gb_LinkTarget__use_lpsolve55 +$(call gb_LinkTarget_add_libs,$(1),-llpsolve55) + +endef + +else # !SYSTEM_LPSOLVE + +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + lpsolve55 \ +)) + +define gb_LinkTarget__use_lpsolve55 +$(call gb_LinkTarget_add_linked_libs,$(1),\ + lpsolve55 \ +) + +endef + +endif # SYSTEM_LPSOLVE + + define gb_LinkTarget__use_gtk $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 98758f35cb7d..95253e946ac1 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -28,7 +28,8 @@ $(eval $(call gb_Module_Module,ooo)) $(eval $(call gb_Module_add_moduledirs,ooo,\ - animations \ + animations \ + basctl \ chart2 \ comphelper \ cui \ @@ -46,6 +47,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ oox \ padmin \ sc \ + scaddins \ + sccomp \ sd \ sfx2 \ slideshow \ diff --git a/solenv/bin/create-ids b/solenv/bin/create-ids index 868d88526c76..7567e857f5e9 100755 --- a/solenv/bin/create-ids +++ b/solenv/bin/create-ids @@ -2,7 +2,7 @@ # create ID file for the whole LibO tree. run it in toplevel dir -. ./*.Set.sh +. ./Env.Host.sh dirs="*/$INPATH/inc */$INPATH/misc/build `ls -d */* | sed -e '/\(clone\/\|\/\(common\|unxlng\|unxsol\|unxmac\|wntmsc\|Jamfile\|cscope\.\|tags\|ID\)\)\|^solver\//d'`" mkid --lang-map=`dirname $0`/id-lang.map --include='C C++ asm perl make' --statistics $dirs diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags index 12280f62101c..c93bcd9bf52c 100755 --- a/solenv/bin/create-tags +++ b/solenv/bin/create-tags @@ -1,6 +1,6 @@ #!/usr/bin/env sh -. ./*.Set.sh +. ./Env.Host.sh omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q" ctags -h "+.hdl.hrc" --langmap=c:+.hdl.hrc.src $omnicppoptions \ |