diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-18 10:50:52 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-02-18 10:51:23 +0200 |
| commit | ab2f830bbbb2a8ae2afad13b2a98df553e7196cc (patch) | |
| tree | bd075c1a24f7668d3e92fd3fa753d23b3e76a516 /extensions | |
| parent | e18942bee825f8bd1c9adf9203c1257caabac38f (diff) | |
Use gb_STDLIBS; No on-line update on non-desktop OSes
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_abp.mk | 1 | ||||
| -rw-r--r-- | extensions/Library_bib.mk | 1 | ||||
| -rw-r--r-- | extensions/Library_dbp.mk | 1 | ||||
| -rw-r--r-- | extensions/Library_pcr.mk | 1 | ||||
| -rw-r--r-- | extensions/Library_scn.mk | 1 | ||||
| -rw-r--r-- | extensions/Module_extensions.mk | 21 |
6 files changed, 18 insertions, 8 deletions
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index 8e69ebecb3dc..b751e077cab0 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Library_add_linked_libs,abp,\ tl \ utl \ vcl \ + $(gb_STDLIBS) \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index dd09e0b1f87d..ef1d30435b46 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,bib,\ cppuhelper \ cppu \ sal \ + $(gb_STDLIBS) \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 0bbe08635585..8fb95f445b09 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -72,6 +72,7 @@ $(eval $(call gb_Library_add_linked_libs,dbp,\ cppuhelper \ cppu \ sal \ + $(gb_STDLIBS) \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 9b4837ac0819..857258d7b9d9 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -57,6 +57,7 @@ $(eval $(call gb_Library_add_linked_libs,pcr,\ cppuhelper \ cppu \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,pcr,\ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index 37184d420f61..fa49f7948785 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,scn,\ cppuhelper \ cppu \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,scn,\ diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 1010e63524a0..7faa6930a2de 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_pcr \ AllLangResTarget_scn \ AllLangResTarget_upd \ - AllLangResTarget_updchk \ - Configuration_updchk \ Library_abp \ Library_bib \ Library_dbp \ @@ -43,13 +41,24 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_pcr \ Library_res \ Library_scn \ + Package_bib \ + Package_pcr \ +)) + +ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_updchk \ + Configuration_updchk \ Library_updatecheckui \ Library_updatefeed \ Library_updchk \ - Package_bib \ - Package_pcr \ )) +$(eval $(call gb_Module_add_check_targets,extensions,\ + CppunitTest_extensions_test_update \ +)) +endif + ifeq ($(OS),WNT) ifeq ($(COM),MSC) @@ -113,8 +122,4 @@ $(eval $(call gb_Module_add_targets,extensions,\ )) endif # WITH_LDAP=YES -$(eval $(call gb_Module_add_check_targets,extensions,\ - CppunitTest_extensions_test_update \ -)) - # vim:set shiftwidth=4 softtabstop=4 noexpandtab: |