diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:29:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
| commit | 5032dc0fc339ba6b200e80a5482cc86e00662a0b (patch) | |
| tree | 6ecb751f6fd25a7ee5f66434b10928423d1e05f7 /slideshow | |
| parent | 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (diff) | |
gbuild: invert handling of standard system libraries:
Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.
Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/CppunitTest_slideshow.mk | 2 | ||||
| -rw-r--r-- | slideshow/Executable_demoshow.mk | 2 | ||||
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 2 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 133ae060e6fa..838fdd58dd26 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -69,8 +69,6 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,slideshow)) - $(eval $(call gb_CppunitTest_add_exception_objects,slideshow,\ slideshow/test/slidetest \ slideshow/test/testshape \ diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk index 3ed481ed774f..a31584a22f1f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -63,8 +63,6 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,demoshow)) - $(eval $(call gb_Executable_add_exception_objects,demoshow,\ slideshow/test/demoshow \ )) diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk index 012262256290..bae4d99946f8 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,OGLTrans)) - $(eval $(call gb_Library_use_external,OGLTrans,mesa_headers)) $(eval $(call gb_Library_set_componentfile,OGLTrans,slideshow/source/engine/OGLTrans/ogltrans)) diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index d065532a696c..3813ce364c14 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -65,8 +65,6 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,slideshow)) - $(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow)) $(eval $(call gb_Library_add_exception_objects,slideshow,\ |