GNOME.org
 

[libnma/lr/wireless-security: 2/9] wireless-security-nolib

commit 1a77627ab403a4dc5bec86bfd7fedf19bdb992fc
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Fri Oct 18 20:31:06 2019 +0200

    wireless-security-nolib

 Makefile.am                            | 188 ++++++++++++---------------------
 src/libnma.ver                         |  22 ++++
 src/nma.gresource.xml                  |  13 +++
 src/wireless-security/ws.gresource.xml |  17 ---
 4 files changed, 100 insertions(+), 140 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 390f67dd..08c3caed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,124 +128,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
 
@@ -284,7 +166,21 @@ libnma_h_pub = \
        src/nma-ui-utils.h \
        src/nma-cert-chooser.h \
        src/nma-bar-code-widget.h \
-       src/nma-bar-code.h
+       src/nma-bar-code.h \
+       src/wireless-security/ws-dynamic-wep.h \
+       src/wireless-security/ws-leap.h \
+       src/wireless-security/ws-sae.h \
+       src/wireless-security/ws-wep-key.h \
+       src/wireless-security/ws-wpa-eap.h \
+       src/wireless-security/ws-wpa-psk.h \
+       src/wireless-security/eap-method-fast.h \
+       src/wireless-security/eap-method.h \
+       src/wireless-security/eap-method-leap.h \
+       src/wireless-security/eap-method-peap.h \
+       src/wireless-security/eap-method-simple.h \
+       src/wireless-security/eap-method-tls.h \
+       src/wireless-security/eap-method-ttls.h \
+       src/wireless-security/wireless-security.h
 
 libnma_c_real = \
        src/nma-wifi-dialog.c \
@@ -296,7 +192,38 @@ libnma_c_real = \
        src/nma-cert-chooser.c \
        src/nma-file-cert-chooser.c \
        src/nma-bar-code-widget.c \
-       src/nma-bar-code.c
+       src/nma-bar-code.c \
+       \
+       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
 
 EXTRA_DIST += \
        src/qrcodegen.c \
@@ -358,7 +285,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)
@@ -552,7 +479,6 @@ src_libnma_gtk4_la_CFLAGS = \
        $(GCR_GCR4_CFLAGS)
 
 src_libnma_gtk4_la_LIBADD = \
-       src/wireless-security/libwireless-security-libnm-gtk4.la \
        $(GTK4_LIBS) \
        $(LIBNM_LIBS) \
        $(GCR_GCR4_LIBS)
@@ -745,7 +671,23 @@ EXTRA_DIST += \
        src/nma-vpn-password-dialog.ui \
        src/nma.gresource.xml \
        src/meson.build \
-       src/tests/meson.build
+       src/tests/meson.build \
+       \
+       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
+
 
 ###############################################################################
 
diff --git a/src/libnma.ver b/src/libnma.ver
index 9b263d9c..5dc00a0f 100644
--- a/src/libnma.ver
+++ b/src/libnma.ver
@@ -112,3 +112,25 @@ libnma_1_8_22 {
        nma_bar_code_widget_get_type;
        nma_bar_code_widget_new;
 } libnma_1_8_12;
+
+libnma_1_8_28 {
+       eap_method_ca_cert_ignore_load;
+       eap_method_ca_cert_ignore_save;
+       ws_802_1x_fill_connection;
+
+       wireless_security_add_to_size_group;
+       wireless_security_adhoc_compatible;
+       wireless_security_fill_connection;
+       wireless_security_get_type;
+       wireless_security_get_widget;
+       wireless_security_set_changed_notify;
+       wireless_security_unref;
+       wireless_security_validate;
+
+       ws_dynamic_wep_new;
+       ws_leap_new;
+       ws_sae_new;
+       ws_wep_key_new;
+       ws_wpa_eap_new;
+       ws_wpa_psk_new;
+} libnma_1_8_22;
diff --git a/src/nma.gresource.xml b/src/nma.gresource.xml
index cfe41a7f..80a9cd8b 100644
--- a/src/nma.gresource.xml
+++ b/src/nma.gresource.xml
@@ -7,5 +7,18 @@
                <file preprocess="xml-stripblanks">nma-mobile-wizard.ui</file>
                <file preprocess="xml-stripblanks">nma-vpn-password-dialog.ui</file>
                <file preprocess="xml-stripblanks">nma-bar-code-widget.ui</file>
+
+                <file preprocess="xml-stripblanks" 
alias="ws-dynamic-wep.ui">wireless-security/ws-dynamic-wep.ui</file>
+                <file preprocess="xml-stripblanks" alias="ws-leap.ui">wireless-security/ws-leap.ui</file>
+                <file preprocess="xml-stripblanks" alias="ws-sae.ui">wireless-security/ws-sae.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="ws-wep-key.ui">wireless-security/ws-wep-key.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="ws-wpa-eap.ui">wireless-security/ws-wpa-eap.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="ws-wpa-psk.ui">wireless-security/ws-wpa-psk.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="eap-method-fast.ui">wireless-security/eap-method-fast.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="eap-method-leap.ui">wireless-security/eap-method-leap.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="eap-method-peap.ui">wireless-security/eap-method-peap.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="eap-method-simple.ui">wireless-security/eap-method-simple.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="eap-method-tls.ui">wireless-security/eap-method-tls.ui</file>
+                <file preprocess="xml-stripblanks" 
alias="eap-method-ttls.ui">wireless-security/eap-method-ttls.ui</file>
        </gresource>
 </gresources>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]