summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-07-21 20:30:28 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-07-21 21:00:31 -0300
commit5ef73c69a3de8e94689269199b061de59d5f440a (patch)
tree7397cd9be840d676700eae23ccf4bc6e83da8c8f
parent011f1ace3bc4d6d908d658729bb7a1c350cc95c4 (diff)
autotools: Fixed errors and warnings.
Removed portability warnings from Automake. Removed *.eo.hh from BUILT_SOURCES. Fixed some redeclaration of variables. Added datarootdir and datadir to elementary.pc.in.
-rw-r--r--configure.ac2
-rw-r--r--elementary.pc.in2
-rw-r--r--src/lib/Makefile.am283
-rw-r--r--src/tests/Makefile.am2
4 files changed, 99 insertions, 190 deletions
diff --git a/configure.ac b/configure.ac
index a2553e276..697bbd7af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AH_BOTTOM([
18 18
19AC_USE_SYSTEM_EXTENSIONS 19AC_USE_SYSTEM_EXTENSIONS
20 20
21AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz]) 21AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz -Wall -Wno-portability])
22m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 22m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
23 23
24# pkg-config 24# pkg-config
diff --git a/elementary.pc.in b/elementary.pc.in
index bda788e98..4e26dec58 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -2,6 +2,8 @@ prefix=@prefix@
2exec_prefix=@exec_prefix@ 2exec_prefix=@exec_prefix@
3libdir=@libdir@ 3libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5datarootdir=@datarootdir@
6datadir=@datadir@
5pkgdatadir=@datadir@/elementary 7pkgdatadir=@datadir@/elementary
6themes=${pkgdatadir}/themes 8themes=${pkgdatadir}/themes
7eoincludedir=@datadir@/eolian/include 9eoincludedir=@datadir@/eolian/include
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index f535b9369..efff27023 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -964,194 +964,6 @@ elementaryeolianfiles_DATA = \
964 elm_web.eo \ 964 elm_web.eo \
965 elm_win.eo 965 elm_win.eo
966 966
967if HAVE_CXX11
968BUILT_SOURCES += \
969 elm_widget.eo.hh \
970 elm_container.eo.hh \
971 elm_layout.eo.hh \
972 elm_interface_scrollable.eo.hh \
973 elm_pan.eo.hh \
974 elm_frame.eo.hh \
975 elm_hover.eo.hh \
976 elm_access.eo.hh \
977 elm_actionslider.eo.hh \
978 elm_app_client.eo.hh \
979 elm_app_client_view.eo.hh \
980 elm_app_server.eo.hh \
981 elm_app_server_view.eo.hh \
982 elm_atspi_app_object.eo.hh \
983 elm_interface_atspi_accessible.eo.hh \
984 elm_interface_atspi_action.eo.hh \
985 elm_interface_atspi_component.eo.hh \
986 elm_interface_atspi_editable_text.eo.hh \
987 elm_interface_atspi_image.eo.hh \
988 elm_interface_atspi_selection.eo.hh \
989 elm_interface_atspi_text.eo.hh \
990 elm_interface_atspi_value.eo.hh \
991 elm_interface_atspi_widget.eo.hh \
992 elm_interface_atspi_widget_action.eo.hh \
993 elm_interface_atspi_window.eo.hh \
994 elm_bg.eo.hh \
995 elm_box.eo.hh \
996 elm_bubble.eo.hh \
997 elm_button.eo.hh \
998 elm_calendar.eo.hh \
999 elm_check.eo.hh \
1000 elm_clock.eo.hh \
1001 elm_colorselector.eo.hh \
1002 elm_conformant.eo.hh \
1003 elc_ctxpopup.eo.hh \
1004 elm_datetime.eo.hh \
1005 elm_dayselector.eo.hh \
1006 elm_diskselector.eo.hh \
1007 elm_entry.eo.hh \
1008 elc_fileselector.eo.hh \
1009 elc_fileselector_button.eo.hh \
1010 elc_fileselector_entry.eo.hh \
1011 elm_flipselector.eo.hh \
1012 elm_flip.eo.hh \
1013 elm_gengrid.eo.hh \
1014 elm_gengrid_pan.eo.hh \
1015 elm_genlist.eo.hh \
1016 elm_genlist_pan.eo.hh \
1017 elm_gesture_layer.eo.hh \
1018 elm_glview.eo.hh \
1019 elm_grid.eo.hh \
1020 elc_hoversel.eo.hh \
1021 elm_image.eo.hh \
1022 elm_icon.eo.hh \
1023 elm_index.eo.hh \
1024 elm_interface_fileselector.eo.hh \
1025 elm_inwin.eo.hh \
1026 elm_label.eo.hh \
1027 elm_list.eo.hh \
1028 elm_map_pan.eo.hh \
1029 elm_map.eo.hh \
1030 elm_menu.eo.hh \
1031 elc_multibuttonentry.eo.hh \
1032 elc_naviframe.eo.hh \
1033 elm_panel.eo.hh \
1034 elm_mapbuf.eo.hh \
1035 elm_notify.eo.hh \
1036 elm_panes.eo.hh \
1037 elm_photocam.eo.hh \
1038 elm_photocam_pan.eo.hh \
1039 elm_photo.eo.hh \
1040 elc_player.eo.hh \
1041 elm_plug.eo.hh \
1042 elc_popup.eo.hh \
1043 elm_prefs.eo.hh \
1044 elm_progressbar.eo.hh \
1045 elm_radio.eo.hh \
1046 elm_route.eo.hh \
1047 elm_scroller.eo.hh \
1048 elm_segment_control.eo.hh \
1049 elm_separator.eo.hh \
1050 elm_slider.eo.hh \
1051 elm_slideshow.eo.hh \
1052 elm_spinner.eo.hh \
1053 elm_systray.eo.hh \
1054 elm_table.eo.hh \
1055 elm_thumb.eo.hh \
1056 elm_toolbar.eo.hh \
1057 elm_video.eo.hh \
1058 elm_web.eo.hh \
1059 elm_win.eo.hh
1060
1061nodist_includesunstable_HEADERS = \
1062 elm_widget.eo.hh \
1063 elm_container.eo.hh \
1064 elm_layout.eo.hh \
1065 elm_interface_scrollable.eo.hh \
1066 elm_pan.eo.hh \
1067 elm_frame.eo.hh \
1068 elm_hover.eo.hh \
1069 elm_access.eo.hh \
1070 elm_actionslider.eo.hh \
1071 elm_app_client.eo.hh \
1072 elm_app_client_view.eo.hh \
1073 elm_app_server.eo.hh \
1074 elm_app_server_view.eo.hh \
1075 elm_atspi_app_object.eo.hh \
1076 elm_interface_atspi_accessible.eo.hh \
1077 elm_interface_atspi_action.eo.hh \
1078 elm_interface_atspi_component.eo.hh \
1079 elm_interface_atspi_editable_text.eo.hh \
1080 elm_interface_atspi_image.eo.hh \
1081 elm_interface_atspi_selection.eo.hh \
1082 elm_interface_atspi_text.eo.hh \
1083 elm_interface_atspi_value.eo.hh \
1084 elm_interface_atspi_widget.eo.hh \
1085 elm_interface_atspi_widget_action.eo.hh \
1086 elm_interface_atspi_window.eo.hh \
1087 elm_bg.eo.hh \
1088 elm_box.eo.hh \
1089 elm_bubble.eo.hh \
1090 elm_button.eo.hh \
1091 elm_calendar.eo.hh \
1092 elm_check.eo.hh \
1093 elm_clock.eo.hh \
1094 elm_colorselector.eo.hh \
1095 elm_conformant.eo.hh \
1096 elc_ctxpopup.eo.hh \
1097 elm_datetime.eo.hh \
1098 elm_dayselector.eo.hh \
1099 elm_diskselector.eo.hh \
1100 elm_entry.eo.hh \
1101 elc_fileselector.eo.hh \
1102 elc_fileselector_button.eo.hh \
1103 elc_fileselector_entry.eo.hh \
1104 elm_flipselector.eo.hh \
1105 elm_flip.eo.hh \
1106 elm_gengrid.eo.hh \
1107 elm_gengrid_pan.eo.hh \
1108 elm_genlist.eo.hh \
1109 elm_genlist_pan.eo.hh \
1110 elm_gesture_layer.eo.hh \
1111 elm_glview.eo.hh \
1112 elm_grid.eo.hh \
1113 elc_hoversel.eo.hh \
1114 elm_image.eo.hh \
1115 elm_icon.eo.hh \
1116 elm_index.eo.hh \
1117 elm_interface_fileselector.eo.hh \
1118 elm_inwin.eo.hh \
1119 elm_label.eo.hh \
1120 elm_list.eo.hh \
1121 elm_map_pan.eo.hh \
1122 elm_map.eo.hh \
1123 elm_menu.eo.hh \
1124 elc_multibuttonentry.eo.hh \
1125 elc_naviframe.eo.hh \
1126 elm_panel.eo.hh \
1127 elm_mapbuf.eo.hh \
1128 elm_notify.eo.hh \
1129 elm_panes.eo.hh \
1130 elm_photocam.eo.hh \
1131 elm_photocam_pan.eo.hh \
1132 elm_photo.eo.hh \
1133 elc_player.eo.hh \
1134 elm_plug.eo.hh \
1135 elc_popup.eo.hh \
1136 elm_prefs.eo.hh \
1137 elm_progressbar.eo.hh \
1138 elm_radio.eo.hh \
1139 elm_route.eo.hh \
1140 elm_scroller.eo.hh \
1141 elm_segment_control.eo.hh \
1142 elm_separator.eo.hh \
1143 elm_slider.eo.hh \
1144 elm_slideshow.eo.hh \
1145 elm_spinner.eo.hh \
1146 elm_systray.eo.hh \
1147 elm_table.eo.hh \
1148 elm_thumb.eo.hh \
1149 elm_toolbar.eo.hh \
1150 elm_video.eo.hh \
1151 elm_web.eo.hh \
1152 elm_win.eo.hh
1153endif
1154
1155EXTRA_DIST += ${elementaryeolianfiles_DATA} 967EXTRA_DIST += ${elementaryeolianfiles_DATA}
1156 968
1157nodist_includesunstable_HEADERS = \ 969nodist_includesunstable_HEADERS = \
@@ -1310,3 +1122,98 @@ nodist_includesunstable_HEADERS = \
1310 elm_web.eo.legacy.h \ 1122 elm_web.eo.legacy.h \
1311 elm_win.eo.legacy.h 1123 elm_win.eo.legacy.h
1312 1124
1125if HAVE_CXX11
1126
1127nodist_includesunstable_HEADERS += \
1128 elm_widget.eo.hh \
1129 elm_container.eo.hh \
1130 elm_layout.eo.hh \
1131 elm_interface_scrollable.eo.hh \
1132 elm_pan.eo.hh \
1133 elm_frame.eo.hh \
1134 elm_hover.eo.hh \
1135 elm_access.eo.hh \
1136 elm_actionslider.eo.hh \
1137 elm_app_client.eo.hh \
1138 elm_app_client_view.eo.hh \
1139 elm_app_server.eo.hh \
1140 elm_app_server_view.eo.hh \
1141 elm_atspi_app_object.eo.hh \
1142 elm_interface_atspi_accessible.eo.hh \
1143 elm_interface_atspi_action.eo.hh \
1144 elm_interface_atspi_component.eo.hh \
1145 elm_interface_atspi_editable_text.eo.hh \
1146 elm_interface_atspi_image.eo.hh \
1147 elm_interface_atspi_selection.eo.hh \
1148 elm_interface_atspi_text.eo.hh \
1149 elm_interface_atspi_value.eo.hh \
1150 elm_interface_atspi_widget.eo.hh \
1151 elm_interface_atspi_widget_action.eo.hh \
1152 elm_interface_atspi_window.eo.hh \
1153 elm_bg.eo.hh \
1154 elm_box.eo.hh \
1155 elm_bubble.eo.hh \
1156 elm_button.eo.hh \
1157 elm_calendar.eo.hh \
1158 elm_check.eo.hh \
1159 elm_clock.eo.hh \
1160 elm_colorselector.eo.hh \
1161 elm_conformant.eo.hh \
1162 elc_ctxpopup.eo.hh \
1163 elm_datetime.eo.hh \
1164 elm_dayselector.eo.hh \
1165 elm_diskselector.eo.hh \
1166 elm_entry.eo.hh \
1167 elc_fileselector.eo.hh \
1168 elc_fileselector_button.eo.hh \
1169 elc_fileselector_entry.eo.hh \
1170 elm_flipselector.eo.hh \
1171 elm_flip.eo.hh \
1172 elm_gengrid.eo.hh \
1173 elm_gengrid_pan.eo.hh \
1174 elm_genlist.eo.hh \
1175 elm_genlist_pan.eo.hh \
1176 elm_gesture_layer.eo.hh \
1177 elm_glview.eo.hh \
1178 elm_grid.eo.hh \
1179 elc_hoversel.eo.hh \
1180 elm_image.eo.hh \
1181 elm_icon.eo.hh \
1182 elm_index.eo.hh \
1183 elm_interface_fileselector.eo.hh \
1184 elm_inwin.eo.hh \
1185 elm_label.eo.hh \
1186 elm_list.eo.hh \
1187 elm_map_pan.eo.hh \
1188 elm_map.eo.hh \
1189 elm_menu.eo.hh \
1190 elc_multibuttonentry.eo.hh \
1191 elc_naviframe.eo.hh \
1192 elm_panel.eo.hh \
1193 elm_mapbuf.eo.hh \
1194 elm_notify.eo.hh \
1195 elm_panes.eo.hh \
1196 elm_photocam.eo.hh \
1197 elm_photocam_pan.eo.hh \
1198 elm_photo.eo.hh \
1199 elc_player.eo.hh \
1200 elm_plug.eo.hh \
1201 elc_popup.eo.hh \
1202 elm_prefs.eo.hh \
1203 elm_progressbar.eo.hh \
1204 elm_radio.eo.hh \
1205 elm_route.eo.hh \
1206 elm_scroller.eo.hh \
1207 elm_segment_control.eo.hh \
1208 elm_separator.eo.hh \
1209 elm_slider.eo.hh \
1210 elm_slideshow.eo.hh \
1211 elm_spinner.eo.hh \
1212 elm_systray.eo.hh \
1213 elm_table.eo.hh \
1214 elm_thumb.eo.hh \
1215 elm_toolbar.eo.hh \
1216 elm_video.eo.hh \
1217 elm_web.eo.hh \
1218 elm_win.eo.hh
1219endif
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index bc810b482..d4283fe21 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -101,7 +101,7 @@ elm_suite_LDADD = \
101 101
102if HAVE_CXX11 102if HAVE_CXX11
103TESTS += elm_cxx_suite 103TESTS += elm_cxx_suite
104check_PROGRAMS = elm_cxx_suite 104check_PROGRAMS += elm_cxx_suite
105 105
106elm_cxx_suite_SOURCES = elm_cxx_suite.cc 106elm_cxx_suite_SOURCES = elm_cxx_suite.cc
107elm_cxx_suite_CPPFLAGS = \ 107elm_cxx_suite_CPPFLAGS = \