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

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: address feedback, try to fix cros_x86 gyp error 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') | no next file with comments »
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 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)', 790 '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
791 ], 791 ],
792 'libraries': [ 792 'libraries': [
793 '<!@(pkg-config --libs-only-l x11 xi)', 793 '<!@(pkg-config --libs-only-l x11 xi)',
794 ], 794 ],
795 }, 795 },
796 }], 796 }],
797 ], 797 ],
798 }, 798 },
799 { 799 {
800 'target_name': 'xcursor',
801 'type': 'none',
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 'target_name': 'xcomposite',
818 'type': 'none',
819 'direct_dependent_settings': {
820 'cflags': [
821 '<!@(<(pkg-config) --cflags xcomposite)',
822 ],
823 },
824 'link_settings': {
825 'ldflags': [
826 '<!@(<(pkg-config) --libs-only-L --libs-only-other xcomposite)',
827 ],
828 'libraries': [
829 '<!@(<(pkg-config) --libs-only-l xcomposite)',
830 ],
831 },
832 },
833 {
834 'target_name': 'xdamage',
835 'type': 'none',
836 'direct_dependent_settings': {
837 'cflags': [
838 '<!@(<(pkg-config) --cflags xdamage)',
839 ],
840 },
841 'link_settings': {
842 'ldflags': [
843 '<!@(<(pkg-config) --libs-only-L --libs-only-other xdamage)',
844 ],
845 'libraries': [
846 '<!@(<(pkg-config) --libs-only-l xdamage)',
847 ],
848 },
849 },
850 {
800 'target_name': 'xext', 851 'target_name': 'xext',
801 'type': 'none', 852 'type': 'none',
802 'conditions': [ 853 'direct_dependent_settings': {
803 ['_toolset=="target"', { 854 'cflags': [
804 'direct_dependent_settings': { 855 '<!@(<(pkg-config) --cflags xext)',
805 'cflags': [ 856 ],
806 '<!@(<(pkg-config) --cflags xext)', 857 },
807 ], 858 'link_settings': {
808 }, 859 'ldflags': [
809 'link_settings': { 860 '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)',
810 'ldflags': [ 861 ],
811 '<!@(<(pkg-config) --libs-only-L --libs-only-other xext)', 862 'libraries': [
812 ], 863 '<!@(<(pkg-config) --libs-only-l xext)',
813 'libraries': [ 864 ],
814 '<!@(<(pkg-config) --libs-only-l xext)', 865 },
815 ],
816 },
817 }],
818 ],
819 }, 866 },
820 { 867 {
821 'target_name': 'xfixes', 868 'target_name': 'xfixes',
822 'type': 'none', 869 'type': 'none',
823 'conditions': [ 870 'direct_dependent_settings': {
824 ['_toolset=="target"', { 871 'cflags': [
825 'direct_dependent_settings': { 872 '<!@(<(pkg-config) --cflags xfixes)',
826 'cflags': [ 873 ],
827 '<!@(<(pkg-config) --cflags xfixes)', 874 },
828 ], 875 'link_settings': {
829 }, 876 'ldflags': [
830 'link_settings': { 877 '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)',
831 'ldflags': [ 878 ],
832 '<!@(<(pkg-config) --libs-only-L --libs-only-other xfixes)', 879 'libraries': [
833 ], 880 '<!@(<(pkg-config) --libs-only-l xfixes)',
834 'libraries': [ 881 ],
835 '<!@(<(pkg-config) --libs-only-l xfixes)', 882 },
836 ], 883 },
837 }, 884 {
838 }], 885 'target_name': 'xi',
839 ], 886 'type': 'none',
887 'direct_dependent_settings': {
888 'cflags': [
889 '<!@(<(pkg-config) --cflags xi)',
890 ],
891 },
892 'link_settings': {
893 'ldflags': [
894 '<!@(<(pkg-config) --libs-only-L --libs-only-other xi)',
895 ],
896 'libraries': [
897 '<!@(<(pkg-config) --libs-only-l xi)',
898 ],
899 },
840 }, 900 },
841 { 901 {
842 'target_name': 'xrandr', 902 'target_name': 'xrandr',
843 'type': 'none', 903 'type': 'none',
844 'toolsets': ['host', 'target'], 904 'toolsets': ['host', 'target'],
845 'conditions': [ 905 'conditions': [
846 ['_toolset=="target"', { 906 ['_toolset=="target"', {
847 'direct_dependent_settings': { 907 'direct_dependent_settings': {
848 'cflags': [ 908 'cflags': [
849 '<!@(<(pkg-config) --cflags xrandr)', 909 '<!@(<(pkg-config) --cflags xrandr)',
(...skipping 17 matching lines...) Expand all
867 'ldflags': [ 927 'ldflags': [
868 '<!@(pkg-config --libs-only-L --libs-only-other xrandr)', 928 '<!@(pkg-config --libs-only-L --libs-only-other xrandr)',
869 ], 929 ],
870 'libraries': [ 930 'libraries': [
871 '<!@(pkg-config --libs-only-l xrandr)', 931 '<!@(pkg-config --libs-only-l xrandr)',
872 ], 932 ],
873 }, 933 },
874 }], 934 }],
875 ], 935 ],
876 }, 936 },
937 {
938 'target_name': 'xrender',
939 'type': 'none',
940 'direct_dependent_settings': {
941 'cflags': [
942 '<!@(<(pkg-config) --cflags xrender)',
943 ],
944 },
945 'link_settings': {
946 'ldflags': [
947 '<!@(<(pkg-config) --libs-only-L --libs-only-other xrender)',
948 ],
949 'libraries': [
950 '<!@(<(pkg-config) --libs-only-l xrender)',
951 ],
952 },
953 },
954 {
955 'target_name': 'xtst',
956 'type': 'none',
957 'direct_dependent_settings': {
958 'cflags': [
959 '<!@(<(pkg-config) --cflags xtst)',
960 ],
961 },
962 'link_settings': {
963 'ldflags': [
964 '<!@(<(pkg-config) --libs-only-L --libs-only-other xtst)',
965 ],
966 'libraries': [
967 '<!@(<(pkg-config) --libs-only-l xtst)',
968 ],
969 },
970 }
877 ], 971 ],
878 } 972 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698