diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 00:54:49 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:07 +0200 |
commit | 967986b86184ee4bcd04ff4b98829d8fa73a15a5 (patch) | |
tree | 512c433959b06646c931cbe278363415b276648d /vcl | |
parent | gbuild: clean up Mac OS X framework handling: (diff) | |
download | core-967986b86184ee4bcd04ff4b98829d8fa73a15a5.tar.gz core-967986b86184ee4bcd04ff4b98829d8fa73a15a5.zip |
gbuild: gb_Library_PLAINLIBS_NONE cleanup for Mac
Change-Id: I66f8229e186e312ed3242695db9ef0768ab4d9a0
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_desktop_detector.mk | 9 | ||||
-rw-r--r-- | vcl/Library_vcl.mk | 12 | ||||
-rw-r--r-- | vcl/Library_vclplug_gen.mk | 8 | ||||
-rw-r--r-- | vcl/Library_vclplug_gtk.mk | 9 | ||||
-rw-r--r-- | vcl/Library_vclplug_gtk3.mk | 9 | ||||
-rw-r--r-- | vcl/Library_vclplug_kde.mk | 9 | ||||
-rw-r--r-- | vcl/Library_vclplug_kde4.mk | 9 | ||||
-rw-r--r-- | vcl/Library_vclplug_svp.mk | 9 | ||||
-rw-r--r-- | vcl/Library_vclplug_tde.mk | 9 |
9 files changed, 45 insertions, 38 deletions
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk index af8578988c34..a155c3e0d281 100644 --- a/vcl/Library_desktop_detector.mk +++ b/vcl/Library_desktop_detector.mk @@ -73,10 +73,11 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,desktop_detector,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,desktop_detector,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 194ef1c4bdd0..341439ab23fe 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -84,8 +84,8 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(eval $(call gb_Library_add_standard_system_libs,vcl)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_libraries,vcl,\ - objc \ +$(eval $(call gb_Library_add_libs,vcl,\ + -lobjc \ )) endif @@ -666,10 +666,10 @@ endif endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vcl,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vcl,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index d9a9d236944c..67a440b18e54 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -151,10 +151,10 @@ endif endif # USE_XINERAMA ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gen,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gen,\ + -lm \ + -ldl \ + -lpthread \ )) endif diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 2d3b46eaa686..42ea2a485495 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -111,10 +111,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ endif ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gtk,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gtk,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 138904a0a004..b906fcf64bd5 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -115,10 +115,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 7aa5ee5e230b..bfcf782345b4 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_kde,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_kde,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index 3fbb80319a80..9fd110fc506b 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_kde4,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_kde4,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk index 63c9d725af73..750342c3225b 100644 --- a/vcl/Library_vclplug_svp.mk +++ b/vcl/Library_vclplug_svp.mk @@ -78,10 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_svp,\ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_svp,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_svp,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index 5e61c6315d7a..a55b8dd8025a 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -92,10 +92,11 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_tde,\ $(eval $(call gb_Library_set_warnings_not_errors,vclplug_tde)) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_use_libraries,vclplug_tde,\ - dl \ - m \ - pthread \ +$(eval $(call gb_Library_add_libs,vclplug_tde,\ + -lm \ + -ldl \ + -lpthread \ )) endif + # vim: set noet sw=4 ts=4: |