X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=0335016f8672ad113d2720862ab4d9888a6d974c;hb=29fe8cd1eff5964712c87d001587412c0d1a5e03;hp=7345b96581dc87bc7701b2467f013271c2ffcdea;hpb=86f3901d8353fa6a36c6f04fe2d4a047faf95b61;p=moonshot-ui.git diff --git a/Makefile.am b/Makefile.am index 7345b96..0335016 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,19 +59,24 @@ src_moonshot_SOURCES = \ src/moonshot-keyring-store.vala \ src/moonshot-idcard-store.vala \ src/moonshot-id.vala \ - src/moonshot-add-dialog.vala \ + src/moonshot-identity-dialog.vala \ src/moonshot-idcard-widget.vala \ src/moonshot-custom-vbox.vala \ src/moonshot-identities-manager.vala \ src/moonshot-identity-request.vala \ - src/moonshot-server.vala \ + src/moonshot-server-linux.vala \ + src/moonshot-settings.vala \ src/moonshot-password-dialog.vala \ src/moonshot-provisioning-common.vala \ + src/moonshot-trust-anchor-dialog.vala \ src/moonshot-utils.vala \ src/moonshot-futils.c \ - src/moonshot-logger.vala + src/moonshot-crypto-utils.c \ + src/moonshot-logger.vala \ + src/moonshot-warning-dialog.vala src_moonshot_webp_SOURCES = \ + src/moonshot-crypto-utils.c \ src/moonshot-webp-parser.vala \ src/moonshot-provisioning-common.vala \ src/moonshot-id.vala \ @@ -83,7 +88,7 @@ src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS) src_moonshot_LDADD = $(moonshot_LIBS) src_moonshot_LDFLAGS = -g -O0 $(MOONSHOT_LOG_LIBS) -src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg libmoonshot $(AM_VALAFLAGS) +src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg $(GEE_VERSION) --pkg libmoonshot $(AM_VALAFLAGS) src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS) src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la src_moonshot_webp_LDFLAGS = $(MOONSHOT_LOG_LIBS) @@ -118,8 +123,8 @@ 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 -src_moonshot_webp_LDFLAGS += -lgnome-keyring +src_moonshot_LDFLAGS += -lgnome-keyring -lcrypto +src_moonshot_webp_LDFLAGS += -lgnome-keyring -lcrypto ## Installing mime type data mimedir = $(datadir)/mime/packages