Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Side by Side Diff: build/linux/system.gyp

Issue 153223002: Use gyp targets to link in X11 libraries instead of setting -lXfoo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | ui/ui.gyp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
10 }, { 10 }, {
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 'link_settings': { 323 'link_settings': {
324 'ldflags': [ 324 'ldflags': [
325 '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))' , 325 '<!@(pkg-config --libs-only-L --libs-only-other <(glib_packages))' ,
326 ], 326 ],
327 'libraries': [ 327 'libraries': [
328 '<!@(pkg-config --libs-only-l <(glib_packages))', 328 '<!@(pkg-config --libs-only-l <(glib_packages))',
329 ], 329 ],
330 }, 330 },
331 }], 331 }],
332 ['use_x11==1', { 332 ['use_x11==1', {
333 'link_settings': { 333 'dependencies': [ 'xtst' ],
334 'libraries': [ '-lXtst' ]
335 }
336 }], 334 }],
337 ], 335 ],
338 }, 336 },
339 { 337 {
340 'target_name': 'gnome_keyring', 338 'target_name': 'gnome_keyring',
341 'type': 'none', 339 'type': 'none',
342 'conditions': [ 340 'conditions': [
343 ['use_gnome_keyring==1', { 341 ['use_gnome_keyring==1', {
344 'direct_dependent_settings': { 342 'direct_dependent_settings': {
345 'cflags': [ 343 'cflags': [
(...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', 788 '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
791 ], 789 ],
792 'libraries': [ 790 'libraries': [
793 '<!@(pkg-config --libs-only-l x11 xi)', 791 '<!@(pkg-config --libs-only-l x11 xi)',
794 ], 792 ],
795 }, 793 },
796 }], 794 }],
797 ], 795 ],
798 }, 796 },
799 { 797 {
798 'target_name': 'xcursor',
799 'type': 'none',
800 'conditions': [
801 ['_toolset=="target"', {
piman 2014/02/04 00:25:14 nit: you don't need that conditional if you don't
802 'direct_dependent_settings': {
803 'cflags': [
804 '<!@(<(pkg-config) --cflags xcursor)',
805 ],
806 },
807 'link_settings': {
808 'ldflags': [
809 '<!@(<(pkg-config) --libs-only-L --libs-only-other xcursor)',
810 ],
811 'libraries': [
812 '<!@(<(pkg-config) --libs-only-l xcursor)',
813 ],
814 },
815 }],
816 ],
817 },
818 {
819 'target_name': 'xcomposite',
820 'type': 'none',
821 'conditions': [
822 ['_toolset=="target"', {
823 'direct_dependent_settings': {
824 'cflags': [
825 '<!@(<(pkg-config) --cflags xcomposite)',
826 ],
827 },
828 'link_settings': {
829 'ldflags': [
830 '<!@(<(pkg-config) --libs-only-L --libs-only-other xcomposite)',
831 ],
832 'libraries': [
833 '<!@(<(pkg-config) --libs-only-l xcomposite)',
834 ],
835 },
836 }],
837 ],
838 },
839 {
840 'target_name': 'xdamage',
841 'type': 'none',
842 'conditions': [
843 ['_toolset=="target"', {
844 'direct_dependent_settings': {
845 'cflags': [
846 '<!@(<(pkg-config) --cflags xdamage)',
847 ],
848 },
849 'link_settings': {
850 'ldflags': [
851 '<!@(<(pkg-config) --libs-only-L --libs-only-other xdamage)',
852 ],
853 'libraries': [
854 '<!@(<(pkg-config) --libs-only-l xdamage)',
855 ],
856 },
857 }],
858 ],
859 },
860 {
800 'target_name': 'xext', 861 'target_name': 'xext',
801 'type': 'none', 862 'type': 'none',
802 'conditions': [ 863 'conditions': [
803 ['_toolset=="target"', { 864 ['_toolset=="target"', {
804 'direct_dependent_settings': { 865 'direct_dependent_settings': {
805 'cflags': [ 866 'cflags': [
806 '<!@(<(pkg-config) --cflags xext)', 867 '<!@(<(pkg-config) --cflags xext)',
807 ], 868 ],
808 }, 869 },
809 'link_settings': { 870 'link_settings': {
(...skipping 22 matching lines...) Expand all
832 '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)', 893 '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
833 ], 894 ],
834 'libraries': [ 895 'libraries': [
835 '<!@(<(pkg-config) --libs-only-l xfixes)', 896 '<!@(<(pkg-config) --libs-only-l xfixes)',
836 ], 897 ],
837 }, 898 },
838 }], 899 }],
839 ], 900 ],
840 }, 901 },
841 { 902 {
903 'target_name': 'xi',
904 'type': 'none',
905 'conditions': [
906 ['_toolset=="target"', {
907 'direct_dependent_settings': {
908 'cflags': [
909 '<!@(<(pkg-config) --cflags xi)',
910 ],
911 },
912 'link_settings': {
913 'ldflags': [
914 '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
915 ],
916 'libraries': [
917 '<!@(<(pkg-config) --libs-only-l xi)',
918 ],
919 },
920 }],
921 ],
922 },
923 {
842 'target_name': 'xrandr', 924 'target_name': 'xrandr',
843 'type': 'none', 925 'type': 'none',
844 'toolsets': ['host', 'target'], 926 'toolsets': ['host', 'target'],
845 'conditions': [ 927 'conditions': [
846 ['_toolset=="target"', { 928 ['_toolset=="target"', {
847 'direct_dependent_settings': { 929 'direct_dependent_settings': {
848 'cflags': [ 930 'cflags': [
849 '<!@(<(pkg-config) --cflags xrandr)', 931 '<!@(<(pkg-config) --cflags xrandr)',
850 ], 932 ],
851 }, 933 },
(...skipping 15 matching lines...) Expand all
867 'ldflags': [ 949 'ldflags': [
868 '<!@(pkg-config --libs-only-L --libs-only-other xrandr)', 950 '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
869 ], 951 ],
870 'libraries': [ 952 'libraries': [
871 '<!@(pkg-config --libs-only-l xrandr)', 953 '<!@(pkg-config --libs-only-l xrandr)',
872 ], 954 ],
873 }, 955 },
874 }], 956 }],
875 ], 957 ],
876 }, 958 },
959 {
960 'target_name': 'xrender',
961 'type': 'none',
962 'conditions': [
963 ['_toolset=="target"', {
964 'direct_dependent_settings': {
965 'cflags': [
966 '<!@(<(pkg-config) --cflags xrender)',
967 ],
968 },
969 'link_settings': {
970 'ldflags': [
971 '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)',
972 ],
973 'libraries': [
974 '<!@(<(pkg-config) --libs-only-l xrender)',
975 ],
976 },
977 }],
978 ],
979 },
980 {
981 'target_name': 'xtst',
982 'type': 'none',
983 'conditions': [
984 ['_toolset=="target"', {
985 'direct_dependent_settings': {
986 'cflags': [
987 '<!@(<(pkg-config) --cflags xtst)',
988 ],
989 },
990 'link_settings': {
991 'ldflags': [
992 '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
993 ],
994 'libraries': [
995 '<!@(<(pkg-config) --libs-only-l xtst)',
996 ],
997 },
998 }],
999 ],
1000 }
877 ], 1001 ],
878 } 1002 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | ui/ui.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698