[libgweather/benzea/pre-variant-backend-cleanups: 13/13] build: Move pkgconfig generation into toplevel



commit f2535854bcfe4b4cd994282bc0416bc80ff310cb
Author: Benjamin Berg <bberg redhat com>
Date:   Sun Apr 26 17:22:54 2020 +0200

    build: Move pkgconfig generation into toplevel
    
    This avoids a dependency of the data subdirectory to be included after
    the src subdirectory. This is done in preparation to support generating
    an in-memory database for the locations and being able to depend on that
    from the src subdirectory.

 data/meson.build | 18 ------------------
 meson.build      | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 02694138..88e3d2f6 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,21 +1,3 @@
-pkgconfig.generate(
-  filebase: 'gweather-3.0',
-  name: 'GWeather',
-  description: 'GWeather shared library',
-  version: meson.project_version(),
-  libraries: lib_libgweather,
-  subdirs: 'libgweather-3.0',
-  requires: [
-    'gtk+-3.0',
-  ],
-  requires_private: [
-    'gio-2.0',
-    'libsoup-2.4',
-    'libxml-2.0',
-    'geocode-glib-1.0',
-  ],
-)
-
 if enable_glade_catalog
   install_data('glade/libgweather.xml',
     install_dir: glade_catalogdir,
diff --git a/meson.build b/meson.build
index 98724ea1..9bf8e753 100644
--- a/meson.build
+++ b/meson.build
@@ -124,3 +124,21 @@ endif
 subdir('po')
 subdir('po-locations')
 meson.add_install_script('meson/meson_post_install.py')
+
+pkgconfig.generate(
+  filebase: 'gweather-3.0',
+  name: 'GWeather',
+  description: 'GWeather shared library',
+  version: meson.project_version(),
+  libraries: lib_libgweather,
+  subdirs: 'libgweather-3.0',
+  requires: [
+    'gtk+-3.0',
+  ],
+  requires_private: [
+    'gio-2.0',
+    'libsoup-2.4',
+    'libxml-2.0',
+    'geocode-glib-1.0',
+  ],
+)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]