summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-07-19 12:45:13 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2017-07-19 13:01:24 +0100
commit5cd4856c207e169aa535a9e32f3361b61af639b2 (patch)
tree9bf3a52b9de6948cffabaccae462f8cf46d79733
parentb27f8c42af5fe6a5b0cfa2d500921cbe1356828a (diff)
downloadgeocode-glib-5cd4856c207e169aa535a9e32f3361b61af639b2.tar.gz
Replace symbols file with a map
Map files are easier to maintain than flat symbols files.
-rw-r--r--geocode-glib/geocode-glib.map8
-rw-r--r--geocode-glib/geocode-glib.symbols102
-rw-r--r--geocode-glib/meson.build6
3 files changed, 11 insertions, 105 deletions
diff --git a/geocode-glib/geocode-glib.map b/geocode-glib/geocode-glib.map
new file mode 100644
index 0000000..d5498ad
--- /dev/null
+++ b/geocode-glib/geocode-glib.map
@@ -0,0 +1,8 @@
+{
+ global:
+ geocode_*;
+ _geocode_parse_search_json;
+
+ local:
+ *;
+};
diff --git a/geocode-glib/geocode-glib.symbols b/geocode-glib/geocode-glib.symbols
deleted file mode 100644
index c0be4f3..0000000
--- a/geocode-glib/geocode-glib.symbols
+++ /dev/null
@@ -1,102 +0,0 @@
-geocode_location_get_type
-geocode_location_crs_get_type
-geocode_location_uri_scheme_get_type
-geocode_location_new
-geocode_location_new_with_description
-geocode_location_set_from_uri
-geocode_location_to_uri
-geocode_location_equal
-geocode_location_get_accuracy
-geocode_location_get_description
-geocode_location_get_distance_from
-geocode_location_get_latitude
-geocode_location_get_longitude
-geocode_location_get_altitude
-geocode_location_get_crs
-geocode_location_get_timestamp
-geocode_location_set_description
-geocode_forward_get_type
-geocode_forward_new_for_string
-geocode_forward_new_for_params
-geocode_forward_get_answer_count
-geocode_forward_set_answer_count
-geocode_forward_get_search_area
-geocode_forward_set_search_area
-geocode_forward_get_bounded
-geocode_forward_set_bounded
-geocode_forward_search_async
-geocode_forward_search_finish
-geocode_forward_search
-geocode_forward_set_backend
-geocode_reverse_get_type
-geocode_reverse_new_for_location
-geocode_reverse_resolve_async
-geocode_reverse_resolve_finish
-geocode_reverse_resolve
-geocode_reverse_set_backend
-geocode_error_quark
-geocode_error_get_type
-_geocode_parse_search_json
-geocode_place_get_type
-geocode_place_type_get_type
-geocode_place_osm_type_get_type
-geocode_place_new
-geocode_place_new_with_location
-geocode_place_equal
-geocode_place_get_area
-geocode_place_set_area
-geocode_place_get_building
-geocode_place_set_building
-geocode_place_get_name
-geocode_place_set_name
-geocode_place_get_place_type
-geocode_place_set_location
-geocode_place_get_location
-geocode_place_set_street
-geocode_place_get_street
-geocode_place_set_street_address
-geocode_place_get_street_address
-geocode_place_set_postal_code
-geocode_place_get_postal_code
-geocode_place_set_town
-geocode_place_get_town
-geocode_place_set_county
-geocode_place_get_county
-geocode_place_set_state
-geocode_place_get_state
-geocode_place_set_administrative_area
-geocode_place_get_administrative_area
-geocode_place_set_country_code
-geocode_place_get_country_code
-geocode_place_set_country
-geocode_place_get_country
-geocode_place_set_continent
-geocode_place_get_continent
-geocode_place_get_icon
-geocode_place_get_bounding_box
-geocode_place_set_bounding_box
-geocode_place_get_osm_id
-geocode_place_get_osm_type
-geocode_bounding_box_get_type
-geocode_bounding_box_new
-geocode_bounding_box_equal
-geocode_bounding_box_get_top
-geocode_bounding_box_get_bottom
-geocode_bounding_box_get_left
-geocode_bounding_box_get_right
-geocode_backend_get_type
-geocode_backend_forward_search_async
-geocode_backend_forward_search_finish
-geocode_backend_forward_search
-geocode_backend_reverse_resolve_async
-geocode_backend_reverse_resolve_finish
-geocode_backend_reverse_resolve
-geocode_mock_backend_add_forward_result
-geocode_mock_backend_add_reverse_result
-geocode_mock_backend_clear
-geocode_mock_backend_get_query_log
-geocode_mock_backend_get_type
-geocode_mock_backend_new
-geocode_nominatim_get_gnome
-geocode_nominatim_get_type
-geocode_nominatim_new
diff --git a/geocode-glib/meson.build b/geocode-glib/meson.build
index 8ccffca..8bc2bfc 100644
--- a/geocode-glib/meson.build
+++ b/geocode-glib/meson.build
@@ -42,14 +42,14 @@ if libm.found()
endif
include = include_directories('..')
-exports_file = join_paths(meson.current_source_dir(), 'geocode-glib.symbols')
-link_args = '-export-symbols ' + exports_file
+gclib_map = join_paths(meson.current_source_dir(), 'geocode-glib.map')
libgcglib = shared_library('geocode-glib',
sources,
dependencies: deps,
include_directories: include,
- link_args: link_args,
+ link_depends: gclib_map,
+ link_args: [ '-Wl,--version-script,' + gclib_map ],
soversion: '0',
version: '0.0.0',
install: true)