GNOME.org
 

[libnma/lr/nma-ws: 4/4] wireless-security: drop

commit 3656a977e2955f2f2351a29055bf45dfad73a093
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Tue Oct 29 16:28:05 2019 +0100

    wireless-security: drop
    
    This is now replaced by functionality provided directly by libnma,

 Makefile.am                                | 127 +-----
 meson.build                                |   2 -
 po/POTFILES.in                             |  24 --
 src/meson.build                            |   4 -
 src/wireless-security/eap-method-fast.c    | 439 ---------------------
 src/wireless-security/eap-method-fast.h    |  22 --
 src/wireless-security/eap-method-fast.ui   | 183 ---------
 src/wireless-security/eap-method-leap.c    | 257 -------------
 src/wireless-security/eap-method-leap.h    |  21 -
 src/wireless-security/eap-method-leap.ui   |  99 -----
 src/wireless-security/eap-method-peap.c    | 487 -----------------------
 src/wireless-security/eap-method-peap.h    |  22 --
 src/wireless-security/eap-method-peap.ui   | 215 -----------
 src/wireless-security/eap-method-simple.c  | 484 -----------------------
 src/wireless-security/eap-method-simple.h  |  51 ---
 src/wireless-security/eap-method-simple.ui | 158 --------
 src/wireless-security/eap-method-tls.c     | 498 ------------------------
 src/wireless-security/eap-method-tls.h     |  22 --
 src/wireless-security/eap-method-tls.ui    | 106 -----
 src/wireless-security/eap-method-ttls.c    | 522 -------------------------
 src/wireless-security/eap-method-ttls.h    |  22 --
 src/wireless-security/eap-method-ttls.ui   | 165 --------
 src/wireless-security/eap-method.c         | 427 ---------------------
 src/wireless-security/eap-method.h         | 107 ------
 src/wireless-security/helpers.c            |  39 --
 src/wireless-security/helpers.h            |  21 -
 src/wireless-security/meson.build          |  75 ----
 src/wireless-security/wireless-security.c  | 594 -----------------------------
 src/wireless-security/wireless-security.h  | 137 -------
 src/wireless-security/ws-dynamic-wep.c     | 119 ------
 src/wireless-security/ws-dynamic-wep.h     |  18 -
 src/wireless-security/ws-dynamic-wep.ui    |  87 -----
 src/wireless-security/ws-leap.c            | 207 ----------
 src/wireless-security/ws-leap.h            |  16 -
 src/wireless-security/ws-leap.ui           | 100 -----
 src/wireless-security/ws-sae.c             | 203 ----------
 src/wireless-security/ws-sae.h             |  16 -
 src/wireless-security/ws-sae.ui            |  98 -----
 src/wireless-security/ws-wep-key.c         | 355 -----------------
 src/wireless-security/ws-wep-key.h         |  19 -
 src/wireless-security/ws-wep-key.ui        | 172 ---------
 src/wireless-security/ws-wpa-eap.c         | 121 ------
 src/wireless-security/ws-wpa-eap.h         |  19 -
 src/wireless-security/ws-wpa-eap.ui        |  87 -----
 src/wireless-security/ws-wpa-psk.c         | 220 -----------
 src/wireless-security/ws-wpa-psk.h         |  16 -
 src/wireless-security/ws-wpa-psk.ui        |  98 -----
 src/wireless-security/ws.gresource.xml     |  17 -
 48 files changed, 3 insertions(+), 7315 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index a31fcd1a..57e3cb89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,124 +121,6 @@ EXTRA_DIST += src/utils/meson.build
 
 ###############################################################################
 
-src/wireless-security/ws-resources.h: src/wireless-security/ws.gresource.xml
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/wireless-security 
--generate-header --internal
-
-src/wireless-security/ws-resources.c: src/wireless-security/ws.gresource.xml $(shell 
$(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/src/wireless-security --generate-dependencies 
$(srcdir)/src/wireless-security/ws.gresource.xml)
-       $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src/wireless-security 
--generate-source --internal
-
-CLEANFILES += \
-       $(wireless_security_h_gen) \
-       $(wireless_security_c_gen)
-
-wireless_security_h_gen = \
-       src/wireless-security/ws-resources.h
-
-wireless_security_c_gen = \
-       src/wireless-security/ws-resources.c
-
-wireless_security_c_real = \
-       src/wireless-security/wireless-security.h \
-       src/wireless-security/wireless-security.c \
-       src/wireless-security/ws-sae.h \
-       src/wireless-security/ws-sae.c \
-       src/wireless-security/ws-wep-key.h \
-       src/wireless-security/ws-wep-key.c \
-       src/wireless-security/ws-wpa-psk.h \
-       src/wireless-security/ws-wpa-psk.c \
-       src/wireless-security/ws-leap.h \
-       src/wireless-security/ws-leap.c \
-       src/wireless-security/ws-wpa-eap.h \
-       src/wireless-security/ws-wpa-eap.c \
-       src/wireless-security/ws-dynamic-wep.h \
-       src/wireless-security/ws-dynamic-wep.c \
-       src/wireless-security/eap-method.h \
-       src/wireless-security/eap-method.c \
-       src/wireless-security/eap-method-tls.h \
-       src/wireless-security/eap-method-tls.c \
-       src/wireless-security/eap-method-leap.h \
-       src/wireless-security/eap-method-leap.c \
-       src/wireless-security/eap-method-fast.h \
-       src/wireless-security/eap-method-fast.c \
-       src/wireless-security/eap-method-ttls.h \
-       src/wireless-security/eap-method-ttls.c \
-       src/wireless-security/eap-method-peap.h \
-       src/wireless-security/eap-method-peap.c \
-       src/wireless-security/eap-method-simple.h \
-       src/wireless-security/eap-method-simple.c \
-       src/wireless-security/helpers.h \
-       src/wireless-security/helpers.c
-
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm.la
-
-src_wireless_security_libwireless_security_libnm_la_SOURCES = \
-       $(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_la_SOURCES = \
-       $(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_la_CPPFLAGS = \
-       $(dflt_cppflags) \
-       "-I$(srcdir)/shared" \
-       "-I$(srcdir)/src/utils" \
-       "-I$(srcdir)/src" \
-       -Isrc \
-       $(GTK3_CFLAGS) \
-       $(LIBNM_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_la_LIBADD = \
-       src/utils/libutils-libnm.la \
-       $(GTK3_LIBS) \
-       $(LIBNM_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_la_OBJECTS): $(wireless_security_h_gen)
-
-if WITH_LIBNMA_GTK4
-
-noinst_LTLIBRARIES += src/wireless-security/libwireless-security-libnm-gtk4.la
-
-src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
-       $(wireless_security_c_real)
-
-nodist_src_wireless_security_libwireless_security_libnm_gtk4_la_SOURCES = \
-       $(wireless_security_c_gen)
-
-src_wireless_security_libwireless_security_libnm_gtk4_la_CPPFLAGS = \
-       "-I$(srcdir)/shared" \
-       "-I$(srcdir)/src/utils" \
-       "-I$(srcdir)/src" \
-       -Isrc \
-       $(GTK4_CFLAGS) \
-       $(LIBNM_CFLAGS)
-
-src_wireless_security_libwireless_security_libnm_gtk4_la_LIBADD = \
-       src/utils/libutils-libnm-gtk4.la \
-       $(GTK4_LIBS) \
-       $(LIBNM_LIBS)
-
-$(src_wireless_security_libwireless_security_libnm_gtk4_la_OBJECTS): $(wireless_security_h_gen)
-
-endif
-
-EXTRA_DIST += \
-       src/wireless-security/eap-method-fast.ui \
-       src/wireless-security/eap-method-leap.ui \
-       src/wireless-security/eap-method-peap.ui \
-       src/wireless-security/eap-method-simple.ui \
-       src/wireless-security/eap-method-tls.ui \
-       src/wireless-security/eap-method-ttls.ui \
-       src/wireless-security/ws-dynamic-wep.ui \
-       src/wireless-security/ws-leap.ui \
-       src/wireless-security/ws-sae.ui \
-       src/wireless-security/ws-wep-key.ui \
-       src/wireless-security/ws-wpa-eap.ui \
-       src/wireless-security/ws-wpa-psk.ui \
-       src/wireless-security/ws.gresource.xml \
-       src/wireless-security/meson.build
-
-###############################################################################
-
 src/nma-resources.h: src/nma.gresource.xml
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir)/src --generate-header 
--internal
 
@@ -387,7 +269,7 @@ src_libnma_la_CFLAGS = \
        $(GCR_CFLAGS)
 
 src_libnma_la_LIBADD = \
-       src/wireless-security/libwireless-security-libnm.la \
+       src/utils/libutils-libnm.la \
        $(GTK3_LIBS) \
        $(LIBNM_LIBS) \
        $(GCR_LIBS)
@@ -584,7 +466,6 @@ src_libnma_gtk4_la_CFLAGS = \
        -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
        "-I$(srcdir)/shared" \
        "-I$(srcdir)/src/utils" \
-       "-I$(srcdir)/src/wireless-security" \
        "-I$(srcdir)/src/nma-ws" \
        "-I$(srcdir)/src" \
        -Isrc \
@@ -593,7 +474,7 @@ src_libnma_gtk4_la_CFLAGS = \
        $(GCR_GCR4_CFLAGS)
 
 src_libnma_gtk4_la_LIBADD = \
-       src/wireless-security/libwireless-security-libnm-gtk4.la \
+       src/utils/libutils-libnm-gtk4.la \
        $(GTK4_LIBS) \
        $(LIBNM_LIBS) \
        $(GCR_GCR4_LIBS)
@@ -858,9 +739,7 @@ IGNORE_HFILES = \
        nma-pkcs11-token-login-dialog.h \
        nma-pkcs11-cert-chooser-dialog.h \
        nma-cert-chooser-button.h \
-       nma-eap.h \
-       eap-method.h \
-       wireless-security.h
+       nma-eap.h
 
 mkdb_ignore_c_files = \
        nma-resources.c \
diff --git a/meson.build b/meson.build
index a609489d..0e172083 100644
--- a/meson.build
+++ b/meson.build
@@ -304,8 +304,6 @@ if enable_gtk_doc
     'nma-private.h',
     'nma-version.h',
     'nma-eap.h',
-    'eap-method.h',
-    'wireless-security.h',
   ]
 
   private_sources = [
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 87c2a3de..6982ea78 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -46,27 +46,3 @@ src/nma-ws/nma-ws-wpa-psk.c
 src/nma-ws/nma-ws-wpa-psk.ui
 src/wifi.ui
 src/utils/utils.c
-src/wireless-security/eap-method.c
-src/wireless-security/eap-method-fast.c
-src/wireless-security/eap-method-fast.ui
-src/wireless-security/eap-method-leap.c
-src/wireless-security/eap-method-leap.ui
-src/wireless-security/eap-method-peap.c
-src/wireless-security/eap-method-peap.ui
-src/wireless-security/eap-method-simple.c
-src/wireless-security/eap-method-simple.ui
-src/wireless-security/eap-method-tls.c
-src/wireless-security/eap-method-tls.ui
-src/wireless-security/eap-method-ttls.c
-src/wireless-security/eap-method-ttls.ui
-src/wireless-security/wireless-security.c
-src/wireless-security/ws-dynamic-wep.ui
-src/wireless-security/ws-leap.c
-src/wireless-security/ws-leap.ui
-src/wireless-security/ws-sae.c
-src/wireless-security/ws-sae.ui
-src/wireless-security/ws-wep-key.c
-src/wireless-security/ws-wep-key.ui
-src/wireless-security/ws-wpa-eap.ui
-src/wireless-security/ws-wpa-psk.c
-src/wireless-security/ws-wpa-psk.ui
diff --git a/src/meson.build b/src/meson.build
index 879bb66c..0e6ec1d7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -15,7 +15,6 @@ version_header = configure_file(
 )
 
 subdir('utils')
-subdir('wireless-security')
 subdir('nma-ws')
 
 cert_chooser_headers = files('nma-cert-chooser.h')
@@ -70,7 +69,6 @@ incs = [
   top_inc,
   shared_inc,
   src_inc,
-  wireless_security_inc,
   nma_ws_inc,
 ]
 
@@ -113,7 +111,6 @@ libnma = shared_library(
   c_args: cflags,
   link_args: '-Wl,--version-script,' + symbol_map,
   link_depends: symbol_map,
-  link_whole: libwireless_security_libnm,
   install: true,
   install_dir: nma_libdir
 )
@@ -133,7 +130,6 @@ if enable_libnma_gtk4
     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
   )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]