if LOG4VALA
-MOONSHOT_LOG_PKG= --pkg log4vala-0.1 -X -llog4vala-0.1 --define=USE_LOG4VALA
-MOONSHOT_LOG_LIBS= -llog4vala-0.1
+MOONSHOT_LOG_PKG= --pkg $(LOG4VALA_VERSION) -X -l$(LOG4VALA_VERSION) --define=USE_LOG4VALA
+MOONSHOT_LOG_LIBS= -l$(LOG4VALA_VERSION)
else
MOONSHOT_LOG_PKG=
MOONSHOT_LOG_LIBS=
src/moonshot-identity-manager-app.vala \
src/moonshot-identity-management-view.vala \
src/moonshot-local-flat-file-store.vala \
- src/moonshot-keyring-store.vala \
+ src/moonshot-keyring-store-base.vala \
+ src/moonshot-keyring-store-gnome.vala \
+ src/moonshot-keyring-store-secret.vala \
src/moonshot-idcard-store.vala \
src/moonshot-id.vala \
src/moonshot-identity-dialog.vala \
if OS_LINUX
-AM_CPPFLAGS += -I/usr/include/gnome-keyring-1
-AM_VALAFLAGS += --pkg moonshot-gnome-keyring --define=GNOME_KEYRING
-src_moonshot_LDFLAGS += -lgnome-keyring -lcrypto
-src_moonshot_webp_LDFLAGS += -lgnome-keyring -lcrypto
+AM_CPPFLAGS += $(KEYRING_CFLAGS)
+AM_VALAFLAGS += $(KEYRING_VALAFLAGS)
+src_moonshot_LDADD += $(KEYRING_LIBS) -lcrypto
+src_moonshot_webp_LDFLAGS += $(KEYRING_LIBS) -lcrypto
## Installing mime type data
mimedir = $(datadir)/mime/packages