diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-02-27 08:57:29 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-19 21:06:16 +0100 |
| commit | cfb753f6c907aa443307e48fb21eae0b2755bf22 (patch) | |
| tree | 7c1f2d3486edd1f9ccd29f1e18f8bb155fc938d1 /Makefile.am | |
| parent | 2644d631afd072f66878799e75c5aa1947510c7a (diff) | |
| download | network-manager-applet-cfb753f6c907aa443307e48fb21eae0b2755bf22.tar.gz | |
libnma: add the PKCS#11 capable certificate chooser
Default to it unless Gcr support is unavailable or an application
indicateas it only supports certificates in plain files.
This one is libnma only. The libnm-gtk can still utilize the
NMAFileCertChooser. Since libnm-glib doesn't support PKCS#11 tokens it
wouldn't make too much sense anyway.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 23117b70..63b76059 100644 --- a/Makefile.am +++ b/Makefile.am @@ -503,12 +503,14 @@ if WITH_GCR libnma_h_priv_real += \ src/libnma/nma-pkcs11-token-login-dialog.h \ src/libnma/nma-pkcs11-cert-chooser-dialog.h \ - src/libnma/nma-cert-chooser-button.h + src/libnma/nma-cert-chooser-button.h \ + src/libnma/nma-pkcs11-cert-chooser.h libnma_c_real += \ 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-cert-chooser-button.c \ + src/libnma/nma-pkcs11-cert-chooser.c endif src_libnma_libnmadir = $(includedir)/libnma @@ -579,6 +581,7 @@ EXTRA_DIST += \ src/libnma/libnma.ver \ src/libnma/wifi.ui \ src/libnma/nma-pkcs11-token-login-dialog.ui \ + src/libnma/nma-pkcs11-cert-chooser-dialog.ui \ src/libnma/nma.gresource.xml ############################################################################### @@ -879,14 +882,16 @@ IGNORE_HFILES = \ nma-file-cert-chooser.h \ nma-pkcs11-token-login-dialog.h \ nma-pkcs11-cert-chooser-dialog.h \ - nma-cert-chooser-button.h + nma-cert-chooser-button.h \ + nma-pkcs11-cert-chooser.h mkdb_ignore_c_files = \ nma-resources.c \ nma-file-cert-chooser.c \ nma-pkcs11-token-login-dialog.c \ nma-pkcs11-cert-chooser-dialog.c \ - nma-cert-chooser-button.c + nma-cert-chooser-button.c \ + nma-pkcs11-cert-chooser.c MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)" |