meson: Rename gtk_doc option to docs

flatpak · Dec 17, 2021 · 7a7f44e · 7a7f44e
1 parent e51ddbb
commit 7a7f44e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Check out libportal
         uses: actions/checkout@v1
       - name: Configure libportal
-        run: meson setup --prefix=/usr _build -Dbackends=gtk3 -Dgtk_doc=false
+        run: meson setup --prefix=/usr _build -Dbackends=gtk3 -Ddocs=false
       - name: Build libportal
         run: ninja -C_build
 
@@ -42,7 +42,7 @@ jobs:
       - name: Check out libportal
         uses: actions/checkout@v1
       - name: Configure libportal
-        run: meson setup --prefix=/usr _build -Dbackends=gtk3 -Dgtk_doc=false
+        run: meson setup --prefix=/usr _build -Dbackends=gtk3 -Ddocs=false
       - name: Build libportal
         run: ninja -C_build
 

diff --git a/build-aux/org.gnome.PortalTest.Gtk3.json b/build-aux/org.gnome.PortalTest.Gtk3.json
@@ -33,7 +33,7 @@
             "config-opts": [
               "-Dbackends=gtk3",
               "-Dportal-tests=true",
-              "-Dgtk_doc=false"
+              "-Ddocs=false"
             ],
             "sources": [
                 {

diff --git a/build-aux/org.gnome.PortalTest.Gtk4.json b/build-aux/org.gnome.PortalTest.Gtk4.json
@@ -18,7 +18,7 @@
             "config-opts": [
               "-Dbackends=gtk4",
               "-Dportal-tests=true",
-              "-Dgtk_doc=false"
+              "-Ddocs=false"
             ],
             "sources": [
                 {

diff --git a/build-aux/org.gnome.PortalTest.Qt5.json b/build-aux/org.gnome.PortalTest.Qt5.json
@@ -19,7 +19,7 @@
               "-Dportal-tests=true",
               "-Dintrospection=false",
               "-Dvapi=false",
-              "-Dgtk_doc=false"
+              "-Ddocs=false"
             ],
             "sources": [
                 {

diff --git a/doc/meson.build b/doc/meson.build
@@ -10,7 +10,7 @@ libportal_toml = configure_file(
 dependency('gi-docgen', version: '>= 2021.1',
            fallback: ['gi-docgen', 'dummy_dep'],
            native: true,
-           required: get_option('gtk_doc'))
+           required: get_option('docs'))
 
 gidocgen = find_program('gi-docgen')
 

diff --git a/libportal/portal-helpers.h b/libportal/portal-helpers.h
@@ -23,11 +23,9 @@
 
 G_BEGIN_DECLS
 
-#ifndef __GTK_DOC_IGNORE__
 #ifndef XDP_PUBLIC
 #define XDP_PUBLIC extern
 #endif
-#endif /* __GTK_DOC_IGNORE__ */
 
 #define XDP_TYPE_PORTAL (xdp_portal_get_type ())
 

diff --git a/meson.build b/meson.build
@@ -34,6 +34,6 @@ if get_option('portal-tests')
   subdir('portal-test')
 endif
 
-if get_option('gtk_doc')
+if get_option('docs')
   subdir('doc')
 endif
diff --git a/meson_options.txt b/meson_options.txt
@@ -6,5 +6,5 @@ option('introspection', type: 'boolean', value: true,
   description: 'Generate GObject introspection files')
 option('vapi', type: 'boolean', value: true,
   description : 'Generate Vala bindings')
-option('gtk_doc', type: 'boolean', value: true,
+option('docs', type: 'boolean', value: true,
   description : 'Build API reference with gtk-doc')