[network-manager-applet] build: structure GCR dependent files differently

[Lubomir Rintel <lkundrak src gnome org>]

commit 3847f5a80c5064ee0aafe2783181aec59efda25e
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Apr 30 19:57:25 2018 +0200

    build: structure GCR dependent files differently
    
    This will make it easier to selectively disable it for Gtk 4, since a
    Gtk 4 flavor is not yet available.

 Makefile.am |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index e361a58..212f256 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -508,18 +508,16 @@ libnma_c_real = \
 libnma_h_priv_real = \
        src/libnma/nma-cert-chooser-private.h
 
-if WITH_GCR
-libnma_h_priv_real += \
+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
 
-libnma_c_real += \
+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
-endif
 
 src_libnma_libnmadir = $(includedir)/libnma
 
@@ -532,6 +530,12 @@ src_libnma_libnma_la_SOURCES = \
        $(libnma_h_priv_real) \
        $(libnma_c_real)
 
+if WITH_GCR
+src_libnma_libnma_la_SOURCES += \
+       $(libnma_h_priv_gcr) \
+       $(libnma_c_gcr)
+endif
+
 nodist_src_libnma_libnma_la_SOURCES = \
        $(libnma_h_priv_gen) \
        $(libnma_c_gen)
@@ -580,6 +584,10 @@ src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
 src_libnma_NMA_1_0_gir_FILES = \
        $(libnma_h_pub) \
        $(libnma_c_real)
+if WITH_GCR
+src_libnma_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
 endif