[network-manager-applet/lr/libnma: 1/2] all: everything but libnma alone
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/libnma: 1/2] all: everything but libnma alone
- Date: Mon, 14 Oct 2019 08:26:26 +0000 (UTC)
commit 8f2681b36719f43bc94037cb6a981633428dc648
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Oct 11 18:05:10 2019 +0200
all: everything but libnma alone
.gitignore | 71 +-
.gitlab-ci.yml | 66 +-
Makefile.am | 1035 ++----
autogen.sh | 2 +-
config.h.meson | 9 -
configure.ac | 123 +-
icons/16/nm-device-wired.png | Bin 473 -> 0 bytes
icons/16/nm-no-connection.png | Bin 601 -> 0 bytes
icons/16/nm-vpn-standalone-lock.png | Bin 595 -> 0 bytes
icons/22/nm-adhoc.png | Bin 748 -> 0 bytes
icons/22/nm-device-wired-secure.png | Bin 945 -> 0 bytes
icons/22/nm-device-wired.png | Bin 672 -> 0 bytes
icons/22/nm-device-wwan.png | Bin 817 -> 0 bytes
icons/22/nm-mb-roam.png | Bin 267 -> 0 bytes
icons/22/nm-no-connection.png | Bin 811 -> 0 bytes
icons/22/nm-secure-lock.png | Bin 335 -> 0 bytes
icons/22/nm-signal-00-secure.png | Bin 775 -> 0 bytes
icons/22/nm-signal-00.png | Bin 494 -> 0 bytes
icons/22/nm-signal-100-secure.png | Bin 688 -> 0 bytes
icons/22/nm-signal-100.png | Bin 413 -> 0 bytes
icons/22/nm-signal-25-secure.png | Bin 779 -> 0 bytes
icons/22/nm-signal-25.png | Bin 500 -> 0 bytes
icons/22/nm-signal-50-secure.png | Bin 770 -> 0 bytes
icons/22/nm-signal-50.png | Bin 496 -> 0 bytes
icons/22/nm-signal-75-secure.png | Bin 747 -> 0 bytes
icons/22/nm-signal-75.png | Bin 474 -> 0 bytes
icons/22/nm-stage01-connecting01.png | Bin 1168 -> 0 bytes
icons/22/nm-stage01-connecting02.png | Bin 1188 -> 0 bytes
icons/22/nm-stage01-connecting03.png | Bin 1206 -> 0 bytes
icons/22/nm-stage01-connecting04.png | Bin 1220 -> 0 bytes
icons/22/nm-stage01-connecting05.png | Bin 1200 -> 0 bytes
icons/22/nm-stage01-connecting06.png | Bin 1144 -> 0 bytes
icons/22/nm-stage01-connecting07.png | Bin 1139 -> 0 bytes
icons/22/nm-stage01-connecting08.png | Bin 1092 -> 0 bytes
icons/22/nm-stage01-connecting09.png | Bin 1157 -> 0 bytes
icons/22/nm-stage01-connecting10.png | Bin 1205 -> 0 bytes
icons/22/nm-stage01-connecting11.png | Bin 1152 -> 0 bytes
icons/22/nm-stage02-connecting01.png | Bin 1190 -> 0 bytes
icons/22/nm-stage02-connecting02.png | Bin 1198 -> 0 bytes
icons/22/nm-stage02-connecting03.png | Bin 1204 -> 0 bytes
icons/22/nm-stage02-connecting04.png | Bin 1258 -> 0 bytes
icons/22/nm-stage02-connecting05.png | Bin 1218 -> 0 bytes
icons/22/nm-stage02-connecting06.png | Bin 1173 -> 0 bytes
icons/22/nm-stage02-connecting07.png | Bin 1156 -> 0 bytes
icons/22/nm-stage02-connecting08.png | Bin 1131 -> 0 bytes
icons/22/nm-stage02-connecting09.png | Bin 1209 -> 0 bytes
icons/22/nm-stage02-connecting10.png | Bin 1229 -> 0 bytes
icons/22/nm-stage02-connecting11.png | Bin 1201 -> 0 bytes
icons/22/nm-stage03-connecting01.png | Bin 1174 -> 0 bytes
icons/22/nm-stage03-connecting02.png | Bin 1214 -> 0 bytes
icons/22/nm-stage03-connecting03.png | Bin 1207 -> 0 bytes
icons/22/nm-stage03-connecting04.png | Bin 1235 -> 0 bytes
icons/22/nm-stage03-connecting05.png | Bin 1204 -> 0 bytes
icons/22/nm-stage03-connecting06.png | Bin 1156 -> 0 bytes
icons/22/nm-stage03-connecting07.png | Bin 1120 -> 0 bytes
icons/22/nm-stage03-connecting08.png | Bin 1102 -> 0 bytes
icons/22/nm-stage03-connecting09.png | Bin 1188 -> 0 bytes
icons/22/nm-stage03-connecting10.png | Bin 1216 -> 0 bytes
icons/22/nm-stage03-connecting11.png | Bin 1185 -> 0 bytes
icons/22/nm-tech-3g.png | Bin 209 -> 0 bytes
icons/22/nm-tech-cdma-1x.png | Bin 212 -> 0 bytes
icons/22/nm-tech-edge.png | Bin 205 -> 0 bytes
icons/22/nm-tech-evdo.png | Bin 215 -> 0 bytes
icons/22/nm-tech-gprs.png | Bin 207 -> 0 bytes
icons/22/nm-tech-hspa.png | Bin 213 -> 0 bytes
icons/22/nm-tech-lte.png | Bin 158 -> 0 bytes
icons/22/nm-tech-umts.png | Bin 196 -> 0 bytes
icons/22/nm-vpn-active-lock.png | Bin 560 -> 0 bytes
icons/22/nm-vpn-connecting01.png | Bin 890 -> 0 bytes
icons/22/nm-vpn-connecting02.png | Bin 981 -> 0 bytes
icons/22/nm-vpn-connecting03.png | Bin 1109 -> 0 bytes
icons/22/nm-vpn-connecting04.png | Bin 1142 -> 0 bytes
icons/22/nm-vpn-connecting05.png | Bin 1286 -> 0 bytes
icons/22/nm-vpn-connecting06.png | Bin 1301 -> 0 bytes
icons/22/nm-vpn-connecting07.png | Bin 1259 -> 0 bytes
icons/22/nm-vpn-connecting08.png | Bin 1046 -> 0 bytes
icons/22/nm-vpn-connecting09.png | Bin 911 -> 0 bytes
icons/22/nm-vpn-connecting10.png | Bin 791 -> 0 bytes
icons/22/nm-vpn-connecting11.png | Bin 554 -> 0 bytes
icons/22/nm-vpn-connecting12.png | Bin 571 -> 0 bytes
icons/22/nm-vpn-connecting13.png | Bin 578 -> 0 bytes
icons/22/nm-vpn-connecting14.png | Bin 575 -> 0 bytes
icons/22/nm-wwan-tower.png | Bin 227 -> 0 bytes
icons/32/nm-device-wired.png | Bin 989 -> 0 bytes
icons/32/nm-no-connection.png | Bin 1143 -> 0 bytes
icons/48/nm-device-wireless.png | Bin 1752 -> 0 bytes
icons/meson.build | 113 -
icons/scalable/nm-device-wired.svg | 2466 --------------
icons/scalable/nm-no-connection.svg | 2588 ---------------
m4/glib-makefile.m4 | 31 -
man/meson.build | 18 -
man/nm-applet.1.in | 43 -
man/nm-connection-editor.1.in | 60 -
meson.build | 189 +-
meson_options.txt | 5 -
meson_post_install.py | 23 -
nm-applet.desktop.in | 13 -
nm-connection-editor.appdata.xml.in | 28 -
nm-connection-editor.desktop.in | 13 -
org.gnome.nm-applet.gschema.xml.in | 52 -
po/POTFILES.in | 123 +-
po/meson.build | 2 +-
src/8021x.ui | 189 --
src/ap-menu-item.c | 334 --
src/ap-menu-item.h | 67 -
src/applet-agent.c | 848 -----
src/applet-agent.h | 57 -
src/applet-device-broadband.c | 1080 -------
src/applet-device-broadband.h | 17 -
src/applet-device-bt.c | 253 --
src/applet-device-bt.h | 17 -
src/applet-device-ethernet.c | 496 ---
src/applet-device-ethernet.h | 17 -
src/applet-device-wifi.c | 1669 ----------
src/applet-device-wifi.h | 21 -
src/applet-dialogs.c | 1603 ---------
src/applet-dialogs.h | 35 -
src/applet-vpn-request.c | 737 -----
src/applet-vpn-request.h | 19 -
src/applet.c | 3413 --------------------
src/applet.gresource.xml | 9 -
src/applet.h | 302 --
src/connection-editor/ce-ip4-routes.ui | 201 --
src/connection-editor/ce-ip6-routes.ui | 201 --
src/connection-editor/ce-new-connection.ui | 218 --
src/connection-editor/ce-page-bluetooth.ui | 45 -
src/connection-editor/ce-page-bond.ui | 556 ----
src/connection-editor/ce-page-bridge-port.ui | 108 -
src/connection-editor/ce-page-bridge.ui | 518 ---
src/connection-editor/ce-page-dcb.ui | 2996 -----------------
src/connection-editor/ce-page-dsl.ui | 188 --
src/connection-editor/ce-page-ethernet.ui | 512 ---
src/connection-editor/ce-page-general.ui | 181 --
src/connection-editor/ce-page-infiniband.ui | 145 -
src/connection-editor/ce-page-ip-tunnel.ui | 253 --
src/connection-editor/ce-page-ip4.ui | 375 ---
src/connection-editor/ce-page-ip6.ui | 443 ---
src/connection-editor/ce-page-macsec.ui | 308 --
src/connection-editor/ce-page-mobile.ui | 326 --
src/connection-editor/ce-page-ppp.ui | 328 --
src/connection-editor/ce-page-proxy.ui | 130 -
src/connection-editor/ce-page-team-port.ui | 866 -----
src/connection-editor/ce-page-team.ui | 1593 ---------
src/connection-editor/ce-page-vlan.ui | 298 --
src/connection-editor/ce-page-wifi-security.ui | 73 -
src/connection-editor/ce-page-wifi.ui | 425 ---
src/connection-editor/ce-page.c | 942 ------
src/connection-editor/ce-page.h | 192 --
src/connection-editor/ce-polkit-button.c | 248 --
src/connection-editor/ce-polkit-button.h | 52 -
src/connection-editor/ce-polkit.c | 103 -
src/connection-editor/ce-polkit.h | 25 -
src/connection-editor/ce-ppp-auth-methods.ui | 213 --
src/connection-editor/ce-utils.c | 25 -
src/connection-editor/ce-utils.h | 14 -
src/connection-editor/ce.gresource.xml | 33 -
src/connection-editor/connection-helpers.c | 808 -----
src/connection-editor/connection-helpers.h | 79 -
src/connection-editor/gtk/menus.ui | 19 -
src/connection-editor/ip4-routes-dialog.c | 857 -----
src/connection-editor/ip4-routes-dialog.h | 23 -
src/connection-editor/ip6-routes-dialog.c | 874 -----
src/connection-editor/ip6-routes-dialog.h | 23 -
src/connection-editor/main.c | 260 --
src/connection-editor/meson.build | 120 -
src/connection-editor/nm-connection-editor.c | 1393 --------
src/connection-editor/nm-connection-editor.h | 114 -
src/connection-editor/nm-connection-editor.ui | 393 ---
src/connection-editor/nm-connection-list.c | 1159 -------
src/connection-editor/nm-connection-list.h | 56 -
src/connection-editor/nm-connection-list.ui | 145 -
src/connection-editor/page-8021x-security.c | 242 --
src/connection-editor/page-8021x-security.h | 41 -
src/connection-editor/page-bluetooth.c | 338 --
src/connection-editor/page-bluetooth.h | 52 -
src/connection-editor/page-bond.c | 637 ----
src/connection-editor/page-bond.h | 49 -
src/connection-editor/page-bridge-port.c | 148 -
src/connection-editor/page-bridge-port.h | 42 -
src/connection-editor/page-bridge.c | 365 ---
src/connection-editor/page-bridge.h | 49 -
src/connection-editor/page-dcb.c | 783 -----
src/connection-editor/page-dcb.h | 41 -
src/connection-editor/page-dsl.c | 366 ---
src/connection-editor/page-dsl.h | 50 -
src/connection-editor/page-ethernet.c | 553 ----
src/connection-editor/page-ethernet.h | 51 -
src/connection-editor/page-general.c | 459 ---
src/connection-editor/page-general.h | 40 -
src/connection-editor/page-infiniband.c | 244 --
src/connection-editor/page-infiniband.h | 49 -
src/connection-editor/page-ip-tunnel.c | 285 --
src/connection-editor/page-ip-tunnel.h | 48 -
src/connection-editor/page-ip4.c | 1564 ---------
src/connection-editor/page-ip4.h | 42 -
src/connection-editor/page-ip6.c | 1565 ---------
src/connection-editor/page-ip6.h | 42 -
src/connection-editor/page-macsec.c | 322 --
src/connection-editor/page-macsec.h | 48 -
src/connection-editor/page-master.c | 650 ----
src/connection-editor/page-master.h | 46 -
src/connection-editor/page-mobile.c | 585 ----
src/connection-editor/page-mobile.h | 50 -
src/connection-editor/page-ppp.c | 377 ---
src/connection-editor/page-ppp.h | 41 -
src/connection-editor/page-proxy.c | 300 --
src/connection-editor/page-proxy.h | 36 -
src/connection-editor/page-team-port.c | 704 ----
src/connection-editor/page-team-port.h | 40 -
src/connection-editor/page-team.c | 1145 -------
src/connection-editor/page-team.h | 49 -
src/connection-editor/page-vlan.c | 791 -----
src/connection-editor/page-vlan.h | 49 -
src/connection-editor/page-vpn.c | 309 --
src/connection-editor/page-vpn.h | 57 -
src/connection-editor/page-wifi-security.c | 592 ----
src/connection-editor/page-wifi-security.h | 43 -
src/connection-editor/page-wifi.c | 609 ----
src/connection-editor/page-wifi.h | 55 -
src/connection-editor/ppp-auth-methods-dialog.c | 156 -
src/connection-editor/ppp-auth-methods-dialog.h | 28 -
src/connection-editor/vpn-helpers.c | 241 --
src/connection-editor/vpn-helpers.h | 25 -
src/ethernet-dialog.c | 152 -
src/ethernet-dialog.h | 21 -
src/fallback-icon.h | 109 -
src/gsm-unlock.ui | 301 --
src/info.ui | 86 -
src/{libnma => }/init.c | 0
src/libnm-gtk/check-exports.sh | 130 -
src/libnm-gtk/examples/mobile-providers.js | 23 -
src/libnm-gtk/init.c | 23 -
src/libnm-gtk/libnm-gtk.pc.in | 12 -
src/libnm-gtk/libnm-gtk.ver | 45 -
src/libnm-gtk/meson.build | 147 -
src/libnm-gtk/nm-cert-chooser.h | 203 --
src/libnm-gtk/nm-mobile-providers.c | 1553 ---------
src/libnm-gtk/nm-mobile-providers.h | 125 -
src/libnm-gtk/nm-mobile-wizard.c | 1657 ----------
src/libnm-gtk/nm-mobile-wizard.h | 44 -
src/libnm-gtk/nm-ui-utils.c | 967 ------
src/libnm-gtk/nm-ui-utils.h | 39 -
src/libnm-gtk/nm-vpn-password-dialog.c | 522 ---
src/libnm-gtk/nm-vpn-password-dialog.h | 85 -
src/libnm-gtk/nm-wifi-dialog.c | 1429 --------
src/libnm-gtk/nm-wifi-dialog.h | 70 -
src/libnm-gtk/nm-wireless-dialog.c | 52 -
src/libnm-gtk/nm-wireless-dialog.h | 62 -
src/libnm-gtk/nm.gresource.xml | 6 -
src/libnm-gtk/tests/iso3166-test.xml | 69 -
src/libnm-gtk/tests/serviceproviders-test.xml | 52 -
src/libnm-gtk/tests/test-mobile-providers.c | 517 ---
src/libnm-gtk/wifi.ui | 222 --
src/{libnma => }/libnma-gtk4.pc.in | 0
src/{libnma => }/libnma.pc.in | 0
src/{libnma => }/libnma.ver | 0
src/libnma/meson.build | 186 --
src/main.c | 74 -
src/mb-menu-item.c | 216 --
src/mb-menu-item.h | 45 -
src/meson.build | 211 +-
src/mobile-helpers.c | 696 ----
src/mobile-helpers.h | 104 -
src/{libnma => }/nma-bar-code-widget.c | 0
src/{libnma => }/nma-bar-code-widget.h | 0
src/{libnma => }/nma-bar-code-widget.ui | 0
src/{libnma => }/nma-bar-code.c | 0
src/{libnma => }/nma-bar-code.h | 0
src/{libnma => }/nma-cert-chooser-button.c | 0
src/{libnma => }/nma-cert-chooser-button.h | 0
src/{libnma => }/nma-cert-chooser-private.h | 0
src/{libnma => }/nma-cert-chooser.c | 0
src/{libnma => }/nma-cert-chooser.h | 0
src/{libnma => }/nma-file-cert-chooser.c | 0
src/{libnma => }/nma-mobile-providers.c | 0
src/{libnma => }/nma-mobile-providers.h | 0
src/{libnma => }/nma-mobile-wizard.c | 0
src/{libnma => }/nma-mobile-wizard.h | 0
src/{libnma => }/nma-mobile-wizard.ui | 0
src/{libnma => }/nma-pkcs11-cert-chooser-dialog.c | 0
src/{libnma => }/nma-pkcs11-cert-chooser-dialog.h | 0
src/{libnma => }/nma-pkcs11-cert-chooser-dialog.ui | 0
src/{libnma => }/nma-pkcs11-cert-chooser.c | 0
src/{libnma => }/nma-pkcs11-token-login-dialog.c | 0
src/{libnma => }/nma-pkcs11-token-login-dialog.h | 0
src/{libnma => }/nma-pkcs11-token-login-dialog.ui | 0
src/{libnma => }/nma-private.h | 0
src/{libnma => }/nma-ui-utils.c | 0
src/{libnma => }/nma-ui-utils.h | 0
src/{libnma => }/nma-version.h.in | 0
src/{libnma => }/nma-vpn-password-dialog.c | 0
src/{libnma => }/nma-vpn-password-dialog.h | 0
src/{libnma => }/nma-vpn-password-dialog.ui | 0
src/{libnma => }/nma-wifi-dialog.c | 0
src/{libnma => }/nma-wifi-dialog.h | 0
src/{libnma => }/nma.gresource.xml | 0
src/{libnma => }/qrcodegen.c | 0
src/{libnma => }/qrcodegen.h | 0
src/{libnma => }/tests/bar-code.c | 0
src/{libnma => }/tests/cert-chooser.c | 0
src/{libnma => }/tests/meson.build | 0
src/{libnma => }/tests/mobile-wizard.c | 0
src/{libnma => }/tests/run-vpn.c | 0
src/{libnma => }/tests/vpn-password-dialog.c | 0
src/{libnma => }/tests/wifi-dialog-secrets.c | 0
src/{libnma => }/tests/wifi-dialog.c | 0
src/utils/meson.build | 24 -
src/{libnma => }/wifi.ui | 0
src/wireless-security/meson.build | 21 +-
309 files changed, 431 insertions(+), 63075 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6aff0319..149f90e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
*.lo
*.la
*.swp
+*.bak
Makefile
Makefile.in*
configure
@@ -82,53 +83,32 @@ test-*.log
/cscope.out
/cscope.po.out
-/network-manager-applet-*.tar.*
-/nm-connection-editor.appdata.xml
-nm-applet.conf
-nm-applet.desktop
-nm-connection-editor.desktop
-org.gnome.nm-applet.gschema.xml
-org.gnome.nm-applet.gschema.valid
-org.gnome.nm-connection-editor.appdata.xml
-src/connection-editor/nm-connection-editor
-src/connection-editor/nm-connection-editor-service-glue.h
-src/connection-editor/ce-resources.c
-src/connection-editor/ce-resources.h
-src/libnma/libnma.pc
-src/libnma/libnma-gtk4.pc
-src/libnma/NMA-1.0.gir
-src/libnma/NMA-1.0.typelib
-src/libnma/NMA4-1.0.gir
-src/libnma/NMA4-1.0.typelib
-src/libnma/nma-resources.c
-src/libnma/nma-resources.h
-src/libnma/nma-version.h
-src/libnma/tests/cert-chooser
-src/libnma/tests/cert-chooser-gtk4
-src/libnma/tests/mobile-wizard
-src/libnma/tests/mobile-wizard-gtk4
-src/libnma/tests/run-vpn
-src/libnma/tests/run-vpn-gtk4
-src/libnma/tests/vpn-password-dialog
-src/libnma/tests/vpn-password-dialog-gtk4
-src/libnma/tests/wifi-dialog
-src/libnma/tests/wifi-dialog-gtk4
-src/libnma/tests/wifi-dialog-secrets
-src/libnma/tests/wifi-dialog-secrets-gtk4
-src/libnm-gtk/libnm-gtk.pc
-src/libnm-gtk/NMGtk-1.0.gir
-src/libnm-gtk/NMGtk-1.0.typelib
-src/libnm-gtk/tests/test-mobile-providers
-src/libnm-gtk/nm-resources.c
-src/libnm-gtk/nm-resources.h
-src/marshallers/nma-marshal.*
-src/nm-applet
-src/applet-dbus-bindings.h
-src/applet-resources.c
-src/applet-resources.h
+/libnma-*.tar.*
+src/libnma.pc
+src/libnma-gtk4.pc
+src/NMA-1.0.gir
+src/NMA-1.0.typelib
+src/NMA4-1.0.gir
+src/NMA4-1.0.typelib
+src/nma-resources.c
+src/nma-resources.h
+src/nma-version.h
+src/tests/cert-chooser
+src/tests/cert-chooser-gtk4
+src/tests/mobile-wizard
+src/tests/mobile-wizard-gtk4
+src/tests/run-vpn
+src/tests/run-vpn-gtk4
+src/tests/vpn-password-dialog
+src/tests/vpn-password-dialog-gtk4
+src/tests/wifi-dialog
+src/tests/wifi-dialog-gtk4
+src/tests/wifi-dialog-secrets
+src/tests/wifi-dialog-secrets-gtk4
+src/tests/bar-code
+src/tests/bar-code-gtk4
src/wireless-security/ws-resources.c
src/wireless-security/ws-resources.h
-man/*.1
/test-driver
**/tests/test-*.log
@@ -137,6 +117,7 @@ man/*.1
xml/
html/
gtk-doc.make
+libnma-scan.c
libnma-decl-list.txt
libnma-decl.txt
libnma-overrides.txt
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f541658..b126955b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
# python -c 'import sys, yaml; yaml.dump (yaml.load (sys.stdin), sys.stdout)' <.gitlab-ci.yml
# If things don't seem to work, this can help:
-# https://gitlab.gnome.org/GNOME/network-manager-applet/-/ci/lint
+# https://gitlab.gnome.org/GNOME/libnma/-/ci/lint
.fedora_minimal: &fedora_minimal
before_script:
@@ -14,9 +14,6 @@
gettext-devel
glib2-devel
gtk3-devel
- libgudev1-devel
- libnotify-devel
- libsecret-devel
NetworkManager-libnm-devel
pkgconfig
/usr/bin/autopoint
@@ -31,9 +28,6 @@
gettext-devel
glib2-devel
gtk3-devel
- libgudev1-devel
- libnotify-devel
- libsecret-devel
NetworkManager-libnm-devel
pkgconfig
/usr/bin/autopoint
@@ -42,9 +36,6 @@
gtk-doc
iso-codes-devel
mobile-broadband-provider-info-devel
- jansson-devel
- ModemManager-glib-devel
- libselinux-devel
.dist: &dist
dependencies:
@@ -56,22 +47,18 @@
<<: *fedora_minimal
<<: *dist
script:
- - tar xJf network-manager-applet-*.tar.xz
+ - tar xJf libnma-*.tar.xz
- dnf -y install meson
- meson
-Dlibnm_gtk=false
- -Dwwan=false
- -Dselinux=false
- -Dteam=false
-Dgcr=false
-Diso_codes=false
-Dmobile_broadband_provider_info=false
-Dld_gc=false
-Dgtk_doc=false
-Dintrospection=false
- -Dappindicator=no
-Dmore_asserts=no
- network-manager-applet-*/ build
+ libnma-*/ build
- ninja -v -C build
- ninja -v -C build test
- ninja -v -C build install
@@ -82,21 +69,17 @@
<<: *dist
script:
- dnf -y install meson
- - tar xJf network-manager-applet-*.tar.xz
+ - tar xJf libnma-*.tar.xz
- meson
-Dlibnm_gtk=false
- -Dwwan=true
- -Dselinux=true
- -Dteam=true
-Dgcr=true
-Diso_codes=true
-Dmobile_broadband_provider_info=true
-Dld_gc=true
-Dgtk_doc=true
-Dintrospection=true
- -Dappindicator=no
-Dmore_asserts=yes
- network-manager-applet-*/ build
+ libnma-*/ build
- ninja -v -C build
- ninja -v -C build test
- ninja -v -C build install
@@ -107,8 +90,8 @@
<<: *dist
script:
- dnf -y install make
- - tar xJf network-manager-applet-*.tar.xz
- - cd network-manager-applet-*/
+ - tar xJf libnma-*.tar.xz
+ - cd libnma-*/
- ./configure
--disable-silent-rules
--with-more-asserts=no
@@ -117,12 +100,7 @@
--disable-mobile-broadband-provider-info
--disable-gtk-doc
--disable-introspection
- --disable-schemas-compile
--disable-more-warnings
- --without-appindicator
- --without-wwan
- --without-selinux
- --without-team
--without-gcr
- make -j$(nproc)
- make -j$(nproc) check
@@ -134,8 +112,8 @@
<<: *dist
script:
- dnf -y install make
- - tar xJf network-manager-applet-*.tar.xz
- - cd network-manager-applet-*/
+ - tar xJf libnma-*.tar.xz
+ - cd libnma-*/
- ./configure
--disable-silent-rules
--with-more-asserts=yes
@@ -144,11 +122,7 @@
--enable-mobile-broadband-provider-info
--enable-gtk-doc
--enable-introspection
- --enable-schemas-compile
--enable-more-warnings
- --with-wwan
- --with-selinux
- --with-team
--with-gcr
- make -j$(nproc)
- make -j$(nproc) check
@@ -202,9 +176,6 @@ centos7:
glib2-devel
gtk3-devel
intltool
- libgudev1-devel
- libnotify-devel
- libsecret-devel
NetworkManager-libnm-devel
pkgconfig
/usr/bin/autopoint
@@ -213,13 +184,10 @@ centos7:
gtk-doc
iso-codes-devel
mobile-broadband-provider-info-devel
- jansson-devel
- ModemManager-glib-devel
- libselinux-devel
make
script:
- - tar xJf network-manager-applet-*.tar.xz
- - cd network-manager-applet-*/
+ - tar xJf libnma-*.tar.xz
+ - cd libnma-*/
- ./configure
--disable-silent-rules
--with-more-asserts=yes
@@ -228,11 +196,7 @@ centos7:
--enable-mobile-broadband-provider-info
--enable-gtk-doc
--enable-introspection
- --enable-schemas-compile
--enable-more-warnings
- --with-wwan
- --with-selinux
- --with-team
--with-gcr
- make -j$(nproc)
- make -j$(nproc) check
@@ -241,7 +205,7 @@ centos7:
image: centos:7
stage: test
-# https://network-manager-applet.pages.gitlab.gnome.org/libnma/
+# https://libnma.pages.gitlab.gnome.org/libnma/
pages:
<<: *fedora_full
<<: *dist
@@ -249,15 +213,15 @@ pages:
stage: deploy
script:
- dnf -y install make
- - tar xJf network-manager-applet-*.tar.xz
- - cd network-manager-applet-*/
+ - tar xJf libnma-*.tar.xz
+ - cd libnma-*/
- ./configure
--disable-silent-rules
--enable-gtk-doc
- make -j$(nproc)
- cd ..
- mkdir -p public
- - mv network-manager-applet-*/html public/libnma
+ - mv libnma-*/html public/libnma
artifacts:
paths:
- public
diff --git a/Makefile.am b/Makefile.am
index b863a683..4c4bbf65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,15 +33,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--enable-introspection \
--enable-more-warnings=error \
- --with-wwan \
- --with-team \
--with-gcr
-
-if WITH_LIBNM_GTK
-DISTCHECK_CONFIGURE_FLAGS += --with-libnm-gtk
-endif
-
man_MANS =
pkgconfig_DATA =
@@ -66,112 +59,6 @@ dflt_cppflags = -std=gnu99
###############################################################################
-icon16dir = $(datadir)/icons/hicolor/16x16/apps
-icon16_DATA = \
- icons/16/nm-device-wired.png \
- icons/16/nm-no-connection.png \
- icons/16/nm-vpn-standalone-lock.png
-EXTRA_DIST += $(icon16_DATA)
-
-icon22dir = $(datadir)/icons/hicolor/22x22/apps
-icon22_DATA = \
- icons/22/nm-adhoc.png \
- icons/22/nm-device-wired.png \
- icons/22/nm-device-wired-secure.png \
- icons/22/nm-device-wwan.png \
- icons/22/nm-mb-roam.png \
- icons/22/nm-no-connection.png \
- icons/22/nm-secure-lock.png \
- icons/22/nm-signal-00.png \
- icons/22/nm-signal-00-secure.png \
- icons/22/nm-signal-100.png \
- icons/22/nm-signal-100-secure.png \
- icons/22/nm-signal-25.png \
- icons/22/nm-signal-25-secure.png \
- icons/22/nm-signal-50.png \
- icons/22/nm-signal-50-secure.png \
- icons/22/nm-signal-75.png \
- icons/22/nm-signal-75-secure.png \
- icons/22/nm-stage01-connecting01.png \
- icons/22/nm-stage01-connecting02.png \
- icons/22/nm-stage01-connecting03.png \
- icons/22/nm-stage01-connecting04.png \
- icons/22/nm-stage01-connecting05.png \
- icons/22/nm-stage01-connecting06.png \
- icons/22/nm-stage01-connecting07.png \
- icons/22/nm-stage01-connecting08.png \
- icons/22/nm-stage01-connecting09.png \
- icons/22/nm-stage01-connecting10.png \
- icons/22/nm-stage01-connecting11.png \
- icons/22/nm-stage02-connecting01.png \
- icons/22/nm-stage02-connecting02.png \
- icons/22/nm-stage02-connecting03.png \
- icons/22/nm-stage02-connecting04.png \
- icons/22/nm-stage02-connecting05.png \
- icons/22/nm-stage02-connecting06.png \
- icons/22/nm-stage02-connecting07.png \
- icons/22/nm-stage02-connecting08.png \
- icons/22/nm-stage02-connecting09.png \
- icons/22/nm-stage02-connecting10.png \
- icons/22/nm-stage02-connecting11.png \
- icons/22/nm-stage03-connecting01.png \
- icons/22/nm-stage03-connecting02.png \
- icons/22/nm-stage03-connecting03.png \
- icons/22/nm-stage03-connecting04.png \
- icons/22/nm-stage03-connecting05.png \
- icons/22/nm-stage03-connecting06.png \
- icons/22/nm-stage03-connecting07.png \
- icons/22/nm-stage03-connecting08.png \
- icons/22/nm-stage03-connecting09.png \
- icons/22/nm-stage03-connecting10.png \
- icons/22/nm-stage03-connecting11.png \
- icons/22/nm-tech-3g.png \
- icons/22/nm-tech-cdma-1x.png \
- icons/22/nm-tech-edge.png \
- icons/22/nm-tech-evdo.png \
- icons/22/nm-tech-gprs.png \
- icons/22/nm-tech-hspa.png \
- icons/22/nm-tech-lte.png \
- icons/22/nm-tech-umts.png \
- icons/22/nm-vpn-active-lock.png \
- icons/22/nm-vpn-connecting01.png \
- icons/22/nm-vpn-connecting02.png \
- icons/22/nm-vpn-connecting03.png \
- icons/22/nm-vpn-connecting04.png \
- icons/22/nm-vpn-connecting05.png \
- icons/22/nm-vpn-connecting06.png \
- icons/22/nm-vpn-connecting07.png \
- icons/22/nm-vpn-connecting08.png \
- icons/22/nm-vpn-connecting09.png \
- icons/22/nm-vpn-connecting10.png \
- icons/22/nm-vpn-connecting11.png \
- icons/22/nm-vpn-connecting12.png \
- icons/22/nm-vpn-connecting13.png \
- icons/22/nm-vpn-connecting14.png \
- icons/22/nm-wwan-tower.png
-EXTRA_DIST += $(icon22_DATA)
-
-icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon32_DATA = \
- icons/32/nm-device-wired.png \
- icons/32/nm-no-connection.png
-EXTRA_DIST += $(icon32_DATA)
-
-icon48dir = $(datadir)/icons/hicolor/48x48/apps
-icon48_DATA = \
- icons/48/nm-device-wireless.png
-EXTRA_DIST += $(icon48_DATA)
-
-iconscalabledir=$(datadir)/icons/hicolor/scalable/apps
-iconscalable_DATA = \
- icons/scalable/nm-device-wired.svg \
- icons/scalable/nm-no-connection.svg
-EXTRA_DIST += $(iconscalable_DATA)
-
-EXTRA_DIST += icons/meson.build
-
-###############################################################################
-
shared_files = \
shared/nm-utils/nm-shared-utils.c \
shared/nm-utils/nm-shared-utils.h \
@@ -194,28 +81,6 @@ src_utils_libutils_libnm_la_LIBADD = \
$(GTK3_LIBS) \
$(LIBNM_LIBS)
-if WITH_LIBNM_GTK
-
-noinst_LTLIBRARIES += src/utils/libutils-libnm-glib.la
-
-src_utils_libutils_libnm_glib_la_CPPFLAGS = \
- $(dflt_cppflags) \
- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
- "-I$(srcdir)/shared" \
- $(GTK3_CFLAGS) \
- $(LIBNM_GLIB_CFLAGS)
-
-src_utils_libutils_libnm_glib_la_SOURCES = \
- $(shared_files) \
- src/utils/utils.c \
- src/utils/utils.h
-
-src_utils_libutils_libnm_glib_la_LIBADD = \
- $(GTK3_LIBS) \
- $(LIBNM_GLIB_LIBS)
-
-endif
-
if WITH_LIBNMA_GTK4
noinst_LTLIBRARIES += src/utils/libutils-libnm-gtk4.la
@@ -317,8 +182,8 @@ src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
$(dflt_cppflags) \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
+ "-I$(srcdir)/src" \
+ -Isrc \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS)
@@ -329,35 +194,6 @@ src_wireless_security_libwireless_security_libnm_la_LIBADD = \
$(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
-if WITH_LIBNM_GTK
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-glib.la
-
-src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
- $(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_glib_la_SOURCES = \
- $(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_glib_la_CPPFLAGS = \
- $(dflt_cppflags) \
- $(GTK3_CFLAGS) \
- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(LIBNM_GLIB_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_glib_la_LIBADD = \
- src/utils/libutils-libnm-glib.la \
- $(GTK3_LIBS) \
- $(LIBNM_GLIB_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_glib_la_OBJECTS): $(wireless_security_h_gen)
-
-endif
-
if WITH_LIBNMA_GTK4
noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-gtk4.la
@@ -371,8 +207,8 @@ nodist_src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
src_wireless_security_libwireless_security_libnm_gtk4_la_CPPFLAGS = \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
+ "-I$(srcdir)/src" \
+ -Isrc \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS)
@@ -403,157 +239,18 @@ EXTRA_DIST += \
###############################################################################
-if WITH_LIBNM_GTK
-
-src/libnm-gtk/nm-resources.h: src/libnm-gtk/nm.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk
--generate-header --internal
-
-src/libnm-gtk/nm-resources.c: src/libnm-gtk/nm.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--sourcedir=$(srcdir)/src/libnm-gtk --generate-dependencies $(srcdir)/src/libnm-gtk/nm.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnm-gtk
--generate-source --internal
-
-CLEANFILES += \
- $(libnm_gtk_h_priv_gen) \
- $(libnm_gtk_c_gen)
-
-libnm_gtk_h_priv_gen = \
- src/libnm-gtk/nm-resources.h
-
-libnm_gtk_c_gen = \
- src/libnm-gtk/nm-resources.c
-
-libnm_gtk_h_pub = \
- src/libnm-gtk/nm-wifi-dialog.h \
- src/libnm-gtk/nm-wireless-dialog.h \
- src/libnm-gtk/nm-mobile-wizard.h \
- src/libnm-gtk/nm-ui-utils.h \
- src/libnm-gtk/nm-mobile-providers.h \
- src/libnm-gtk/nm-vpn-password-dialog.h \
- src/libnm-gtk/nm-cert-chooser.h
-
-libnm_gtk_c_real = \
- src/libnm-gtk/nm-wifi-dialog.c \
- src/libnm-gtk/nm-wireless-dialog.c \
- src/libnm-gtk/nm-mobile-wizard.c \
- src/libnm-gtk/nm-ui-utils.c \
- src/libnm-gtk/nm-mobile-providers.c \
- src/libnm-gtk/nm-vpn-password-dialog.c \
- src/libnma/nma-cert-chooser.c \
- src/libnma/nma-file-cert-chooser.c \
- src/libnm-gtk/init.c
-
-src_libnm_gtk_libnmgtkdir = $(includedir)/libnm-gtk
-
-src_libnm_gtk_libnmgtk_HEADERS = \
- $(libnm_gtk_h_pub)
-
-lib_LTLIBRARIES += src/libnm-gtk/libnm-gtk.la
-
-src_libnm_gtk_libnm_gtk_la_SOURCES = \
- $(libnm_gtk_c_real)
-
-nodist_src_libnm_gtk_libnm_gtk_la_SOURCES = \
- $(libnm_gtk_c_gen)
-
-src_libnm_gtk_libnm_gtk_la_CFLAGS = \
- $(dflt_cppflags) \
- -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
- -DICONDIR=\""$(datadir)/icons"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
- -DNMALOCALEDIR=\"$(datadir)/locale\" \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnm-gtk" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(GTK3_CFLAGS) \
- $(LIBNM_GLIB_CFLAGS) \
- $(GUDEV_CFLAGS)
-
-src_libnm_gtk_libnm_gtk_la_LIBADD = \
- src/wireless-security/libwireless-security-libnm-glib.la \
- $(GTK3_LIBS) \
- $(LIBNM_GLIB_LIBS) \
- $(GUDEV_LIBS)
-
-EXTRA_src_libnm_gtk_libnm_gtk_la_DEPENDENCIES = src/libnm-gtk/libnm-gtk.ver
-
-src_libnm_gtk_libnm_gtk_la_LDFLAGS = \
- -Wl,-no-undefined \
- -Wl,--version-script=$(srcdir)/src/libnm-gtk/libnm-gtk.ver
-
-$(src_libnm_gtk_libnm_gtk_la_OBJECTS): $(libnm_gtk_h_priv_gen)
-
-check-local-exports-libnm-gtk:
- $(srcdir)/src/libnm-gtk/check-exports.sh $(builddir)/src/libnm-gtk/.libs/libnm-gtk.so
$(srcdir)/src/libnm-gtk/libnm-gtk.ver
-
-check_local += check-local-exports-libnm-gtk
-
-
-pkgconfig_DATA += src/libnm-gtk/libnm-gtk.pc
-
-if HAVE_INTROSPECTION
-src/libnm-gtk/NMGtk-1.0.gir: src/libnm-gtk/libnm-gtk.la
-src_libnm_gtk_NMGtk_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
-src_libnm_gtk_NMGtk_1_0_gir_EXPORT_PACKAGES = libnm-gtk
-src_libnm_gtk_NMGtk_1_0_gir_CFLAGS = $(src_libnm_gtk_libnm_gtk_la_CFLAGS)
-src_libnm_gtk_NMGtk_1_0_gir_LIBS = src/libnm-gtk/libnm-gtk.la
-src_libnm_gtk_NMGtk_1_0_gir_FILES = \
- $(filter-out src/libnm-gtk/nm-wireless-dialog.h, $(libnm_gtk_h_pub)) \
- $(filter-out src/libnm-gtk/nm-wireless-dialog.c, $(libnm_gtk_c_real))
-src_libnm_gtk_NMGtk_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnm-gtk/NMGtk-1.0.gir
-endif
-
-
-check_programs += src/libnm-gtk/tests/test-mobile-providers
-
-src_libnm_gtk_tests_test_mobile_providers_CPPFLAGS = \
- $(dflt_cppflags) \
- -DTEST_DATA_DIR=\""$(abs_srcdir)/src/libnm-gtk/tests"\" \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/libnm-gtk" \
- $(GTK3_CFLAGS) \
- $(LIBNM_GLIB_CFLAGS)
-
-src_libnm_gtk_tests_test_mobile_providers_LDADD = \
- src/libnm-gtk/libnm-gtk.la \
- $(LIBNM_GLIB_LIBS)
-
-endif
-
-EXTRA_DIST += \
- src/libnm-gtk/libnm-gtk.pc.in \
- src/libnm-gtk/libnm-gtk.ver \
- src/libnm-gtk/check-exports.sh \
- src/libnm-gtk/wifi.ui \
- src/libnm-gtk/nm.gresource.xml \
- src/libnm-gtk/meson.build \
- \
- src/libnm-gtk/tests/iso3166-test.xml \
- src/libnm-gtk/tests/serviceproviders-test.xml \
- \
- src/libnm-gtk/examples/mobile-providers.js \
- $(NULL)
-
-###############################################################################
-
-src/libnma/nma-resources.h: src/libnma/nma.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma
--generate-header --internal
+src/nma-resources.h: src/nma.gresource.xml
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-header
--internal
-src/libnma/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--sourcedir=$(srcdir)/src/libnma --generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/libnma
--generate-source --internal
+src/nma-resources.c: src/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src
--generate-dependencies $(srcdir)/src/nma.gresource.xml)
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-source
--internal
-src/libnma-gtk4/nma-resources.c: src/libnma/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(srcdir)/src/libnma/nma.gresource.xml |sed "s,^,$(builddir)/src/libnma-gtk4/,")
+src/libnma-gtk4/nma-resources.c: src/nma.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES)
--generate-dependencies $(srcdir)/src/nma.gresource.xml |sed "s,^,$(builddir)/src/libnma-gtk4/,")
@mkdir -p $(builddir)/src/libnma-gtk4
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/src/libnma-gtk4
--generate-source --internal
-src/libnma-gtk4/%.ui: src/libnma/%.ui
+src/libnma-gtk4/%.ui: src/%.ui
@mkdir -p $(builddir)/src/libnma-gtk4
gtk4-builder-tool simplify --3to4 $< >$@
@@ -563,78 +260,78 @@ CLEANFILES += \
$(libnma_gtk4_c_gen)
libnma_h_priv_gen = \
- src/libnma/nma-resources.h
+ src/nma-resources.h
libnma_c_gen = \
- src/libnma/nma-resources.c
+ src/nma-resources.c
libnma_gtk4_c_gen = \
src/libnma-gtk4/nma-resources.c
libnma_h_pub = \
- src/libnma/nma-version.h \
- src/libnma/nma-wifi-dialog.h \
- src/libnma/nma-mobile-wizard.h \
- src/libnma/nma-mobile-providers.h \
- src/libnma/nma-vpn-password-dialog.h \
- src/libnma/nma-ui-utils.h \
- src/libnma/nma-cert-chooser.h \
- src/libnma/nma-bar-code-widget.h \
- src/libnma/nma-bar-code.h
+ src/nma-version.h \
+ src/nma-wifi-dialog.h \
+ src/nma-mobile-wizard.h \
+ src/nma-mobile-providers.h \
+ src/nma-vpn-password-dialog.h \
+ src/nma-ui-utils.h \
+ src/nma-cert-chooser.h \
+ src/nma-bar-code-widget.h \
+ src/nma-bar-code.h
libnma_c_real = \
- src/libnma/nma-wifi-dialog.c \
- src/libnma/nma-mobile-wizard.c \
- src/libnma/nma-mobile-providers.c \
- src/libnma/nma-vpn-password-dialog.c \
- src/libnma/nma-ui-utils.c \
- src/libnma/init.c \
- src/libnma/nma-cert-chooser.c \
- src/libnma/nma-file-cert-chooser.c \
- src/libnma/nma-bar-code-widget.c \
- src/libnma/nma-bar-code.c
+ src/nma-wifi-dialog.c \
+ src/nma-mobile-wizard.c \
+ src/nma-mobile-providers.c \
+ src/nma-vpn-password-dialog.c \
+ src/nma-ui-utils.c \
+ src/init.c \
+ src/nma-cert-chooser.c \
+ src/nma-file-cert-chooser.c \
+ src/nma-bar-code-widget.c \
+ src/nma-bar-code.c
EXTRA_DIST += \
- src/libnma/qrcodegen.c \
- src/libnma/qrcodegen.h
+ src/qrcodegen.c \
+ src/qrcodegen.h
libnma_h_priv_real = \
- src/libnma/nma-cert-chooser-private.h \
- src/libnma/nma-private.h
+ src/nma-cert-chooser-private.h \
+ src/nma-private.h
libnma_h_priv_gcr = \
- src/libnma/nma-pkcs11-token-login-dialog.h \
- src/libnma/nma-pkcs11-cert-chooser-dialog.h \
- src/libnma/nma-cert-chooser-button.h
+ src/nma-pkcs11-token-login-dialog.h \
+ src/nma-pkcs11-cert-chooser-dialog.h \
+ src/nma-cert-chooser-button.h
libnma_c_gcr = \
- src/libnma/nma-pkcs11-token-login-dialog.c \
- src/libnma/nma-pkcs11-cert-chooser-dialog.c \
- src/libnma/nma-cert-chooser-button.c \
- src/libnma/nma-pkcs11-cert-chooser.c
+ src/nma-pkcs11-token-login-dialog.c \
+ src/nma-pkcs11-cert-chooser-dialog.c \
+ src/nma-cert-chooser-button.c \
+ src/nma-pkcs11-cert-chooser.c
-src_libnma_libnmadir = $(includedir)/libnma
+src_libnmadir = $(includedir)/libnma
-src_libnma_libnma_HEADERS = \
+src_libnma_HEADERS = \
$(libnma_h_pub)
-lib_LTLIBRARIES += src/libnma/libnma.la
+lib_LTLIBRARIES += src/libnma.la
-src_libnma_libnma_la_SOURCES = \
+src_libnma_la_SOURCES = \
$(libnma_h_priv_real) \
$(libnma_c_real)
if WITH_GCR
-src_libnma_libnma_la_SOURCES += \
+src_libnma_la_SOURCES += \
$(libnma_h_priv_gcr) \
$(libnma_c_gcr)
endif
-nodist_src_libnma_libnma_la_SOURCES = \
+nodist_src_libnma_la_SOURCES = \
$(libnma_h_priv_gen) \
$(libnma_c_gen)
-src_libnma_libnma_la_CFLAGS = \
+src_libnma_la_CFLAGS = \
$(dflt_cppflags) \
-DICONDIR=\""$(datadir)/icons"\" \
-DBINDIR=\""$(bindir)"\" \
@@ -647,184 +344,182 @@ src_libnma_libnma_la_CFLAGS = \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
"-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
+ "-I$(srcdir)/src" \
+ -Isrc \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
- $(GUDEV_CFLAGS) \
$(GCR_CFLAGS)
-src_libnma_libnma_la_LIBADD = \
+src_libnma_la_LIBADD = \
src/wireless-security/libwireless-security-libnm.la \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- $(GUDEV_LIBS) \
$(GCR_LIBS)
-EXTRA_src_libnma_libnma_la_DEPENDENCIES = src/libnma/libnma.ver
+EXTRA_src_libnma_la_DEPENDENCIES = src/libnma.ver
-src_libnma_libnma_la_LDFLAGS = \
+src_libnma_la_LDFLAGS = \
-Wl,-no-undefined \
- -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
+ -Wl,--version-script=$(srcdir)/src/libnma.ver
-pkgconfig_DATA += src/libnma/libnma.pc
+pkgconfig_DATA += src/libnma.pc
if HAVE_INTROSPECTION
-src/libnma/NMA-1.0.gir: src/libnma/libnma.la
-src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
-src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
-src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
-src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
-src_libnma_NMA_1_0_gir_FILES = \
+src/NMA-1.0.gir: src/libnma.la
+src_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
+src_NMA_1_0_gir_EXPORT_PACKAGES = libnma
+src_NMA_1_0_gir_CFLAGS = $(src_libnma_la_CFLAGS)
+src_NMA_1_0_gir_LIBS = src/libnma.la
+src_NMA_1_0_gir_FILES = \
$(libnma_h_pub) \
$(libnma_c_real)
if WITH_GCR
-src_libnma_NMA_1_0_gir_FILES += \
+src_NMA_1_0_gir_FILES += \
$(libnma_c_gcr)
endif
-src_libnma_NMA_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnma/NMA-1.0.gir
+src_NMA_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
+INTROSPECTION_GIRS += src/NMA-1.0.gir
endif
-check_PROGRAMS_norun += src/libnma/tests/mobile-wizard
+check_PROGRAMS_norun += src/tests/mobile-wizard
-src_libnma_tests_mobile_wizard_CPPFLAGS = \
+src_tests_mobile_wizard_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_mobile_wizard_LDADD = \
+src_tests_mobile_wizard_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
-check_PROGRAMS_norun += src/libnma/tests/vpn-password-dialog
+check_PROGRAMS_norun += src/tests/vpn-password-dialog
-src_libnma_tests_vpn_password_dialog_CPPFLAGS = \
+src_tests_vpn_password_dialog_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_vpn_password_dialog_LDADD = \
+src_tests_vpn_password_dialog_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog
+check_PROGRAMS_norun += src/tests/wifi-dialog
-src_libnma_tests_wifi_dialog_CPPFLAGS = \
+src_tests_wifi_dialog_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_wifi_dialog_LDADD = \
+src_tests_wifi_dialog_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-secrets
+check_PROGRAMS_norun += src/tests/wifi-dialog-secrets
-src_libnma_tests_wifi_dialog_secrets_CPPFLAGS = \
+src_tests_wifi_dialog_secrets_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_wifi_dialog_secrets_LDADD = \
+src_tests_wifi_dialog_secrets_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
-check_PROGRAMS_norun += src/libnma/tests/run-vpn
+check_PROGRAMS_norun += src/tests/run-vpn
-src_libnma_tests_run_vpn_CPPFLAGS = \
+src_tests_run_vpn_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_run_vpn_LDADD = \
+src_tests_run_vpn_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
-check_PROGRAMS_norun += src/libnma/tests/cert-chooser
+check_PROGRAMS_norun += src/tests/cert-chooser
-src_libnma_tests_cert_chooser_CPPFLAGS = \
+src_tests_cert_chooser_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_cert_chooser_LDADD = \
+src_tests_cert_chooser_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
-check_PROGRAMS_norun += src/libnma/tests/bar-code
+check_PROGRAMS_norun += src/tests/bar-code
-src_libnma_tests_bar_code_CPPFLAGS = \
+src_tests_bar_code_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK3_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_bar_code_LDADD = \
+src_tests_bar_code_LDADD = \
$(GLIB_LIBS) \
$(GTK3_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma.la
+ src/libnma.la
if WITH_LIBNMA_GTK4
-lib_LTLIBRARIES += src/libnma/libnma-gtk4.la
+lib_LTLIBRARIES += src/libnma-gtk4.la
-src_libnma_libnma_gtk4_la_SOURCES = \
+src_libnma_gtk4_la_SOURCES = \
$(libnma_h_priv_real) \
$(libnma_c_real)
if WITH_GCR_GTK4
-src_libnma_libnma_gtk4_la_SOURCES += \
+src_libnma_gtk4_la_SOURCES += \
$(libnma_h_priv_gcr) \
$(libnma_c_gcr)
endif
-nodist_src_libnma_libnma_gtk4_la_SOURCES = \
+nodist_src_libnma_gtk4_la_SOURCES = \
$(libnma_h_priv_gen) \
$(libnma_gtk4_c_gen)
-src_libnma_libnma_gtk4_la_CFLAGS = \
+src_libnma_gtk4_la_CFLAGS = \
-DICONDIR=\""$(datadir)/icons"\" \
-DBINDIR=\""$(bindir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
@@ -836,474 +531,200 @@ src_libnma_libnma_gtk4_la_CFLAGS = \
"-I$(srcdir)/shared" \
"-I$(srcdir)/src/utils" \
"-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
+ "-I$(srcdir)/src" \
+ -Isrc \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
- $(GUDEV_CFLAGS) \
$(GCR_GCR4_CFLAGS)
-src_libnma_libnma_gtk4_la_LIBADD = \
+src_libnma_gtk4_la_LIBADD = \
src/wireless-security/libwireless-security-libnm-gtk4.la \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- $(GUDEV_LIBS) \
$(GCR_GCR4_LIBS)
-EXTRA_src_libnma_libnma_gtk4_la_DEPENDENCIES = src/libnma/libnma.ver
+EXTRA_src_libnma_gtk4_la_DEPENDENCIES = src/libnma.ver
-src_libnma_libnma_gtk4_la_LDFLAGS = \
+src_libnma_gtk4_la_LDFLAGS = \
-Wl,-no-undefined \
- -Wl,--version-script=$(srcdir)/src/libnma/libnma.ver
+ -Wl,--version-script=$(srcdir)/src/libnma.ver
-pkgconfig_DATA += src/libnma/libnma-gtk4.pc
+pkgconfig_DATA += src/libnma-gtk4.pc
if HAVE_INTROSPECTION
-src/libnma/NMA4-1.0.gir: src/libnma/libnma-gtk4.la
-src_libnma_NMA4_1_0_gir_INCLUDES = NM-1.0 Gtk-4.0
-src_libnma_NMA4_1_0_gir_EXPORT_PACKAGES = libnma-gtk4
-src_libnma_NMA4_1_0_gir_CFLAGS = $(src_libnma_libnma_gtk4_la_CFLAGS)
-src_libnma_NMA4_1_0_gir_LIBS = src/libnma/libnma-gtk4.la
-src_libnma_NMA4_1_0_gir_FILES = \
+src/NMA4-1.0.gir: src/libnma-gtk4.la
+src_NMA4_1_0_gir_INCLUDES = NM-1.0 Gtk-4.0
+src_NMA4_1_0_gir_EXPORT_PACKAGES = libnma-gtk4
+src_NMA4_1_0_gir_CFLAGS = $(src_libnma_gtk4_la_CFLAGS)
+src_NMA4_1_0_gir_LIBS = src/libnma-gtk4.la
+src_NMA4_1_0_gir_FILES = \
$(libnma_h_pub) \
$(libnma_c_real)
if WITH_GCR_GTK4
-src_libnma_NMA4_1_0_gir_FILES += \
+src_NMA4_1_0_gir_FILES += \
$(libnma_c_gcr)
endif
-src_libnma_NMA4_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
-INTROSPECTION_GIRS += src/libnma/NMA4-1.0.gir
+src_NMA4_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NMA --symbol-prefix=nma
+INTROSPECTION_GIRS += src/NMA4-1.0.gir
endif
-check_PROGRAMS_norun += src/libnma/tests/mobile-wizard-gtk4
+check_PROGRAMS_norun += src/tests/mobile-wizard-gtk4
-src_libnma_tests_mobile_wizard_gtk4_SOURCES = \
- src/libnma/tests/mobile-wizard.c
+src_tests_mobile_wizard_gtk4_SOURCES = \
+ src/tests/mobile-wizard.c
-src_libnma_tests_mobile_wizard_gtk4_CPPFLAGS = \
+src_tests_mobile_wizard_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_mobile_wizard_gtk4_LDADD = \
+src_tests_mobile_wizard_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
+ src/libnma-gtk4.la
-check_PROGRAMS_norun += src/libnma/tests/vpn-password-dialog-gtk4
+check_PROGRAMS_norun += src/tests/vpn-password-dialog-gtk4
-src_libnma_tests_vpn_password_dialog_gtk4_SOURCES = \
- src/libnma/tests/vpn-password-dialog.c
+src_tests_vpn_password_dialog_gtk4_SOURCES = \
+ src/tests/vpn-password-dialog.c
-src_libnma_tests_vpn_password_dialog_gtk4_CPPFLAGS = \
+src_tests_vpn_password_dialog_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_vpn_password_dialog_gtk4_LDADD = \
+src_tests_vpn_password_dialog_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
+ src/libnma-gtk4.la
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-gtk4
+check_PROGRAMS_norun += src/tests/wifi-dialog-gtk4
-src_libnma_tests_wifi_dialog_gtk4_SOURCES = \
- src/libnma/tests/wifi-dialog.c
+src_tests_wifi_dialog_gtk4_SOURCES = \
+ src/tests/wifi-dialog.c
-src_libnma_tests_wifi_dialog_gtk4_CPPFLAGS = \
+src_tests_wifi_dialog_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_wifi_dialog_gtk4_LDADD = \
+src_tests_wifi_dialog_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
+ src/libnma-gtk4.la
-check_PROGRAMS_norun += src/libnma/tests/wifi-dialog-secrets-gtk4
+check_PROGRAMS_norun += src/tests/wifi-dialog-secrets-gtk4
-src_libnma_tests_wifi_dialog_secrets_gtk4_SOURCES = \
- src/libnma/tests/wifi-dialog-secrets.c
+src_tests_wifi_dialog_secrets_gtk4_SOURCES = \
+ src/tests/wifi-dialog-secrets.c
-src_libnma_tests_wifi_dialog_secrets_gtk4_CPPFLAGS = \
+src_tests_wifi_dialog_secrets_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_wifi_dialog_secrets_gtk4_LDADD = \
+src_tests_wifi_dialog_secrets_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
+ src/libnma-gtk4.la
-check_PROGRAMS_norun += src/libnma/tests/run-vpn-gtk4
+check_PROGRAMS_norun += src/tests/run-vpn-gtk4
-src_libnma_tests_run_vpn_gtk4_SOURCES = \
- src/libnma/tests/run-vpn.c
+src_tests_run_vpn_gtk4_SOURCES = \
+ src/tests/run-vpn.c
-src_libnma_tests_run_vpn_gtk4_CPPFLAGS = \
+src_tests_run_vpn_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_run_vpn_gtk4_LDADD = \
+src_tests_run_vpn_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
+ src/libnma-gtk4.la
-check_PROGRAMS_norun += src/libnma/tests/cert-chooser-gtk4
+check_PROGRAMS_norun += src/tests/cert-chooser-gtk4
-src_libnma_tests_cert_chooser_gtk4_SOURCES = \
- src/libnma/tests/cert-chooser.c
+src_tests_cert_chooser_gtk4_SOURCES = \
+ src/tests/cert-chooser.c
-src_libnma_tests_cert_chooser_gtk4_CPPFLAGS = \
+src_tests_cert_chooser_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_cert_chooser_gtk4_LDADD = \
+src_tests_cert_chooser_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
+ src/libnma-gtk4.la
-check_PROGRAMS_norun += src/libnma/tests/bar-code-gtk4
+check_PROGRAMS_norun += src/tests/bar-code-gtk4
-src_libnma_tests_bar_code_gtk4_SOURCES = \
- src/libnma/tests/bar-code.c
+src_tests_bar_code_gtk4_SOURCES = \
+ src/tests/bar-code.c
-src_libnma_tests_bar_code_gtk4_CPPFLAGS = \
+src_tests_bar_code_gtk4_CPPFLAGS = \
$(dflt_cppflags) \
$(GLIB_CFLAGS) \
$(GTK4_CFLAGS) \
$(LIBNM_CFLAGS) \
"-I$(srcdir)/shared/" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma
+ "-I$(srcdir)/src" \
+ -Isrc
-src_libnma_tests_bar_code_gtk4_LDADD = \
+src_tests_bar_code_gtk4_LDADD = \
$(GLIB_LIBS) \
$(GTK4_LIBS) \
$(LIBNM_LIBS) \
- src/libnma/libnma-gtk4.la
-
-endif
-
-EXTRA_DIST += \
- src/libnma/nma-version.h.in \
- src/libnma/libnma.pc.in \
- src/libnma/libnma-gtk4.pc.in \
- src/libnma/libnma.ver \
- src/libnma/wifi.ui \
- src/libnma/nma-mobile-wizard.ui \
- src/libnma/nma-bar-code-widget.ui \
- src/libnma/nma-pkcs11-token-login-dialog.ui \
- src/libnma/nma-pkcs11-cert-chooser-dialog.ui \
- src/libnma/nma-vpn-password-dialog.ui \
- src/libnma/nma.gresource.xml \
- src/libnma/meson.build \
- src/libnma/tests/meson.build
-
-###############################################################################
-
-src/connection-editor/ce-resources.h: src/connection-editor/ce.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor
--generate-header --internal
-
-src/connection-editor/ce-resources.c: src/connection-editor/ce.gresource.xml $(shell
$(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/connection-editor --generate-dependencies
$(srcdir)/src/connection-editor/ce.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/connection-editor
--generate-source --internal
-
-CLEANFILES += \
- $(connection_editor_h_gen) \
- $(connection_editor_c_gen)
-
-connection_editor_h_gen = \
- src/connection-editor/ce-resources.h
-
-connection_editor_c_gen = \
- src/connection-editor/ce-resources.c
-
-connection_editor_hc_real = \
- src/connection-editor/nm-connection-editor.c \
- src/connection-editor/nm-connection-editor.h \
- src/connection-editor/nm-connection-list.c \
- src/connection-editor/nm-connection-list.h \
- src/connection-editor/main.c \
- src/connection-editor/ce-page.h \
- src/connection-editor/ce-page.c \
- src/connection-editor/page-general.h \
- src/connection-editor/page-general.c \
- src/connection-editor/page-ethernet.h \
- src/connection-editor/page-ethernet.c \
- src/connection-editor/page-8021x-security.h \
- src/connection-editor/page-8021x-security.c \
- src/connection-editor/page-wifi.h \
- src/connection-editor/page-wifi.c \
- src/connection-editor/page-wifi-security.h \
- src/connection-editor/page-wifi-security.c \
- src/connection-editor/page-infiniband.h \
- src/connection-editor/page-infiniband.c \
- src/connection-editor/page-ip-tunnel.h \
- src/connection-editor/page-ip-tunnel.c \
- src/connection-editor/page-ip4.h \
- src/connection-editor/page-ip4.c \
- src/connection-editor/page-ip6.h \
- src/connection-editor/page-ip6.c \
- src/connection-editor/page-dsl.h \
- src/connection-editor/page-dsl.c \
- src/connection-editor/page-macsec.h \
- src/connection-editor/page-macsec.c \
- src/connection-editor/page-mobile.h \
- src/connection-editor/page-mobile.c \
- src/connection-editor/page-bluetooth.h \
- src/connection-editor/page-bluetooth.c \
- src/connection-editor/page-ppp.h \
- src/connection-editor/page-ppp.c \
- src/connection-editor/page-proxy.h \
- src/connection-editor/page-proxy.c \
- src/connection-editor/page-vpn.h \
- src/connection-editor/page-vpn.c \
- src/connection-editor/page-master.h \
- src/connection-editor/page-master.c \
- src/connection-editor/page-bond.h \
- src/connection-editor/page-bond.c \
- src/connection-editor/page-team.h \
- src/connection-editor/page-team.c \
- src/connection-editor/page-team-port.h \
- src/connection-editor/page-team-port.c \
- src/connection-editor/page-bridge.h \
- src/connection-editor/page-bridge.c \
- src/connection-editor/page-bridge-port.h \
- src/connection-editor/page-bridge-port.c \
- src/connection-editor/page-vlan.h \
- src/connection-editor/page-vlan.c \
- src/connection-editor/page-dcb.c \
- src/connection-editor/page-dcb.h \
- src/connection-editor/vpn-helpers.h \
- src/connection-editor/vpn-helpers.c \
- src/connection-editor/ip4-routes-dialog.h \
- src/connection-editor/ip4-routes-dialog.c \
- src/connection-editor/ip6-routes-dialog.h \
- src/connection-editor/ip6-routes-dialog.c \
- src/connection-editor/ppp-auth-methods-dialog.c \
- src/connection-editor/ppp-auth-methods-dialog.h \
- src/connection-editor/ce-polkit-button.c \
- src/connection-editor/ce-polkit-button.h \
- src/connection-editor/ce-polkit.c \
- src/connection-editor/ce-polkit.h \
- src/connection-editor/ce-utils.c \
- src/connection-editor/ce-utils.h \
- src/connection-editor/connection-helpers.c \
- src/connection-editor/connection-helpers.h
-
-bin_PROGRAMS += src/connection-editor/nm-connection-editor
-
-src_connection_editor_nm_connection_editor_SOURCES = \
- $(connection_editor_hc_real)
-
-nodist_src_connection_editor_nm_connection_editor_SOURCES = \
- $(connection_editor_c_gen)
-
-src_connection_editor_nm_connection_editor_CPPFLAGS = \
- $(dflt_cppflags) \
- -DICONDIR=\""$(datadir)/icons"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DLIBDIR=\""$(libdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DNMALOCALEDIR=\"$(datadir)/locale\" \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- $(JANSSON_CFLAGS) \
- $(SELINUX_CFLAGS)
-
-src_connection_editor_nm_connection_editor_LDADD = \
- src/wireless-security/libwireless-security-libnm.la \
- src/libnma/libnma.la \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- $(JANSSON_LIBS) \
- $(SELINUX_LIBS) \
- -lm
-
-$(src_connection_editor_nm_connection_editor_OBJECTS): $(connection_editor_h_gen)
-
-EXTRA_src_connection_editor_nm_connection_editor_DEPENDENCIES = linker-script-binary.ver
-
-src_connection_editor_nm_connection_editor_LDFLAGS = \
- -Wl,--version-script="$(srcdir)/linker-script-binary.ver"
-
-
-EXTRA_DIST += \
- src/connection-editor/ce-ip4-routes.ui \
- src/connection-editor/ce-ip6-routes.ui \
- src/connection-editor/ce-new-connection.ui \
- src/connection-editor/ce-page-bluetooth.ui \
- src/connection-editor/ce-page-bond.ui \
- src/connection-editor/ce-page-bridge-port.ui \
- src/connection-editor/ce-page-bridge.ui \
- src/connection-editor/ce-page-dcb.ui \
- src/connection-editor/ce-page-dsl.ui \
- src/connection-editor/ce-page-ethernet.ui \
- src/connection-editor/ce-page-general.ui \
- src/connection-editor/ce-page-infiniband.ui \
- src/connection-editor/ce-page-ip4.ui \
- src/connection-editor/ce-page-ip6.ui \
- src/connection-editor/ce-page-ip-tunnel.ui \
- src/connection-editor/ce-page-macsec.ui \
- src/connection-editor/ce-page-mobile.ui \
- src/connection-editor/ce-page-ppp.ui \
- src/connection-editor/ce-page-proxy.ui \
- src/connection-editor/ce-page-team-port.ui \
- src/connection-editor/ce-page-team.ui \
- src/connection-editor/ce-page-vlan.ui \
- src/connection-editor/ce-page-wifi-security.ui \
- src/connection-editor/ce-page-wifi.ui \
- src/connection-editor/ce-ppp-auth-methods.ui \
- src/connection-editor/gtk/menus.ui \
- src/connection-editor/nm-connection-editor.ui \
- src/connection-editor/nm-connection-list.ui \
- src/connection-editor/ce.gresource.xml \
- src/connection-editor/meson.build
-
-###############################################################################
-
-src/applet-resources.h: src/applet.gresource.xml
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-header
--internal
-
-src/applet-resources.c: src/applet.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src
--generate-dependencies $(srcdir)/src/applet.gresource.xml)
- $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-source
--internal
-
-CLEANFILES += \
- $(nm_applet_h_gen) \
- $(nm_applet_c_gen)
-
-nm_applet_h_gen = \
- src/applet-resources.h
-
-nm_applet_c_gen = \
- src/applet-resources.c
+ src/libnma-gtk4.la
-nm_applet_hc_real = \
- shared/nm-utils/nm-compat.c \
- src/main.c \
- src/applet.c \
- src/applet.h \
- src/applet-agent.c \
- src/applet-agent.h \
- src/applet-vpn-request.c \
- src/applet-vpn-request.h \
- src/ethernet-dialog.h \
- src/ethernet-dialog.c \
- src/applet-dialogs.h \
- src/applet-dialogs.c \
- src/applet-device-ethernet.h \
- src/applet-device-ethernet.c \
- src/applet-device-wifi.h \
- src/applet-device-wifi.c \
- src/ap-menu-item.h \
- src/ap-menu-item.c \
- src/mb-menu-item.h \
- src/mb-menu-item.c \
- src/mobile-helpers.c \
- src/mobile-helpers.h \
- src/applet-device-bt.h \
- src/applet-device-bt.c \
- src/fallback-icon.h
-
-if WITH_WWAN
-nm_applet_hc_real += \
- src/applet-device-broadband.h \
- src/applet-device-broadband.c
endif
-bin_PROGRAMS += src/nm-applet
-
-src_nm_applet_SOURCES = \
- $(nm_applet_hc_real)
-
-nodist_src_nm_applet_SOURCES = \
- $(nm_applet_c_gen)
-
-src_nm_applet_CPPFLAGS = \
- $(dflt_cppflags) \
- -DICONDIR=\""$(datadir)/icons"\" \
- -DBINDIR=\""$(bindir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- -DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
- -DNMALOCALEDIR=\"$(datadir)/locale\" \
- -DG_LOG_DOMAIN=\""nm-applet"\" \
- "-I$(srcdir)/shared" \
- "-I$(srcdir)/src/utils" \
- "-I$(srcdir)/src/wireless-security" \
- "-I$(srcdir)/src/libnma" \
- -Isrc/libnma \
- $(GTK3_CFLAGS) \
- $(LIBNM_CFLAGS) \
- $(LIBSECRET_CFLAGS) \
- $(NOTIFY_CFLAGS) \
- $(MM_GLIB_CFLAGS) \
- $(APPINDICATOR_CFLAGS)
-
-src_nm_applet_LDADD = \
- src/wireless-security/libwireless-security-libnm.la \
- src/libnma/libnma.la \
- $(GTK3_LIBS) \
- $(LIBNM_LIBS) \
- $(LIBSECRET_LIBS) \
- $(NOTIFY_LIBS) \
- $(MM_GLIB_LIBS) \
- $(APPINDICATOR_LIBS) \
- -lm
-
-$(src_nm_applet_OBJECTS): $(nm_applet_h_gen)
-
-EXTRA_src_nm_applet_DEPENDENCIES = linker-script-binary.ver
-
-src_nm_applet_LDFLAGS = \
- -Wl,--version-script="$(srcdir)/linker-script-binary.ver"
-
-
EXTRA_DIST += \
- src/8021x.ui \
- src/gsm-unlock.ui \
- src/info.ui \
- src/applet.gresource.xml \
- src/meson.build
+ src/nma-version.h.in \
+ src/libnma.pc.in \
+ src/libnma-gtk4.pc.in \
+ src/libnma.ver \
+ src/wifi.ui \
+ src/nma-mobile-wizard.ui \
+ src/nma-bar-code-widget.ui \
+ src/nma-pkcs11-token-login-dialog.ui \
+ src/nma-pkcs11-cert-chooser-dialog.ui \
+ src/nma-vpn-password-dialog.ui \
+ src/nma.gresource.xml \
+ src/meson.build \
+ src/tests/meson.build
###############################################################################
@@ -1324,29 +745,21 @@ EXTRA_DIST += \
###############################################################################
-man_MANS += \
- man/nm-applet.1 \
- man/nm-connection-editor.1
-
-EXTRA_DIST += man/meson.build
-
-###############################################################################
-
DOC_MODULE = libnma
-DOC_SOURCE_DIR = $(top_srcdir)/src/libnma
+DOC_SOURCE_DIR = $(top_srcdir)/src
SCAN_OPTIONS=--rebuild-types --rebuild-sections
DOC_MAIN_SGML_FILE = libnma-docs.xml
-GTKDOC_LIBS = src/libnma/libnma.la
+GTKDOC_LIBS = src/libnma.la
scan-build.stamp: $(GTKDOC_LIBS)
-HFILE_GLOB = $(top_srcdir)/src/libnma/*.h
+HFILE_GLOB = $(top_srcdir)/src/*.h
-CFILE_GLOB = $(top_srcdir)/src/libnma/*.c
+CFILE_GLOB = $(top_srcdir)/src/*.c
IGNORE_HFILES = \
nma-resources.h \
@@ -1355,7 +768,9 @@ IGNORE_HFILES = \
nma-private.h \
nma-pkcs11-token-login-dialog.h \
nma-pkcs11-cert-chooser-dialog.h \
- nma-cert-chooser-button.h
+ nma-cert-chooser-button.h \
+ eap-method.h \
+ wireless-security.h
mkdb_ignore_c_files = \
nma-resources.c \
@@ -1378,58 +793,16 @@ TESTS += $(check_programs)
EXTRA_DIST += \
linker-script-binary.ver \
CONTRIBUTING \
- Makefile.glib \
autogen.sh \
meson.build \
meson_options.txt \
- meson_post_install.py \
config.h.meson \
gtkdocentities.ent.in \
\
po/meson.build
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = nm-applet.desktop.in
-autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
-
-nm-applet.desktop: nm-applet.desktop.in
- $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-applicationsdir = $(datadir)/applications
-applications_DATA = $(autostart_DATA)
-
-desktopdir = $(datadir)/applications
-desktop_in_files = nm-connection-editor.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
-nm-connection-editor.desktop: nm-connection-editor.desktop.in
- $(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
-
-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
-@GSETTINGS_RULES@
-
-appdatadir = $(datadir)/metainfo
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-appdata_in_files = nm-connection-editor.appdata.xml.in
-
-nm-connection-editor.appdata.xml: nm-connection-editor.appdata.xml.in
- $(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
-
-convertdir=$(datadir)/GConf/gsettings
-convert_DATA=nm-applet.convert
-
-EXTRA_DIST += \
- $(convert_DATA) \
- $(appdata_in_files) \
- $(autostart_in_files) \
- $(desktop_in_files)
-
CLEANFILES += \
$(INTROSPECTION_GIRS) \
$(typelib_DATA) \
\
- $(autostart_DATA) \
- $(desktop_DATA) \
- $(appdata_DATA) \
$(BUILT_SOURCES)
diff --git a/autogen.sh b/autogen.sh
index cbdc5c44..ac342fa6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
PKG_NAME=nm-applet
(test -f $srcdir/configure.ac \
- && test -f $srcdir/src/applet.c) || {
+ && test -f $srcdir/src/nma-version.h.in) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
diff --git a/config.h.meson b/config.h.meson
index 41246fc0..5760b1f4 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -1,9 +1,6 @@
/* Gettext package */
#mesondefine GETTEXT_PACKAGE
-/* Define if you have libnotify 0.7 or later */
-#mesondefine HAVE_LIBNOTIFY_07
-
/* ISO codes prefix */
#mesondefine ISO_CODES_PREFIX
@@ -41,12 +38,6 @@
/* Version number of package */
#mesondefine VERSION
-/* Enable using libappindicator */
-#mesondefine WITH_APPINDICATOR
-
-/* Use Ayatana AppIndicator, rathern than Ubuntu's AppIndicator */
-#mesondefine USE_AYATANA_INDICATORS
-
/* Define if Gcr is available */
#mesondefine WITH_GCR
diff --git a/configure.ac b/configure.ac
index 378f670f..be68d4a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@ m4_define([nma_micro_version], [25])
m4_define([nma_version],
[nma_major_version.nma_minor_version.nma_micro_version])
-AC_INIT([nm-applet],
+AC_INIT([libnma],
[nma_version],
- [https://gitlab.gnome.org/GNOME/network-manager-applet/issues],
- [network-manager-applet])
+ [https://gitlab.gnome.org/GNOME/libnma/issues],
+ [libnma])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -64,7 +64,7 @@ dnl
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.18])
-GETTEXT_PACKAGE=nm-applet
+GETTEXT_PACKAGE=libnma
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
@@ -125,43 +125,12 @@ dnl API documentation
dnl
GTK_DOC_CHECK(1.0)
-AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on
libnm-glib/libnm-util/dbus-glib (deprecated)]))
-if test "$with_libnm_gtk" == yes; then
- PKG_CHECK_MODULES(LIBNM_GLIB,
- [gio-2.0 >= 2.38
- NetworkManager >= 1.7
- libnm-glib >= 1.7
- libnm-util >= 1.7
- libnm-glib-vpn >= 1.7
- gmodule-export-2.0],
- :,
- [AC_MSG_FAILURE([$LIBNM_GLIB_PKG_ERRORS
-
-Configure without --with-libnm-gtk if you do not need the legacy library])])
- LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
- LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
- LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4"
- LIBNM_GLIB_CFLAGS="$LIBNM_GLIB_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
-else
- with_libnm_gtk=no
-fi
-AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes")
-
PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_8"
LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_8"
-PKG_CHECK_MODULES(LIBSECRET, [libsecret-1 >= 0.18])
-
-# Check for libnotify >= 0.7
-PKG_CHECK_MODULES(LIBNOTIFY_07, [libnotify >= 0.7], [have_libnotify_07=yes],[have_libnotify_07=no])
-if test x"$have_libnotify_07" = "xyes"; then
- AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify 0.7 or later])
-fi
-PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.4.3])
-
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10
-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
@@ -179,78 +148,6 @@ AM_CONDITIONAL(WITH_LIBNMA_GTK4, test "$with_libnma_gtk4" != "no")
AC_DEFINE(WITH_GCR_GTK4, 0, [Define if GTK4 Gcr is available])
AM_CONDITIONAL(WITH_GCR_GTK4, false)
-AC_ARG_WITH([appindicator],
- AS_HELP_STRING([--with-appindicator=no|yes|auto|ayatana|ubuntu], [Build with
lib(ayatana-)appindicator support in addition to xembed systray support.]),
- [], [with_appindicator=no])
-if test "$with_appindicator" != "no"; then
- if test "$with_appindicator" = "yes" -o "$with_appindicator" = "auto"; then
- PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1, [with_appindicator=ayatana],
[with_appindicator=no])
- if test "$with_appindicator" = "no"; then
- PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1, [with_appindicator=ubuntu],
[with_appindicator=no])
- if test "$with_appindicator" = "no"; then
- AC_MSG_ERROR([Neither Ubuntu's AppIndicator nor Ayatana AppIndicator found.
Better --without-appindicator?])
- fi
- fi
- elif test "$with_appindicator" = "ayatana"; then
- PKG_CHECK_MODULES(APPINDICATOR, ayatana-appindicator3-0.1)
- elif test "$with_appindicator" = "ubuntu"; then
- PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1)
- else
- AC_MSG_ERROR([Invalid --with-appindicator option. Must be one of no|yes|auto|ayatana|ubuntu])
- fi
-
- if test "$with_appindicator" = "ayatana"; then
- PKG_CHECK_MODULES(DBUSMENU, dbusmenu-gtk3-0.4 >= 16.04.0)
- AC_DEFINE([WITH_APPINDICATOR], 1, [Enable AppIndicator support and use Ayatana AppIndicator])
- AC_DEFINE([USE_AYATANA_INDICATORS], 1, [Explicitly enforce Ayatana AppIndicator])
- else
- PKG_CHECK_MODULES(DBUSMENU, dbusmenu-gtk3-0.4 >= 16.04.0)
- AC_DEFINE([WITH_APPINDICATOR], 1, [Enable AppIndicator support and use Ubuntu AppIndicator])
- AC_DEFINE([USE_AYATANA_INDICATORS], 0, [Explicitly enforce Ayatana AppIndicator])
- fi
-fi
-
-AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
-
-dnl ModemManager1 with libmm-glib for WWAN support
-AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
-if (test "${with_wwan}" == "no"); then
- AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
-else
- PKG_CHECK_MODULES(MM_GLIB,
- [mm-glib],,
- AC_MSG_ERROR([libmm-glib is needed for WWAN support. Use --without-wwan to build
without it.]))
- AC_DEFINE(WITH_WWAN, 1, [Define if you have ModemManager/WWAN support])
-fi
-AM_CONDITIONAL(WITH_WWAN, test "${with_wwan}" != "no")
-
-dnl Check for gudev
-PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
-
-dnl SELinux
-AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in
configuration editor (default: yes)]))
-if (test "${with_selinux}" == "no"); then
- AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available])
-else
- PKG_CHECK_MODULES(SELINUX,
- [libselinux],,
- AC_MSG_ERROR([libselinux is needed for SELinux label support in configuration editor.
Use --without-selinux to build without it.]))
- AC_DEFINE(WITH_SELINUX, 1, [Define if libselinux is available])
-fi
-AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no")
-
-dnl Jansson for team configuration editing
-AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)]))
-if (test "${with_team}" == "no"); then
- AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available])
-else
- PKG_CHECK_MODULES(JANSSON,
- [jansson >= 2.7],,
- AC_MSG_ERROR([jansson is needed for team configuration editor. Use --without-team to
build without it.]))
- AC_DEFINE(WITH_JANSSON, 1, [Define if Jansson is available])
-fi
-AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
-
dnl GCR for PKCS#11 enabled certificate chooser
AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
if (test "${with_gcr}" == "no"); then
@@ -357,22 +254,16 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
AC_CONFIG_FILES([
Makefile
-src/libnm-gtk/libnm-gtk.pc
-src/libnma/libnma.pc
-src/libnma/libnma-gtk4.pc
+src/nma-version.h
+src/libnma.pc
+src/libnma-gtk4.pc
po/Makefile.in
-man/nm-applet.1
-man/nm-connection-editor.1
-org.gnome.nm-applet.gschema.xml
-src/libnma/nma-version.h
])
AC_OUTPUT
echo ""
-echo " Build legacy library libnm-gtk: --with-libnm-gtk=${with_libnm_gtk}"
echo " Build EXPERIMENTAL libnma-gtk4 library for use with GTK4: --with-libnma-gtk4=${with_libnma_gtk4}"
echo " GCR: --with-gcr=$have_gcr"
echo " LTO: --enable-lto=$enable_lto"
echo " Linker garbage collection: --enable-ld-gc=$enable_ld_gc"
-echo " appindicator: $with_appindicator"
echo ""
diff --git a/meson.build b/meson.build
index e15cdbc5..95213dd1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project(
- 'network-manager-applet', 'c',
+ 'libnma', 'c',
version: '1.8.25',
license: 'GPL2+',
default_options: [
@@ -9,8 +9,6 @@ project(
meson_version: '>= 0.46.0'
)
-nma_name = 'nm-applet'
-
nma_version = meson.project_version()
version_array = nma_version.split('.')
nma_major_version = version_array[0].to_int()
@@ -20,8 +18,6 @@ nma_micro_version = version_array[2].to_int()
nma_gir_version = '1.0'
nma_gir_prefix = 'NMA'
-nma_gtk_gir_ns = 'NMGtk'
-
nma_prefix = get_option('prefix')
nma_bindir = join_paths(nma_prefix, get_option('bindir'))
nma_datadir = join_paths(nma_prefix, get_option('datadir'))
@@ -48,7 +44,7 @@ cc = meson.get_compiler('c')
config_h = configuration_data()
# defines
-config_h.set_quoted('GETTEXT_PACKAGE', nma_name)
+config_h.set_quoted('GETTEXT_PACKAGE', 'libnma')
config_h.set_quoted('VERSION', nma_version)
# types
@@ -154,7 +150,6 @@ endif
gio_dep = dependency('gio-2.0', version: '>= 2.38')
gmodule_export_dep = dependency('gmodule-export-2.0')
-libsecret_dep = dependency('libsecret-1', version: '>= 0.18')
m_dep = cc.find_library('m')
@@ -169,14 +164,6 @@ gtk_dep = declare_dependency(
]
)
-# Check for gudev
-gudev_dep = dependency('gudev-1.0', version: '>= 147')
-
-# Check for libnotify >= 0.7
-libnotify_dep = dependency('libnotify', version: '>= 0.4.3')
-config_h.set10('HAVE_LIBNOTIFY_07', libnotify_dep.found() and libnotify_dep.version().version_compare('>=
0.7'),
- description: 'Define if you have libnotify 0.7 or later')
-
# API documentation
nm_req_version = '>= 1.7'
@@ -198,92 +185,10 @@ libnm_dep = declare_dependency(
compile_args: cflags
)
-enable_libnm_gtk = get_option('libnm_gtk')
-if enable_libnm_gtk
- deps = [
- gio_dep,
- gmodule_export_dep,
- dependency('libnm-glib', version: nm_req_version),
- dependency('libnm-glib-vpn', version: nm_req_version),
- dependency('libnm-util', version: nm_req_version),
- dependency('NetworkManager', version: nm_req_version)
- ]
-
- cflags = [
- '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38',
- '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38',
- '-DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_4',
- '-DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4'
- ]
-
- libnm_glib_dep = declare_dependency(
- dependencies: deps,
- compile_args: cflags
- )
-endif
-
# No such thing yet, just same lame duck placeholders.
# it may actually end up being called differently.
config_h.set10('WITH_GCR_GTK4', false)
-enable_appindicator = get_option('appindicator')
-if enable_appindicator == 'auto' or enable_appindicator == 'yes'
- appindicator_dep = dependency('ayatana-appindicator3-0.1', required: false)
- if appindicator_dep.found()
- enable_appindicator = 'ayatana'
- else
- appindicator_dep = dependency('appindicator3-0.1', required: false)
- if appindicator_dep.found()
- enable_appindicator = 'ubuntu'
- else
- assert(appindicator_dep.found(), 'Neither Ubuntu\'s AppIndicator nor Ayatana AppIndicator found.')
- endif
- endif
-elif enable_appindicator == 'ayatana'
- appindicator_dep = dependency('ayatana-appindicator3-0.1')
-elif enable_appindicator == 'ubuntu'
- appindicator_dep = dependency('appindicator3-0.1')
-endif
-
-if enable_appindicator == 'no'
- config_h.set('WITH_APPINDICATOR', false)
- config_h.set('USE_AYATANA_INDICATORS', false)
-elif enable_appindicator == 'ubuntu'
- dbusmenu_dep = dependency('dbusmenu-gtk3-0.4', version: '>= 16.04.0')
- config_h.set10('WITH_APPINDICATOR', true)
- config_h.set10('USE_AYATANA_INDICATORS', false)
-elif enable_appindicator == 'ayatana'
- dbusmenu_dep = dependency('dbusmenu-gtk3-0.4', version: '>= 16.04.0')
- config_h.set10('WITH_APPINDICATOR', true)
- config_h.set10('USE_AYATANA_INDICATORS', true)
-else
- error('Options allowed for -Dappindicator=<str> are: no, yes|auto, ayatana, ubuntu.')
-endif
-
-# ModemManager1 with libmm-glib for WWAN support
-enable_wwan = get_option('wwan')
-if enable_wwan
- mm_glib_dep = dependency('mm-glib', required: false)
- assert(mm_glib_dep.found(), 'libmm-glib is needed for WWAN support. Use -Dwwan=false to build without it.')
-endif
-config_h.set10('WITH_WWAN', enable_wwan)
-
-# SELinux
-enable_selinux = get_option('selinux')
-if enable_selinux
- libselinux_dep = dependency('libselinux', required: false)
- assert(libselinux_dep.found(), 'libselinux is needed for SELinux label support in configuration editor.
Use -Dselinux=false to build without it.')
-endif
-config_h.set10('WITH_SELINUX', enable_selinux)
-
-# Jansson for team configuration editing
-enable_team = get_option('team')
-if enable_team
- jansson_dep = dependency('jansson', version: '>= 2.7', required: false)
- assert(jansson_dep.found(), 'jansson is needed for team configuration editor. Use -Dteam=false to build
without it.')
-endif
-config_h.set10('WITH_JANSSON', enable_team)
-
# GCR for PKCS#11 enabled certificate chooser
enable_gcr = get_option('gcr')
if enable_gcr
@@ -382,79 +287,8 @@ po_dir = join_paths(meson.source_root(), 'po')
top_inc = include_directories('.')
subdir('po')
-subdir('icons')
subdir('shared')
subdir('src')
-subdir('man')
-
-i18n = import('i18n')
-
-# FIXME: The same target can not be copied into two directories.
-# There is a workaround in meson_post_install.py until proper solution arises:
-# https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-desktop_files = [
- 'nm-applet',
- 'nm-connection-editor',
-]
-
-desktop_file_validate = find_program('desktop-file-validate', required: false)
-
-foreach desktop: desktop_files
- i18n.merge_file(
- desktop + '-desktop',
- input: desktop + '.desktop.in',
- output: desktop + '.desktop',
- install: true,
- install_dir: nma_appdir,
- po_dir: po_dir,
- type: 'desktop',
- )
-
- if desktop_file_validate.found()
- test('validate-' + desktop + '-desktop',
- desktop_file_validate,
- args: desktop + '.desktop',
- workdir: meson.current_build_dir(),
- )
- endif
-endforeach
-
-appdata = 'nm-connection-editor.appdata.xml'
-
-i18n.merge_file(
- 'desktop',
- input: appdata + '.in',
- output: appdata,
- install: true,
- install_dir: join_paths(nma_datadir, 'metainfo'),
- po_dir: po_dir,
-)
-
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
- test('validate-appdata',
- appstream_util,
- args: ['validate', '--nonet', appdata],
- workdir: meson.current_build_dir(),
- )
-endif
-
-schema_conf = configuration_data()
-schema_conf.set('GETTEXT_PACKAGE', nma_name)
-
-schema = 'org.gnome.nm-applet.gschema.xml'
-
-configure_file(
- input: schema + '.in',
- output: schema,
- install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
- configuration: schema_conf
-)
-
-install_data(
- 'nm-applet.convert',
- install_dir: join_paths(nma_datadir, 'GConf', 'gsettings')
-)
# documentation
enable_gtk_doc = get_option('gtk_doc')
@@ -469,6 +303,8 @@ if enable_gtk_doc
'nma-resources.h',
'nma-private.h',
'nma-version.h',
+ 'eap-method.h',
+ 'wireless-security.h',
]
private_sources = [
@@ -482,9 +318,9 @@ if enable_gtk_doc
ent_conf = configuration_data()
ent_conf.set_quoted('PACKAGE', meson.project_name())
- ent_conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/network-manager-applet/issues')
- ent_conf.set_quoted('PACKAGE_NAME', nma_name)
- ent_conf.set_quoted('PACKAGE_STRING', '@0@ @1@'.format(nma_name, nma_version))
+ ent_conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/libnma/issues')
+ ent_conf.set_quoted('PACKAGE_NAME', 'libnma')
+ ent_conf.set_quoted('PACKAGE_STRING', 'libnma @0@'.format(nma_version))
ent_conf.set_quoted('PACKAGE_TARNAME', meson.project_name())
ent_conf.set_quoted('PACKAGE_URL', '')
ent_conf.set_quoted('PACKAGE_VERSION', nma_version)
@@ -502,7 +338,7 @@ if enable_gtk_doc
gnome.gtkdoc(
mod_name,
main_xml: mod_name + '-docs.xml',
- src_dir: libnma_inc,
+ src_dir: src_inc,
dependencies: libnma_dep,
scan_args: [
'--rebuild-types',
@@ -524,16 +360,9 @@ configure_file(
configuration: config_h
)
-meson.add_install_script(
- 'meson_post_install.py',
- nma_datadir,
- nma_sysconfdir
-)
-
-output = '\n Build legacy library libnm-gtk: ' + enable_libnm_gtk.to_string() + '\n'
+output = '\n'
output += ' Build EXPERIMENTAL library libnm-gtk4 for use with GTK4: ' + enable_libnma_gtk4.to_string() +
'\n'
output += ' GCR: ' + enable_gcr.to_string() + '\n'
output += ' LTO: ' + get_option('b_lto').to_string() + '\n'
output += ' Linker garbage collection: ' + enable_ld_gc.to_string() + '\n'
-output += ' libappindicator: ' + enable_appindicator
message(output)
diff --git a/meson_options.txt b/meson_options.txt
index eadec332..a722e650 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,9 +1,4 @@
-option('libnm_gtk', type: 'boolean', value: false, description: 'build legacy library libnm-gtk which
depends on libnm-glib/libnm-util/dbus-glib')
option('libnma_gtk4', type: 'boolean', value: false, description: 'build EXPERIMENTAL library libnma-gtk4
for use with GTK4')
-option('appindicator', type: 'string', value: 'no', description: 'Build with lib(ayatana-)appindicator
support in addition to xembed systray support (no|yes|auto|ayatana|ubuntu). Default is "no", "yes" is an
alias for "auto".')
-option('wwan', type: 'boolean', value: true, description: 'Enable WWAN support.')
-option('selinux', type: 'boolean', value: true, description: 'Enable support for adjusting SELinux labels in
configuration editor.')
-option('team', type: 'boolean', value: true, description: 'Enable team configuration editor.')
option('gcr', type: 'boolean', value: true, description: 'Enable advanced certificate chooser.')
option('more_asserts', type: 'string', value: '0', description: 'Enable more assertions for debugging.')
option('iso_codes', type: 'boolean', value: true, description: 'check for iso-codes at build-time')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c08b9128..67777098 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,112 +1,23 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
-nm-applet.desktop.in
-nm-connection-editor.desktop.in
-org.gnome.nm-applet.gschema.xml.in
-nm-connection-editor.appdata.xml.in
shared/nm-utils/nm-shared-utils.c
-src/8021x.ui
-src/ap-menu-item.c
-src/applet.c
-src/applet-device-broadband.c
-src/applet-device-bt.c
-src/applet-device-ethernet.c
-src/applet-device-wifi.c
-src/applet-dialogs.c
-src/applet-vpn-request.c
-src/applet.h
-src/connection-editor/ce-ip4-routes.ui
-src/connection-editor/ce-ip6-routes.ui
-src/connection-editor/ce-new-connection.ui
-src/connection-editor/ce-page-bluetooth.ui
-src/connection-editor/ce-page-bond.ui
-src/connection-editor/ce-page-bridge-port.ui
-src/connection-editor/ce-page-bridge.ui
-src/connection-editor/ce-page.c
-src/connection-editor/ce-page-dcb.ui
-src/connection-editor/ce-page-dsl.ui
-src/connection-editor/ce-page-ethernet.ui
-src/connection-editor/ce-page-general.ui
-src/connection-editor/ce-page.h
-src/connection-editor/ce-page-infiniband.ui
-src/connection-editor/ce-page-ip-tunnel.ui
-src/connection-editor/ce-page-ip4.ui
-src/connection-editor/ce-page-ip6.ui
-src/connection-editor/ce-page-macsec.ui
-src/connection-editor/ce-page-mobile.ui
-src/connection-editor/ce-page-ppp.ui
-src/connection-editor/ce-page-proxy.ui
-src/connection-editor/ce-page-team-port.ui
-src/connection-editor/ce-page-team.ui
-src/connection-editor/ce-page-vlan.ui
-src/connection-editor/ce-page-wifi-security.ui
-src/connection-editor/ce-page-wifi.ui
-src/connection-editor/ce-polkit.c
-src/connection-editor/ce-polkit-button.c
-src/connection-editor/ce-ppp-auth-methods.ui
-src/connection-editor/connection-helpers.c
-src/connection-editor/gtk/menus.ui
-src/connection-editor/ip4-routes-dialog.c
-src/connection-editor/ip6-routes-dialog.c
-src/connection-editor/nm-connection-editor.c
-src/connection-editor/nm-connection-editor.ui
-src/connection-editor/nm-connection-list.c
-src/connection-editor/nm-connection-list.ui
-src/connection-editor/page-8021x-security.c
-src/connection-editor/page-bluetooth.c
-src/connection-editor/page-bond.c
-src/connection-editor/page-bridge.c
-src/connection-editor/page-bridge-port.c
-src/connection-editor/page-dcb.c
-src/connection-editor/page-dsl.c
-src/connection-editor/page-ethernet.c
-src/connection-editor/page-general.c
-src/connection-editor/page-infiniband.c
-src/connection-editor/page-ip-tunnel.c
-src/connection-editor/page-ip4.c
-src/connection-editor/page-ip6.c
-src/connection-editor/page-macsec.c
-src/connection-editor/page-master.c
-src/connection-editor/page-mobile.c
-src/connection-editor/page-ppp.c
-src/connection-editor/page-proxy.c
-src/connection-editor/page-team.c
-src/connection-editor/page-team-port.c
-src/connection-editor/page-vlan.c
-src/connection-editor/page-vpn.c
-src/connection-editor/page-wifi.c
-src/connection-editor/page-wifi-security.c
-src/connection-editor/vpn-helpers.c
-src/ethernet-dialog.c
-src/gsm-unlock.ui
-src/info.ui
-src/libnma/nma-bar-code-widget.c
-src/libnma/nma-bar-code-widget.ui
-src/libnma/nma-file-cert-chooser.c
-src/libnma/nma-mobile-providers.c
-src/libnma/nma-mobile-wizard.c
-src/libnma/nma-mobile-wizard.ui
-src/libnma/nma-cert-chooser-button.c
-src/libnma/nma-pkcs11-cert-chooser.c
-src/libnma/nma-pkcs11-cert-chooser-dialog.c
-src/libnma/nma-pkcs11-cert-chooser-dialog.ui
-src/libnma/nma-pkcs11-token-login-dialog.c
-src/libnma/nma-pkcs11-token-login-dialog.ui
-src/libnma/nma-ui-utils.c
-src/libnma/nma-vpn-password-dialog.c
-src/libnma/nma-vpn-password-dialog.ui
-src/libnma/nma-wifi-dialog.c
-src/libnma/wifi.ui
-src/libnm-gtk/nm-mobile-providers.c
-src/libnm-gtk/nm-mobile-wizard.c
-src/libnm-gtk/nm-ui-utils.c
-src/libnm-gtk/nm-vpn-password-dialog.c
-src/libnm-gtk/nm-wifi-dialog.c
-src/libnm-gtk/tests/test-mobile-providers.c
-src/libnm-gtk/wifi.ui
-src/main.c
-src/mb-menu-item.c
-src/mobile-helpers.c
+src/nma-bar-code-widget.c
+src/nma-bar-code-widget.ui
+src/nma-file-cert-chooser.c
+src/nma-mobile-providers.c
+src/nma-mobile-wizard.c
+src/nma-mobile-wizard.ui
+src/nma-cert-chooser-button.c
+src/nma-pkcs11-cert-chooser.c
+src/nma-pkcs11-cert-chooser-dialog.c
+src/nma-pkcs11-cert-chooser-dialog.ui
+src/nma-pkcs11-token-login-dialog.c
+src/nma-pkcs11-token-login-dialog.ui
+src/nma-ui-utils.c
+src/nma-vpn-password-dialog.c
+src/nma-vpn-password-dialog.ui
+src/nma-wifi-dialog.c
+src/wifi.ui
src/utils/utils.c
src/wireless-security/eap-method.c
src/wireless-security/eap-method-fast.c
diff --git a/po/meson.build b/po/meson.build
index 6e614998..ce83c554 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1 @@
-i18n.gettext(nma_name, preset: 'glib')
+i18n.gettext('libnma', preset: 'glib')
diff --git a/src/libnma/init.c b/src/init.c
similarity index 100%
rename from src/libnma/init.c
rename to src/init.c
diff --git a/src/libnma/libnma-gtk4.pc.in b/src/libnma-gtk4.pc.in
similarity index 100%
rename from src/libnma/libnma-gtk4.pc.in
rename to src/libnma-gtk4.pc.in
diff --git a/src/libnma/libnma.pc.in b/src/libnma.pc.in
similarity index 100%
rename from src/libnma/libnma.pc.in
rename to src/libnma.pc.in
diff --git a/src/libnma/libnma.ver b/src/libnma.ver
similarity index 100%
rename from src/libnma/libnma.ver
rename to src/libnma.ver
diff --git a/src/meson.build b/src/meson.build
index 761cfb43..3cd98f4e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,11 +1,5 @@
src_inc = include_directories('.')
-# FIXME: although this file is contained in the libnma directory
-# it should be generated before because it's used at
-# wireless-security directory, which is needed later for
-# libnma directory.
-libnma_inc = include_directories('libnma')
-
version_conf = configuration_data()
version_conf.set('NMA_MAJOR_VERSION', nma_major_version)
version_conf.set('NMA_MINOR_VERSION', nma_minor_version)
@@ -14,7 +8,7 @@ version_conf.set('NMA_MICRO_VERSION', nma_micro_version)
version = 'nma-version.h'
version_header = configure_file(
- input: 'libnma/' + version + '.in',
+ input: version + '.in',
output: version,
configuration: version_conf,
install_dir: join_paths(nma_includedir, 'libnma')
@@ -22,93 +16,188 @@ version_header = configure_file(
subdir('utils')
subdir('wireless-security')
-subdir('libnma')
-if enable_libnm_gtk
- subdir('libnm-gtk')
-endif
+cert_chooser_headers = files('nma-cert-chooser.h')
-subdir('connection-editor')
-
-sources = files(
- 'ap-menu-item.c',
- 'applet-agent.c',
- 'applet.c',
- 'applet-device-bt.c',
- 'applet-device-ethernet.c',
- 'applet-device-wifi.c',
- 'applet-dialogs.c',
- 'applet-vpn-request.c',
- 'ethernet-dialog.c',
- 'main.c',
- 'mb-menu-item.c',
- 'mobile-helpers.c'
+cert_chooser_sources = files(
+ 'nma-cert-chooser.c',
+ 'nma-file-cert-chooser.c'
)
resource_data = files(
- '8021x.ui',
- 'connection-editor/ce-page-dsl.ui',
- 'gsm-unlock.ui',
- 'info.ui'
+ 'nma-pkcs11-cert-chooser-dialog.ui',
+ 'nma-pkcs11-token-login-dialog.ui',
+ 'wifi.ui'
)
-sources += gnome.compile_resources(
- 'applet-resources',
- 'applet.gresource.xml',
+built_sources = gnome.compile_resources(
+ 'nma-resources',
+ 'nma.gresource.xml',
dependencies: resource_data
)
+gir_headers = cert_chooser_headers + files(
+ 'nma-bar-code-widget.h',
+ 'nma-bar-code.h',
+ 'nma-mobile-providers.h',
+ 'nma-mobile-wizard.h',
+ 'nma-ui-utils.h',
+ 'nma-vpn-password-dialog.h',
+ 'nma-wifi-dialog.h'
+)
+
+install_headers(
+ gir_headers,
+ subdir: 'libnma'
+)
+
+gir_sources = [version_header] + cert_chooser_sources + files(
+ 'init.c',
+ 'nma-bar-code-widget.c',
+ 'nma-bar-code.c',
+ 'nma-mobile-providers.c',
+ 'nma-mobile-wizard.c',
+ 'nma-ui-utils.c',
+ 'nma-vpn-password-dialog.c',
+ 'nma-wifi-dialog.c'
+)
+
incs = [
top_inc,
- utils_inc,
- src_inc,
shared_inc,
+ src_inc,
wireless_security_inc
]
deps = [
- gtk_dep,
libnm_dep,
- libnma_dep,
- libnotify_dep,
- libsecret_dep,
- m_dep
+ libutils_libnm_dep,
]
cflags = [
+ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB',
'-DBINDIR="@0@"'.format(nma_bindir),
'-DDATADIR="@0@"'.format(nma_datadir),
- '-DLIBDIR="@0@"'.format(nma_libdir),
'-DLIBEXECDIR="@0@"'.format(nma_libexecdir),
'-DNMALOCALEDIR="@0@"'.format(nma_localedir),
'-DSYSCONFDIR="@0@"'.format(nma_sysconfdir),
'-DAUTOSTARTDIR="@0@"'.format(nma_autostartdir),
- '-DICONDIR="@0@"'.format(nma_icondir),
- '-DG_LOG_DOMAIN="@0@"'.format(nma_name)
+ '-DICONDIR="@0@"'.format(nma_icondir)
]
-if enable_appindicator == 'ayatana' or enable_appindicator == 'ubuntu'
- deps += [
- appindicator_dep,
- dbusmenu_dep
- ]
+symbol_map = join_paths(meson.current_source_dir(), 'libnma.ver')
+
+nma_deps = [ deps, gtk_dep ]
+nma_sources = [ gir_sources, built_sources ]
+if enable_gcr
+ nma_sources += files(
+ 'nma-cert-chooser-button.c',
+ 'nma-pkcs11-cert-chooser.c',
+ 'nma-pkcs11-cert-chooser-dialog.c',
+ 'nma-pkcs11-token-login-dialog.c'
+ )
+ nma_deps += gcr_dep
endif
-if enable_wwan
- sources += files('applet-device-broadband.c')
-
- deps += mm_glib_dep
-endif
-
-executable(
- nma_name,
- sources,
+libnma = shared_library(
+ 'nma',
+ sources: nma_sources,
+ version: libversion,
include_directories: incs,
- dependencies: deps,
+ dependencies: nma_deps,
c_args: cflags,
- link_args: '-Wl,--version-script,@0@'.format(linker_script_ver),
- link_depends: linker_script_ver,
+ link_args: '-Wl,--version-script,' + symbol_map,
+ link_depends: symbol_map,
link_whole: libwireless_security_libnm,
install: true,
- install_dir: nma_bindir
+ install_dir: nma_libdir
+)
+
+libnma_dep = declare_dependency(
+ link_with: libnma,
+ include_directories: src_inc
)
+
+if enable_libnma_gtk4
+ libnma_gtk4 = shared_library(
+ 'nma-gtk4',
+ sources: gir_sources + built_sources,
+ version: libversion,
+ include_directories: incs,
+ dependencies: [ deps, gtk4_dep ],
+ c_args: cflags,
+ link_args: '-Wl,--version-script,' + symbol_map,
+ link_depends: symbol_map,
+ link_whole: libwireless_security_libnma_gtk4,
+ install: true,
+ install_dir: nma_libdir
+ )
+
+ libnma_gtk4_dep = declare_dependency(
+ link_with: libnma_gtk4,
+ include_directories: src_inc
+ )
+endif
+
+subdir('tests')
+
+pkg.generate(
+ libraries: libnma,
+ version: nma_version,
+ name: 'libnma',
+ description: 'NetworkManager UI utilities (libnm version)',
+ filebase: 'libnma',
+ subdirs: 'libnma',
+ requires: 'libnm',
+ variables: 'exec_prefix=' + nma_prefix,
+ install_dir: join_paths(nma_libdir, 'pkgconfig')
+)
+
+if enable_libnma_gtk4
+ pkg.generate(
+ libraries: libnma_gtk4,
+ version: nma_version,
+ name: 'libnma-gtk4',
+ description: 'NetworkManager UI utilities (gtk4 version)',
+ filebase: 'libnma-gtk4',
+ subdirs: 'libnma',
+ requires: 'libnm',
+ variables: 'exec_prefix=' + nma_prefix,
+ install_dir: join_paths(nma_libdir, 'pkgconfig')
+ )
+endif
+
+if enable_introspection
+ gir_dir = join_paths(nma_datadir, 'gir-' + nma_gir_version)
+ typelib_dir = join_paths(nma_libdir, 'girepository-' + nma_gir_version)
+
+ gnome.generate_gir(
+ libnma,
+ sources: gir_sources + gir_headers,
+ nsversion: nma_gir_version,
+ namespace: 'NMA',
+ includes: [ 'Gtk-3.0', 'NM-1.0' ],
+ identifier_prefix: nma_gir_prefix,
+ symbol_prefix: nma_gir_prefix.to_lower(),
+ export_packages: 'libnma',
+ install: true,
+ install_dir_gir: gir_dir,
+ install_dir_typelib: typelib_dir
+ )
+
+ if enable_libnma_gtk4
+ gnome.generate_gir(
+ libnma,
+ sources: gir_sources + gir_headers,
+ nsversion: nma_gir_version,
+ namespace: 'NMA4',
+ includes: [ 'Gtk-4.0', 'NM-1.0' ],
+ identifier_prefix: nma_gir_prefix,
+ symbol_prefix: nma_gir_prefix.to_lower(),
+ export_packages: 'libnma',
+ install: true,
+ install_dir_gir: gir_dir,
+ install_dir_typelib: typelib_dir
+ )
+ endif
+endif
diff --git a/src/libnma/nma-bar-code-widget.c b/src/nma-bar-code-widget.c
similarity index 100%
rename from src/libnma/nma-bar-code-widget.c
rename to src/nma-bar-code-widget.c
diff --git a/src/libnma/nma-bar-code-widget.h b/src/nma-bar-code-widget.h
similarity index 100%
rename from src/libnma/nma-bar-code-widget.h
rename to src/nma-bar-code-widget.h
diff --git a/src/libnma/nma-bar-code-widget.ui b/src/nma-bar-code-widget.ui
similarity index 100%
rename from src/libnma/nma-bar-code-widget.ui
rename to src/nma-bar-code-widget.ui
diff --git a/src/libnma/nma-bar-code.c b/src/nma-bar-code.c
similarity index 100%
rename from src/libnma/nma-bar-code.c
rename to src/nma-bar-code.c
diff --git a/src/libnma/nma-bar-code.h b/src/nma-bar-code.h
similarity index 100%
rename from src/libnma/nma-bar-code.h
rename to src/nma-bar-code.h
diff --git a/src/libnma/nma-cert-chooser-button.c b/src/nma-cert-chooser-button.c
similarity index 100%
rename from src/libnma/nma-cert-chooser-button.c
rename to src/nma-cert-chooser-button.c
diff --git a/src/libnma/nma-cert-chooser-button.h b/src/nma-cert-chooser-button.h
similarity index 100%
rename from src/libnma/nma-cert-chooser-button.h
rename to src/nma-cert-chooser-button.h
diff --git a/src/libnma/nma-cert-chooser-private.h b/src/nma-cert-chooser-private.h
similarity index 100%
rename from src/libnma/nma-cert-chooser-private.h
rename to src/nma-cert-chooser-private.h
diff --git a/src/libnma/nma-cert-chooser.c b/src/nma-cert-chooser.c
similarity index 100%
rename from src/libnma/nma-cert-chooser.c
rename to src/nma-cert-chooser.c
diff --git a/src/libnma/nma-cert-chooser.h b/src/nma-cert-chooser.h
similarity index 100%
rename from src/libnma/nma-cert-chooser.h
rename to src/nma-cert-chooser.h
diff --git a/src/libnma/nma-file-cert-chooser.c b/src/nma-file-cert-chooser.c
similarity index 100%
rename from src/libnma/nma-file-cert-chooser.c
rename to src/nma-file-cert-chooser.c
diff --git a/src/libnma/nma-mobile-providers.c b/src/nma-mobile-providers.c
similarity index 100%
rename from src/libnma/nma-mobile-providers.c
rename to src/nma-mobile-providers.c
diff --git a/src/libnma/nma-mobile-providers.h b/src/nma-mobile-providers.h
similarity index 100%
rename from src/libnma/nma-mobile-providers.h
rename to src/nma-mobile-providers.h
diff --git a/src/libnma/nma-mobile-wizard.c b/src/nma-mobile-wizard.c
similarity index 100%
rename from src/libnma/nma-mobile-wizard.c
rename to src/nma-mobile-wizard.c
diff --git a/src/libnma/nma-mobile-wizard.h b/src/nma-mobile-wizard.h
similarity index 100%
rename from src/libnma/nma-mobile-wizard.h
rename to src/nma-mobile-wizard.h
diff --git a/src/libnma/nma-mobile-wizard.ui b/src/nma-mobile-wizard.ui
similarity index 100%
rename from src/libnma/nma-mobile-wizard.ui
rename to src/nma-mobile-wizard.ui
diff --git a/src/libnma/nma-pkcs11-cert-chooser-dialog.c b/src/nma-pkcs11-cert-chooser-dialog.c
similarity index 100%
rename from src/libnma/nma-pkcs11-cert-chooser-dialog.c
rename to src/nma-pkcs11-cert-chooser-dialog.c
diff --git a/src/libnma/nma-pkcs11-cert-chooser-dialog.h b/src/nma-pkcs11-cert-chooser-dialog.h
similarity index 100%
rename from src/libnma/nma-pkcs11-cert-chooser-dialog.h
rename to src/nma-pkcs11-cert-chooser-dialog.h
diff --git a/src/libnma/nma-pkcs11-cert-chooser-dialog.ui b/src/nma-pkcs11-cert-chooser-dialog.ui
similarity index 100%
rename from src/libnma/nma-pkcs11-cert-chooser-dialog.ui
rename to src/nma-pkcs11-cert-chooser-dialog.ui
diff --git a/src/libnma/nma-pkcs11-cert-chooser.c b/src/nma-pkcs11-cert-chooser.c
similarity index 100%
rename from src/libnma/nma-pkcs11-cert-chooser.c
rename to src/nma-pkcs11-cert-chooser.c
diff --git a/src/libnma/nma-pkcs11-token-login-dialog.c b/src/nma-pkcs11-token-login-dialog.c
similarity index 100%
rename from src/libnma/nma-pkcs11-token-login-dialog.c
rename to src/nma-pkcs11-token-login-dialog.c
diff --git a/src/libnma/nma-pkcs11-token-login-dialog.h b/src/nma-pkcs11-token-login-dialog.h
similarity index 100%
rename from src/libnma/nma-pkcs11-token-login-dialog.h
rename to src/nma-pkcs11-token-login-dialog.h
diff --git a/src/libnma/nma-pkcs11-token-login-dialog.ui b/src/nma-pkcs11-token-login-dialog.ui
similarity index 100%
rename from src/libnma/nma-pkcs11-token-login-dialog.ui
rename to src/nma-pkcs11-token-login-dialog.ui
diff --git a/src/libnma/nma-private.h b/src/nma-private.h
similarity index 100%
rename from src/libnma/nma-private.h
rename to src/nma-private.h
diff --git a/src/libnma/nma-ui-utils.c b/src/nma-ui-utils.c
similarity index 100%
rename from src/libnma/nma-ui-utils.c
rename to src/nma-ui-utils.c
diff --git a/src/libnma/nma-ui-utils.h b/src/nma-ui-utils.h
similarity index 100%
rename from src/libnma/nma-ui-utils.h
rename to src/nma-ui-utils.h
diff --git a/src/libnma/nma-version.h.in b/src/nma-version.h.in
similarity index 100%
rename from src/libnma/nma-version.h.in
rename to src/nma-version.h.in
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/nma-vpn-password-dialog.c
similarity index 100%
rename from src/libnma/nma-vpn-password-dialog.c
rename to src/nma-vpn-password-dialog.c
diff --git a/src/libnma/nma-vpn-password-dialog.h b/src/nma-vpn-password-dialog.h
similarity index 100%
rename from src/libnma/nma-vpn-password-dialog.h
rename to src/nma-vpn-password-dialog.h
diff --git a/src/libnma/nma-vpn-password-dialog.ui b/src/nma-vpn-password-dialog.ui
similarity index 100%
rename from src/libnma/nma-vpn-password-dialog.ui
rename to src/nma-vpn-password-dialog.ui
diff --git a/src/libnma/nma-wifi-dialog.c b/src/nma-wifi-dialog.c
similarity index 100%
rename from src/libnma/nma-wifi-dialog.c
rename to src/nma-wifi-dialog.c
diff --git a/src/libnma/nma-wifi-dialog.h b/src/nma-wifi-dialog.h
similarity index 100%
rename from src/libnma/nma-wifi-dialog.h
rename to src/nma-wifi-dialog.h
diff --git a/src/libnma/nma.gresource.xml b/src/nma.gresource.xml
similarity index 100%
rename from src/libnma/nma.gresource.xml
rename to src/nma.gresource.xml
diff --git a/src/libnma/qrcodegen.c b/src/qrcodegen.c
similarity index 100%
rename from src/libnma/qrcodegen.c
rename to src/qrcodegen.c
diff --git a/src/libnma/qrcodegen.h b/src/qrcodegen.h
similarity index 100%
rename from src/libnma/qrcodegen.h
rename to src/qrcodegen.h
diff --git a/src/libnma/tests/bar-code.c b/src/tests/bar-code.c
similarity index 100%
rename from src/libnma/tests/bar-code.c
rename to src/tests/bar-code.c
diff --git a/src/libnma/tests/cert-chooser.c b/src/tests/cert-chooser.c
similarity index 100%
rename from src/libnma/tests/cert-chooser.c
rename to src/tests/cert-chooser.c
diff --git a/src/libnma/tests/meson.build b/src/tests/meson.build
similarity index 100%
rename from src/libnma/tests/meson.build
rename to src/tests/meson.build
diff --git a/src/libnma/tests/mobile-wizard.c b/src/tests/mobile-wizard.c
similarity index 100%
rename from src/libnma/tests/mobile-wizard.c
rename to src/tests/mobile-wizard.c
diff --git a/src/libnma/tests/run-vpn.c b/src/tests/run-vpn.c
similarity index 100%
rename from src/libnma/tests/run-vpn.c
rename to src/tests/run-vpn.c
diff --git a/src/libnma/tests/vpn-password-dialog.c b/src/tests/vpn-password-dialog.c
similarity index 100%
rename from src/libnma/tests/vpn-password-dialog.c
rename to src/tests/vpn-password-dialog.c
diff --git a/src/libnma/tests/wifi-dialog-secrets.c b/src/tests/wifi-dialog-secrets.c
similarity index 100%
rename from src/libnma/tests/wifi-dialog-secrets.c
rename to src/tests/wifi-dialog-secrets.c
diff --git a/src/libnma/tests/wifi-dialog.c b/src/tests/wifi-dialog.c
similarity index 100%
rename from src/libnma/tests/wifi-dialog.c
rename to src/tests/wifi-dialog.c
diff --git a/src/utils/meson.build b/src/utils/meson.build
index 11d23911..c3bec9ea 100644
--- a/src/utils/meson.build
+++ b/src/utils/meson.build
@@ -35,27 +35,3 @@ exe = executable(
)
test(test_unit, exe)
-
-if enable_libnm_gtk
- deps = [
- gtk_dep,
- libnm_glib_dep
- ]
-
- cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
-
- libutils_libnm_glib = static_library(
- 'utils-libnm-glib',
- sources: shared_legacy_sources + files(
- 'utils.c',
- ),
- include_directories: incs,
- dependencies: deps,
- c_args: cflags
- )
-
- libutils_libnm_glib_dep = declare_dependency(
- link_with: libutils_libnm_glib,
- include_directories: utils_inc
- )
-endif
diff --git a/src/libnma/wifi.ui b/src/wifi.ui
similarity index 100%
rename from src/libnma/wifi.ui
rename to src/wifi.ui
diff --git a/src/wireless-security/meson.build b/src/wireless-security/meson.build
index 2348fcb9..64f126ab 100644
--- a/src/wireless-security/meson.build
+++ b/src/wireless-security/meson.build
@@ -42,8 +42,7 @@ sources += gnome.compile_resources(
incs = [
top_inc,
shared_inc,
- src_inc,
- libnma_inc
+ src_inc
]
deps = [
@@ -74,21 +73,3 @@ if enable_libnma_gtk4
c_args: cflags
)
endif
-
-if enable_libnm_gtk
- deps = [
- gtk_dep,
- libnm_glib_dep,
- libutils_libnm_glib_dep
- ]
-
- cflags = '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY'
-
- libwireless_security_libnm_glib = static_library(
- 'wireless-security-libnm-glib',
- sources: sources,
- include_directories: incs,
- dependencies: deps,
- c_args: cflags
- )
-endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
