diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 00:18:12 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-01 13:54:30 +0200 |
| commit | ecddbecedccf2bf67e569544854c6fbd1269dd88 (patch) | |
| tree | dec5ee6778bb373f5ea12d1126f9df967e26cc09 /shell | |
| parent | 4ad9285d302ee820d9ab1ea759497423ae9ec022 (diff) | |
gbuild: clean up Mac OS X framework handling:
There are currently 3 different mechanisms being used for frameworks,
which is of course intolerable so we invent a 4th one and standardize on
it: gb_LinkTarget_use_darwin_frameworks
(This doesn't mean using add_libs or externals was wrong, it was just
inconsistent... and i don't see an obvious benefit of using externals here)
Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Library_localebe.mk | 6 | ||||
| -rw-r--r-- | shell/Library_macbe.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk index 96022b731a24..0cefa0b8908f 100644 --- a/shell/Library_localebe.mk +++ b/shell/Library_localebe.mk @@ -30,9 +30,9 @@ $(eval $(call gb_Library_Library,localebe1)) $(eval $(call gb_Library_use_sdk_api,localebe1)) ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_use_externals,localebe1,\ - corefoundation \ - coreservices \ +$(eval $(call gb_Library_use_system_darwin_frameworks,localebe1,\ + CoreFoundation \ + CoreServices \ )) endif diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk index 236cc6ce6e0a..6746fc0bffb8 100644 --- a/shell/Library_macbe.mk +++ b/shell/Library_macbe.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,macbe1)) $(eval $(call gb_Library_use_sdk_api,macbe1)) -$(eval $(call gb_Library_use_externals,macbe1,\ - cocoa \ - systemconfiguration \ +$(eval $(call gb_Library_use_system_darwin_frameworks,macbe1,\ + Cocoa \ + SystemConfiguration \ )) $(eval $(call gb_Library_use_libraries,macbe1,\ |