From 3542247e896784bec8f5a4fc127a06da4914d3e0 Mon Sep 17 00:00:00 2001 From: Savio Sena Date: Mon, 21 Jul 2014 20:30:28 -0300 Subject: [PATCH] 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. --- legacy/elementary/configure.ac | 2 +- legacy/elementary/elementary.pc.in | 2 + legacy/elementary/src/lib/Makefile.am | 283 ++++++++---------------- legacy/elementary/src/tests/Makefile.am | 2 +- 4 files changed, 99 insertions(+), 190 deletions(-) diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index a2553e2767..697bbd7af4 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/configure.ac @@ -18,7 +18,7 @@ AH_BOTTOM([ AC_USE_SYSTEM_EXTENSIONS -AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz]) +AM_INIT_AUTOMAKE([1.6 dist-bzip2 dist-xz -Wall -Wno-portability]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # pkg-config diff --git a/legacy/elementary/elementary.pc.in b/legacy/elementary/elementary.pc.in index bda788e983..4e26dec584 100644 --- a/legacy/elementary/elementary.pc.in +++ b/legacy/elementary/elementary.pc.in @@ -2,6 +2,8 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ +datadir=@datadir@ pkgdatadir=@datadir@/elementary themes=${pkgdatadir}/themes eoincludedir=@datadir@/eolian/include diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index f535b93698..efff270233 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -964,194 +964,6 @@ elementaryeolianfiles_DATA = \ elm_web.eo \ elm_win.eo -if HAVE_CXX11 -BUILT_SOURCES += \ - elm_widget.eo.hh \ - elm_container.eo.hh \ - elm_layout.eo.hh \ - elm_interface_scrollable.eo.hh \ - elm_pan.eo.hh \ - elm_frame.eo.hh \ - elm_hover.eo.hh \ - elm_access.eo.hh \ - elm_actionslider.eo.hh \ - elm_app_client.eo.hh \ - elm_app_client_view.eo.hh \ - elm_app_server.eo.hh \ - elm_app_server_view.eo.hh \ - elm_atspi_app_object.eo.hh \ - elm_interface_atspi_accessible.eo.hh \ - elm_interface_atspi_action.eo.hh \ - elm_interface_atspi_component.eo.hh \ - elm_interface_atspi_editable_text.eo.hh \ - elm_interface_atspi_image.eo.hh \ - elm_interface_atspi_selection.eo.hh \ - elm_interface_atspi_text.eo.hh \ - elm_interface_atspi_value.eo.hh \ - elm_interface_atspi_widget.eo.hh \ - elm_interface_atspi_widget_action.eo.hh \ - elm_interface_atspi_window.eo.hh \ - elm_bg.eo.hh \ - elm_box.eo.hh \ - elm_bubble.eo.hh \ - elm_button.eo.hh \ - elm_calendar.eo.hh \ - elm_check.eo.hh \ - elm_clock.eo.hh \ - elm_colorselector.eo.hh \ - elm_conformant.eo.hh \ - elc_ctxpopup.eo.hh \ - elm_datetime.eo.hh \ - elm_dayselector.eo.hh \ - elm_diskselector.eo.hh \ - elm_entry.eo.hh \ - elc_fileselector.eo.hh \ - elc_fileselector_button.eo.hh \ - elc_fileselector_entry.eo.hh \ - elm_flipselector.eo.hh \ - elm_flip.eo.hh \ - elm_gengrid.eo.hh \ - elm_gengrid_pan.eo.hh \ - elm_genlist.eo.hh \ - elm_genlist_pan.eo.hh \ - elm_gesture_layer.eo.hh \ - elm_glview.eo.hh \ - elm_grid.eo.hh \ - elc_hoversel.eo.hh \ - elm_image.eo.hh \ - elm_icon.eo.hh \ - elm_index.eo.hh \ - elm_interface_fileselector.eo.hh \ - elm_inwin.eo.hh \ - elm_label.eo.hh \ - elm_list.eo.hh \ - elm_map_pan.eo.hh \ - elm_map.eo.hh \ - elm_menu.eo.hh \ - elc_multibuttonentry.eo.hh \ - elc_naviframe.eo.hh \ - elm_panel.eo.hh \ - elm_mapbuf.eo.hh \ - elm_notify.eo.hh \ - elm_panes.eo.hh \ - elm_photocam.eo.hh \ - elm_photocam_pan.eo.hh \ - elm_photo.eo.hh \ - elc_player.eo.hh \ - elm_plug.eo.hh \ - elc_popup.eo.hh \ - elm_prefs.eo.hh \ - elm_progressbar.eo.hh \ - elm_radio.eo.hh \ - elm_route.eo.hh \ - elm_scroller.eo.hh \ - elm_segment_control.eo.hh \ - elm_separator.eo.hh \ - elm_slider.eo.hh \ - elm_slideshow.eo.hh \ - elm_spinner.eo.hh \ - elm_systray.eo.hh \ - elm_table.eo.hh \ - elm_thumb.eo.hh \ - elm_toolbar.eo.hh \ - elm_video.eo.hh \ - elm_web.eo.hh \ - elm_win.eo.hh - -nodist_includesunstable_HEADERS = \ - elm_widget.eo.hh \ - elm_container.eo.hh \ - elm_layout.eo.hh \ - elm_interface_scrollable.eo.hh \ - elm_pan.eo.hh \ - elm_frame.eo.hh \ - elm_hover.eo.hh \ - elm_access.eo.hh \ - elm_actionslider.eo.hh \ - elm_app_client.eo.hh \ - elm_app_client_view.eo.hh \ - elm_app_server.eo.hh \ - elm_app_server_view.eo.hh \ - elm_atspi_app_object.eo.hh \ - elm_interface_atspi_accessible.eo.hh \ - elm_interface_atspi_action.eo.hh \ - elm_interface_atspi_component.eo.hh \ - elm_interface_atspi_editable_text.eo.hh \ - elm_interface_atspi_image.eo.hh \ - elm_interface_atspi_selection.eo.hh \ - elm_interface_atspi_text.eo.hh \ - elm_interface_atspi_value.eo.hh \ - elm_interface_atspi_widget.eo.hh \ - elm_interface_atspi_widget_action.eo.hh \ - elm_interface_atspi_window.eo.hh \ - elm_bg.eo.hh \ - elm_box.eo.hh \ - elm_bubble.eo.hh \ - elm_button.eo.hh \ - elm_calendar.eo.hh \ - elm_check.eo.hh \ - elm_clock.eo.hh \ - elm_colorselector.eo.hh \ - elm_conformant.eo.hh \ - elc_ctxpopup.eo.hh \ - elm_datetime.eo.hh \ - elm_dayselector.eo.hh \ - elm_diskselector.eo.hh \ - elm_entry.eo.hh \ - elc_fileselector.eo.hh \ - elc_fileselector_button.eo.hh \ - elc_fileselector_entry.eo.hh \ - elm_flipselector.eo.hh \ - elm_flip.eo.hh \ - elm_gengrid.eo.hh \ - elm_gengrid_pan.eo.hh \ - elm_genlist.eo.hh \ - elm_genlist_pan.eo.hh \ - elm_gesture_layer.eo.hh \ - elm_glview.eo.hh \ - elm_grid.eo.hh \ - elc_hoversel.eo.hh \ - elm_image.eo.hh \ - elm_icon.eo.hh \ - elm_index.eo.hh \ - elm_interface_fileselector.eo.hh \ - elm_inwin.eo.hh \ - elm_label.eo.hh \ - elm_list.eo.hh \ - elm_map_pan.eo.hh \ - elm_map.eo.hh \ - elm_menu.eo.hh \ - elc_multibuttonentry.eo.hh \ - elc_naviframe.eo.hh \ - elm_panel.eo.hh \ - elm_mapbuf.eo.hh \ - elm_notify.eo.hh \ - elm_panes.eo.hh \ - elm_photocam.eo.hh \ - elm_photocam_pan.eo.hh \ - elm_photo.eo.hh \ - elc_player.eo.hh \ - elm_plug.eo.hh \ - elc_popup.eo.hh \ - elm_prefs.eo.hh \ - elm_progressbar.eo.hh \ - elm_radio.eo.hh \ - elm_route.eo.hh \ - elm_scroller.eo.hh \ - elm_segment_control.eo.hh \ - elm_separator.eo.hh \ - elm_slider.eo.hh \ - elm_slideshow.eo.hh \ - elm_spinner.eo.hh \ - elm_systray.eo.hh \ - elm_table.eo.hh \ - elm_thumb.eo.hh \ - elm_toolbar.eo.hh \ - elm_video.eo.hh \ - elm_web.eo.hh \ - elm_win.eo.hh -endif - EXTRA_DIST += ${elementaryeolianfiles_DATA} nodist_includesunstable_HEADERS = \ @@ -1310,3 +1122,98 @@ nodist_includesunstable_HEADERS = \ elm_web.eo.legacy.h \ elm_win.eo.legacy.h +if HAVE_CXX11 + +nodist_includesunstable_HEADERS += \ + elm_widget.eo.hh \ + elm_container.eo.hh \ + elm_layout.eo.hh \ + elm_interface_scrollable.eo.hh \ + elm_pan.eo.hh \ + elm_frame.eo.hh \ + elm_hover.eo.hh \ + elm_access.eo.hh \ + elm_actionslider.eo.hh \ + elm_app_client.eo.hh \ + elm_app_client_view.eo.hh \ + elm_app_server.eo.hh \ + elm_app_server_view.eo.hh \ + elm_atspi_app_object.eo.hh \ + elm_interface_atspi_accessible.eo.hh \ + elm_interface_atspi_action.eo.hh \ + elm_interface_atspi_component.eo.hh \ + elm_interface_atspi_editable_text.eo.hh \ + elm_interface_atspi_image.eo.hh \ + elm_interface_atspi_selection.eo.hh \ + elm_interface_atspi_text.eo.hh \ + elm_interface_atspi_value.eo.hh \ + elm_interface_atspi_widget.eo.hh \ + elm_interface_atspi_widget_action.eo.hh \ + elm_interface_atspi_window.eo.hh \ + elm_bg.eo.hh \ + elm_box.eo.hh \ + elm_bubble.eo.hh \ + elm_button.eo.hh \ + elm_calendar.eo.hh \ + elm_check.eo.hh \ + elm_clock.eo.hh \ + elm_colorselector.eo.hh \ + elm_conformant.eo.hh \ + elc_ctxpopup.eo.hh \ + elm_datetime.eo.hh \ + elm_dayselector.eo.hh \ + elm_diskselector.eo.hh \ + elm_entry.eo.hh \ + elc_fileselector.eo.hh \ + elc_fileselector_button.eo.hh \ + elc_fileselector_entry.eo.hh \ + elm_flipselector.eo.hh \ + elm_flip.eo.hh \ + elm_gengrid.eo.hh \ + elm_gengrid_pan.eo.hh \ + elm_genlist.eo.hh \ + elm_genlist_pan.eo.hh \ + elm_gesture_layer.eo.hh \ + elm_glview.eo.hh \ + elm_grid.eo.hh \ + elc_hoversel.eo.hh \ + elm_image.eo.hh \ + elm_icon.eo.hh \ + elm_index.eo.hh \ + elm_interface_fileselector.eo.hh \ + elm_inwin.eo.hh \ + elm_label.eo.hh \ + elm_list.eo.hh \ + elm_map_pan.eo.hh \ + elm_map.eo.hh \ + elm_menu.eo.hh \ + elc_multibuttonentry.eo.hh \ + elc_naviframe.eo.hh \ + elm_panel.eo.hh \ + elm_mapbuf.eo.hh \ + elm_notify.eo.hh \ + elm_panes.eo.hh \ + elm_photocam.eo.hh \ + elm_photocam_pan.eo.hh \ + elm_photo.eo.hh \ + elc_player.eo.hh \ + elm_plug.eo.hh \ + elc_popup.eo.hh \ + elm_prefs.eo.hh \ + elm_progressbar.eo.hh \ + elm_radio.eo.hh \ + elm_route.eo.hh \ + elm_scroller.eo.hh \ + elm_segment_control.eo.hh \ + elm_separator.eo.hh \ + elm_slider.eo.hh \ + elm_slideshow.eo.hh \ + elm_spinner.eo.hh \ + elm_systray.eo.hh \ + elm_table.eo.hh \ + elm_thumb.eo.hh \ + elm_toolbar.eo.hh \ + elm_video.eo.hh \ + elm_web.eo.hh \ + elm_win.eo.hh +endif diff --git a/legacy/elementary/src/tests/Makefile.am b/legacy/elementary/src/tests/Makefile.am index bc810b4824..d4283fe214 100644 --- a/legacy/elementary/src/tests/Makefile.am +++ b/legacy/elementary/src/tests/Makefile.am @@ -101,7 +101,7 @@ elm_suite_LDADD = \ if HAVE_CXX11 TESTS += elm_cxx_suite -check_PROGRAMS = elm_cxx_suite +check_PROGRAMS += elm_cxx_suite elm_cxx_suite_SOURCES = elm_cxx_suite.cc elm_cxx_suite_CPPFLAGS = \