diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-27 00:49:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:06 +0200 |
| commit | b85c34978356eb01311f197f00f4dd5f808e3664 (patch) | |
| tree | 7bd759b1b780bb0433609e18736fc6a6816ac19f /slideshow | |
| parent | 2e677c39818f3a6479ac9103ac9c7e8ef985eeb0 (diff) | |
gbuild: replace direct gb_STDLIBS use with ...
... new gb_LinkTarget_add_standard_system_libs
Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/CppunitTest_slideshow.mk | 3 | ||||
| -rw-r--r-- | slideshow/Executable_demoshow.mk | 3 | ||||
| -rw-r--r-- | slideshow/Library_OGLTrans.mk | 3 | ||||
| -rw-r--r-- | slideshow/Library_slideshow.mk | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk index 42be84b0d0f6..133ae060e6fa 100644 --- a/slideshow/CppunitTest_slideshow.mk +++ b/slideshow/CppunitTest_slideshow.mk @@ -67,9 +67,10 @@ $(eval $(call gb_CppunitTest_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 86d14c4b3106..3ed481ed774f 100644 --- a/slideshow/Executable_demoshow.mk +++ b/slideshow/Executable_demoshow.mk @@ -61,9 +61,10 @@ $(eval $(call gb_Executable_use_libraries,demoshow,\ ucbhelper \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 199699fd24cd..380f935d9e0e 100644 --- a/slideshow/Library_OGLTrans.mk +++ b/slideshow/Library_OGLTrans.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,OGLTrans,\ sal \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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 22b6f5d6bfd6..d065532a696c 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -63,9 +63,10 @@ $(eval $(call gb_Library_use_libraries,slideshow,\ utl \ vcl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(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,\ |