autoreconf
[moonshot-ui.git] / Makefile.in
index 53e0b37..8a53c96 100644 (file)
@@ -40,42 +40,53 @@ host_triplet = @host@
 bin_PROGRAMS = src/moonshot$(EXEEXT) src/moonshot-webp$(EXEEXT)
 @OS_WIN32_TRUE@am__append_1 = -DOS_WIN32
 @OS_WIN32_TRUE@am__append_2 = --define=OS_WIN32
-@IPC_MSRPC_TRUE@am__append_3 = -Isrc
-@IPC_MSRPC_TRUE@am__append_4 = \
-@IPC_MSRPC_TRUE@       --pkg msrpc-1.0 \
+@OS_MACOS_TRUE@am__append_3 = -DOS_MACOS $(MAC_CFLAGS)
+@OS_MACOS_TRUE@am__append_4 = --define=OS_MACOS --pkg gtk-mac-integration
+@OS_MACOS_TRUE@am__append_5 = $(MAC_LIBS)
+@OS_MACOS_TRUE@am__append_6 = $(MAC_LIBS)
+@IPC_MSRPC_TRUE@am__append_7 = -Isrc
+@IPC_MSRPC_TRUE@am__append_8 = \
+@IPC_MSRPC_TRUE@       --pkg moonshot-msrpc.vapi --pkg msrpc-1.0 \
 @IPC_MSRPC_TRUE@       --define=IPC_MSRPC
 
-@IPC_MSRPC_TRUE@am__append_5 = \
+@IPC_MSRPC_TRUE@am__append_9 = \
 @IPC_MSRPC_TRUE@        libmoonshot/libmoonshot-msrpc.c
 
-@IPC_MSRPC_TRUE@am__append_6 = \
-@IPC_MSRPC_TRUE@        src/moonshot-msrpc.vapi
+@IPC_DBUS_TRUE@am__append_10 = libmoonshot/libmoonshot-dbus.c
+@IPC_DBUS_GLIB_TRUE@@IPC_DBUS_TRUE@am__append_11 = \
+@IPC_DBUS_GLIB_TRUE@@IPC_DBUS_TRUE@    --pkg dbus-glib-1 \
+@IPC_DBUS_GLIB_TRUE@@IPC_DBUS_TRUE@    --define=IPC_DBUS_GLIB \
+@IPC_DBUS_GLIB_TRUE@@IPC_DBUS_TRUE@    --define=IPC_DBUS
 
-@IPC_DBUS_TRUE@am__append_7 = \
-@IPC_DBUS_TRUE@        --pkg dbus-glib-1 \
-@IPC_DBUS_TRUE@        --define=IPC_DBUS
+@IPC_DBUS_GLIB_FALSE@@IPC_DBUS_TRUE@am__append_12 = \
+@IPC_DBUS_GLIB_FALSE@@IPC_DBUS_TRUE@   --pkg gio-2.0 \
+@IPC_DBUS_GLIB_FALSE@@IPC_DBUS_TRUE@   --define=IPC_GDBUS \
+@IPC_DBUS_GLIB_FALSE@@IPC_DBUS_TRUE@   --define=IPC_DBUS
 
-@IPC_DBUS_TRUE@am__append_8 = libmoonshot/libmoonshot-dbus.c
 noinst_PROGRAMS = examples/client$(EXEEXT) \
        examples/service-selection$(EXEEXT) tests/basic$(EXEEXT)
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(include_HEADERS) \
        $(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-       $(srcdir)/config.h.in $(srcdir)/moonshot-webp.desktop.in \
+       $(srcdir)/config.h.in $(srcdir)/moonshot-ui.spec.in \
+       $(srcdir)/moonshot-webp.desktop.in \
        $(srcdir)/moonshot.desktop.in $(top_srcdir)/configure \
-       ABOUT-NLS ChangeLog INSTALL build-aux/compile \
-       build-aux/config.guess build-aux/config.rpath \
-       build-aux/config.sub build-aux/depcomp build-aux/install-sh \
-       build-aux/ltmain.sh build-aux/missing \
-       examples_client_vala.stamp \
+       ABOUT-NLS INSTALL build-aux/compile build-aux/config.guess \
+       build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+       build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
+       config.vapi examples_client_vala.stamp \
        examples_service_selection_vala.stamp \
        libmoonshot_libmoonshot_la_vala.stamp \
        src/moonshot-add-dialog.c src/moonshot-custom-vbox.c \
-       src/moonshot-id.c src/moonshot-idcard-widget.c \
-       src/moonshot-identities-manager.c \
-       src/moonshot-identity-request.c src/moonshot-password-dialog.c \
-       src/moonshot-server.c src/moonshot-utils.c \
-       src/moonshot-webp-parser.c src/moonshot-window.c \
+       src/moonshot-id.c src/moonshot-idcard-store.c \
+       src/moonshot-idcard-widget.c src/moonshot-identities-manager.c \
+       src/moonshot-identity-management-view.c \
+       src/moonshot-identity-manager-app.c \
+       src/moonshot-identity-request.c \
+       src/moonshot-local-flat-file-store.c \
+       src/moonshot-password-dialog.c \
+       src/moonshot-provisioning-common.c src/moonshot-server.c \
+       src/moonshot-utils.c src/moonshot-webp-parser.c \
        src_moonshot_vala.stamp src_moonshot_webp_vala.stamp \
        tests_basic_vala.stamp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -94,7 +105,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = moonshot.desktop moonshot-webp.desktop
+CONFIG_CLEAN_FILES = moonshot.desktop moonshot-webp.desktop \
+       moonshot-ui.spec
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -152,39 +164,40 @@ examples_client_DEPENDENCIES =  \
 am_examples_service_selection_OBJECTS = examples/examples_service_selection-service-selection.$(OBJEXT)
 examples_service_selection_OBJECTS =  \
        $(am_examples_service_selection_OBJECTS)
+@OS_MACOS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)
 examples_service_selection_DEPENDENCIES =  \
        ${top_builddir}/libmoonshot/libmoonshot.la \
-       $(am__DEPENDENCIES_1)
-am__src_moonshot_SOURCES_DIST = src/moonshot-id.vala \
-       src/moonshot-add-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-window.vala src/moonshot-password-dialog.vala \
-       src/moonshot-utils.vala src/moonshot-msrpc.vapi
-am__objects_3 =
-am_src_moonshot_OBJECTS = src/src_moonshot-moonshot-id.$(OBJEXT) \
+       $(am__DEPENDENCIES_3)
+am_src_moonshot_OBJECTS =  \
+       src/src_moonshot-moonshot-identity-manager-app.$(OBJEXT) \
+       src/src_moonshot-moonshot-identity-management-view.$(OBJEXT) \
+       src/src_moonshot-moonshot-local-flat-file-store.$(OBJEXT) \
+       src/src_moonshot-moonshot-idcard-store.$(OBJEXT) \
+       src/src_moonshot-moonshot-id.$(OBJEXT) \
        src/src_moonshot-moonshot-add-dialog.$(OBJEXT) \
        src/src_moonshot-moonshot-idcard-widget.$(OBJEXT) \
        src/src_moonshot-moonshot-custom-vbox.$(OBJEXT) \
        src/src_moonshot-moonshot-identities-manager.$(OBJEXT) \
        src/src_moonshot-moonshot-identity-request.$(OBJEXT) \
        src/src_moonshot-moonshot-server.$(OBJEXT) \
-       src/src_moonshot-moonshot-window.$(OBJEXT) \
        src/src_moonshot-moonshot-password-dialog.$(OBJEXT) \
-       src/src_moonshot-moonshot-utils.$(OBJEXT) $(am__objects_3)
+       src/src_moonshot-moonshot-provisioning-common.$(OBJEXT) \
+       src/src_moonshot-moonshot-utils.$(OBJEXT)
 @IPC_MSRPC_TRUE@nodist_src_moonshot_OBJECTS = libmoonshot/src_moonshot-moonshot-msrpc_s.$(OBJEXT)
 src_moonshot_OBJECTS = $(am_src_moonshot_OBJECTS) \
        $(nodist_src_moonshot_OBJECTS)
-src_moonshot_DEPENDENCIES = $(am__DEPENDENCIES_1)
+src_moonshot_DEPENDENCIES = $(am__DEPENDENCIES_3) \
+       $(am__DEPENDENCIES_2)
 src_moonshot_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(src_moonshot_CFLAGS) \
-       $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+       $(CFLAGS) $(src_moonshot_LDFLAGS) $(LDFLAGS) -o $@
 am_src_moonshot_webp_OBJECTS =  \
        src/src_moonshot_webp-moonshot-webp-parser.$(OBJEXT) \
+       src/src_moonshot_webp-moonshot-provisioning-common.$(OBJEXT) \
        src/src_moonshot_webp-moonshot-id.$(OBJEXT)
 src_moonshot_webp_OBJECTS = $(am_src_moonshot_webp_OBJECTS)
-src_moonshot_webp_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+src_moonshot_webp_DEPENDENCIES = $(am__DEPENDENCIES_3) \
        ${top_builddir}/libmoonshot/libmoonshot.la
 src_moonshot_webp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -193,7 +206,7 @@ src_moonshot_webp_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 am_tests_basic_OBJECTS = tests/tests_basic-basic.$(OBJEXT)
 tests_basic_OBJECTS = $(am_tests_basic_OBJECTS)
 tests_basic_DEPENDENCIES = ${top_builddir}/libmoonshot/libmoonshot.la \
-       $(am__DEPENDENCIES_1)
+       $(am__DEPENDENCIES_3)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -235,9 +248,8 @@ SOURCES = $(libmoonshot_libmoonshot_la_SOURCES) \
        $(tests_basic_SOURCES)
 DIST_SOURCES = $(am__libmoonshot_libmoonshot_la_SOURCES_DIST) \
        $(examples_client_SOURCES) \
-       $(examples_service_selection_SOURCES) \
-       $(am__src_moonshot_SOURCES_DIST) $(src_moonshot_webp_SOURCES) \
-       $(tests_basic_SOURCES)
+       $(examples_service_selection_SOURCES) $(src_moonshot_SOURCES) \
+       $(src_moonshot_webp_SOURCES) $(tests_basic_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-dvi-recursive install-exec-recursive \
@@ -318,11 +330,15 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GDBUS_CFLAGS = @GDBUS_CFLAGS@
+GDBUS_LIBS = @GDBUS_LIBS@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GREP = @GREP@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
 IMAGEMAGICK_CONVERT = @IMAGEMAGICK_CONVERT@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -343,6 +359,8 @@ LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
+MAC_CFLAGS = @MAC_CFLAGS@
+MAC_LIBS = @MAC_LIBS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MIDL = @MIDL@
@@ -431,7 +449,7 @@ lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 moonshot_CFLAGS = @moonshot_CFLAGS@
-moonshot_LIBS = @moonshot_LIBS@
+moonshot_LIBS = @moonshot_LIBS@ $(am__append_5)
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 prefix = @prefix@
@@ -448,35 +466,48 @@ top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 SUBDIRS = po
 lib_LTLIBRARIES = libmoonshot/libmoonshot.la
-AM_CFLAGS = 
-AM_CPPFLAGS = -include config.h -DLOCALEDIR=\""$(localedir)"\" \
-       -I$(top_srcdir)/libmoonshot $(am__append_1) $(am__append_3)
-AM_VALAFLAGS = config.vapi --pkg gio-2.0 $(am__append_2) \
-       $(am__append_4) $(am__append_7)
+AM_CFLAGS = -g -O0
+AM_CPPFLAGS = -g -O0 -include config.h -DLOCALEDIR=\""$(localedir)"\" \
+       -I$(top_srcdir)/libmoonshot -I$(top_builddir)/libmoonshot \
+       $(am__append_1) $(am__append_3) $(am__append_7)
+AM_VALAFLAGS = -g config.vapi --vapidir=$(top_srcdir)/vapi --pkg \
+       gio-2.0 $(am__append_2) $(am__append_4) $(am__append_8) \
+       $(am__append_11) $(am__append_12)
 libmoonshot_libmoonshot_la_CPPFLAGS = \
         $(libmoonshot_CFLAGS) \
-        $(AM_CPPFLAGS)
+        $(AM_CPPFLAGS) 
 
 libmoonshot_libmoonshot_la_SOURCES = libmoonshot/libmoonshot-common.c \
-       $(am__append_5) $(am__append_8)
+       $(am__append_9) $(am__append_10)
 libmoonshot_libmoonshot_la_LIBADD = $(libmoonshot_LIBS)
 include_HEADERS = libmoonshot/libmoonshot.h
 noinst_HEADERS = libmoonshot/libmoonshot-common.h
-src_moonshot_SOURCES = src/moonshot-id.vala \
-       src/moonshot-add-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-window.vala src/moonshot-password-dialog.vala \
-       src/moonshot-utils.vala $(am__append_6)
+src_moonshot_SOURCES = \
+        src/moonshot-identity-manager-app.vala \
+        src/moonshot-identity-management-view.vala \
+        src/moonshot-local-flat-file-store.vala \
+        src/moonshot-idcard-store.vala \
+        src/moonshot-id.vala \
+        src/moonshot-add-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-password-dialog.vala \
+        src/moonshot-provisioning-common.vala \
+        src/moonshot-utils.vala
+
 src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
+        src/moonshot-provisioning-common.vala \
         src/moonshot-id.vala
 
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 $(AM_VALAFLAGS)
-src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_LDADD = $(moonshot_LIBS)
-src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
+src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0 $(AM_VALAFLAGS)
+src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)  
+src_moonshot_LDADD = $(moonshot_LIBS) $(am__append_6)
+src_moonshot_LDFLAGS = -g -O0
+src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot  --pkg gtk+-2.0 --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
 src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
 src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la
 @OS_WIN32_TRUE@libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
@@ -501,10 +532,14 @@ src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonsh
 
 # DBus service file
 @IPC_DBUS_TRUE@dbusservicedir = $(datadir)/dbus-1/services
-@IPC_DBUS_TRUE@dbusservice_in_files = org.janet.Moonshot.service.in
-@IPC_DBUS_TRUE@dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
+@IPC_DBUS_TRUE@@OS_MACOS_FALSE@dbusservice_in_files = org.janet.Moonshot.service.in
+@IPC_DBUS_TRUE@@OS_MACOS_TRUE@dbusservice_in_files = org.janet.Moonshot.service.mac
+@IPC_DBUS_TRUE@@OS_MACOS_FALSE@dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
+@IPC_DBUS_TRUE@@OS_MACOS_TRUE@dbusservice_DATA = $(dbusservice_in_files:.service.mac=.service)
 @IPC_DBUS_TRUE@CLEANFILES = $(dbusservice_DATA)
-EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files)
+EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+       moonshot-ui.spec
+
 examples_service_selection_SOURCES = examples/service-selection.c
 examples_service_selection_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
 examples_service_selection_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la $(moonshot_LIBS)
@@ -514,6 +549,7 @@ examples_client_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
 tests_basic_SOURCES = tests/basic.c
 tests_basic_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
 tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la $(moonshot_LIBS)
+@OS_MACOS_TRUE@installerdir = $(HOME)/moonshot/mac-client-installer
 all: $(BUILT_SOURCES) config.h
        $(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -574,6 +610,8 @@ moonshot.desktop: $(top_builddir)/config.status $(srcdir)/moonshot.desktop.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 moonshot-webp.desktop: $(top_builddir)/config.status $(srcdir)/moonshot-webp.desktop.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+moonshot-ui.spec: $(top_builddir)/config.status $(srcdir)/moonshot-ui.spec.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
        @$(NORMAL_INSTALL)
        test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
@@ -699,6 +737,14 @@ src/$(am__dirstamp):
 src/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) src/$(DEPDIR)
        @: > src/$(DEPDIR)/$(am__dirstamp)
+src/src_moonshot-moonshot-identity-manager-app.$(OBJEXT):  \
+       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_moonshot-moonshot-identity-management-view.$(OBJEXT):  \
+       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_moonshot-moonshot-local-flat-file-store.$(OBJEXT):  \
+       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_moonshot-moonshot-idcard-store.$(OBJEXT): src/$(am__dirstamp) \
+       src/$(DEPDIR)/$(am__dirstamp)
 src/src_moonshot-moonshot-id.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 src/src_moonshot-moonshot-add-dialog.$(OBJEXT): src/$(am__dirstamp) \
@@ -713,10 +759,10 @@ src/src_moonshot-moonshot-identity-request.$(OBJEXT):  \
        src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_moonshot-moonshot-server.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
-src/src_moonshot-moonshot-window.$(OBJEXT): src/$(am__dirstamp) \
-       src/$(DEPDIR)/$(am__dirstamp)
 src/src_moonshot-moonshot-password-dialog.$(OBJEXT):  \
        src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_moonshot-moonshot-provisioning-common.$(OBJEXT):  \
+       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_moonshot-moonshot-utils.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 libmoonshot/src_moonshot-moonshot-msrpc_s.$(OBJEXT):  \
@@ -727,6 +773,8 @@ src/moonshot$(EXEEXT): $(src_moonshot_OBJECTS) $(src_moonshot_DEPENDENCIES) src/
        $(AM_V_CCLD)$(src_moonshot_LINK) $(src_moonshot_OBJECTS) $(src_moonshot_LDADD) $(LIBS)
 src/src_moonshot_webp-moonshot-webp-parser.$(OBJEXT):  \
        src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
+src/src_moonshot_webp-moonshot-provisioning-common.$(OBJEXT):  \
+       src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp)
 src/src_moonshot_webp-moonshot-id.$(OBJEXT): src/$(am__dirstamp) \
        src/$(DEPDIR)/$(am__dirstamp)
 src/moonshot-webp$(EXEEXT): $(src_moonshot_webp_OBJECTS) $(src_moonshot_webp_DEPENDENCIES) src/$(am__dirstamp)
@@ -760,14 +808,19 @@ mostlyclean-compile:
        -rm -f src/src_moonshot-moonshot-add-dialog.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-custom-vbox.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-id.$(OBJEXT)
+       -rm -f src/src_moonshot-moonshot-idcard-store.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-idcard-widget.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-identities-manager.$(OBJEXT)
+       -rm -f src/src_moonshot-moonshot-identity-management-view.$(OBJEXT)
+       -rm -f src/src_moonshot-moonshot-identity-manager-app.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-identity-request.$(OBJEXT)
+       -rm -f src/src_moonshot-moonshot-local-flat-file-store.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-password-dialog.$(OBJEXT)
+       -rm -f src/src_moonshot-moonshot-provisioning-common.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-server.$(OBJEXT)
        -rm -f src/src_moonshot-moonshot-utils.$(OBJEXT)
-       -rm -f src/src_moonshot-moonshot-window.$(OBJEXT)
        -rm -f src/src_moonshot_webp-moonshot-id.$(OBJEXT)
+       -rm -f src/src_moonshot_webp-moonshot-provisioning-common.$(OBJEXT)
        -rm -f src/src_moonshot_webp-moonshot-webp-parser.$(OBJEXT)
        -rm -f tests/tests_basic-basic.$(OBJEXT)
 
@@ -784,14 +837,19 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-add-dialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-custom-vbox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-id.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-idcard-widget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-identities-manager.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-identity-request.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-password-dialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot-moonshot-window.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot_webp-moonshot-id.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_moonshot_webp-moonshot-webp-parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_basic-basic.Po@am__quote@
 
@@ -886,6 +944,70 @@ examples/examples_service_selection-service-selection.obj: examples/service-sele
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(examples_service_selection_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o examples/examples_service_selection-service-selection.obj `if test -f 'examples/service-selection.c'; then $(CYGPATH_W) 'examples/service-selection.c'; else $(CYGPATH_W) '$(srcdir)/examples/service-selection.c'; fi`
 
+src/src_moonshot-moonshot-identity-manager-app.o: src/moonshot-identity-manager-app.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-identity-manager-app.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Tpo -c -o src/src_moonshot-moonshot-identity-manager-app.o `test -f 'src/moonshot-identity-manager-app.c' || echo '$(srcdir)/'`src/moonshot-identity-manager-app.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Tpo src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-identity-manager-app.c' object='src/src_moonshot-moonshot-identity-manager-app.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-identity-manager-app.o `test -f 'src/moonshot-identity-manager-app.c' || echo '$(srcdir)/'`src/moonshot-identity-manager-app.c
+
+src/src_moonshot-moonshot-identity-manager-app.obj: src/moonshot-identity-manager-app.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-identity-manager-app.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Tpo -c -o src/src_moonshot-moonshot-identity-manager-app.obj `if test -f 'src/moonshot-identity-manager-app.c'; then $(CYGPATH_W) 'src/moonshot-identity-manager-app.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-identity-manager-app.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Tpo src/$(DEPDIR)/src_moonshot-moonshot-identity-manager-app.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-identity-manager-app.c' object='src/src_moonshot-moonshot-identity-manager-app.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-identity-manager-app.obj `if test -f 'src/moonshot-identity-manager-app.c'; then $(CYGPATH_W) 'src/moonshot-identity-manager-app.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-identity-manager-app.c'; fi`
+
+src/src_moonshot-moonshot-identity-management-view.o: src/moonshot-identity-management-view.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-identity-management-view.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Tpo -c -o src/src_moonshot-moonshot-identity-management-view.o `test -f 'src/moonshot-identity-management-view.c' || echo '$(srcdir)/'`src/moonshot-identity-management-view.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Tpo src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-identity-management-view.c' object='src/src_moonshot-moonshot-identity-management-view.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-identity-management-view.o `test -f 'src/moonshot-identity-management-view.c' || echo '$(srcdir)/'`src/moonshot-identity-management-view.c
+
+src/src_moonshot-moonshot-identity-management-view.obj: src/moonshot-identity-management-view.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-identity-management-view.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Tpo -c -o src/src_moonshot-moonshot-identity-management-view.obj `if test -f 'src/moonshot-identity-management-view.c'; then $(CYGPATH_W) 'src/moonshot-identity-management-view.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-identity-management-view.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Tpo src/$(DEPDIR)/src_moonshot-moonshot-identity-management-view.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-identity-management-view.c' object='src/src_moonshot-moonshot-identity-management-view.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-identity-management-view.obj `if test -f 'src/moonshot-identity-management-view.c'; then $(CYGPATH_W) 'src/moonshot-identity-management-view.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-identity-management-view.c'; fi`
+
+src/src_moonshot-moonshot-local-flat-file-store.o: src/moonshot-local-flat-file-store.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-local-flat-file-store.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Tpo -c -o src/src_moonshot-moonshot-local-flat-file-store.o `test -f 'src/moonshot-local-flat-file-store.c' || echo '$(srcdir)/'`src/moonshot-local-flat-file-store.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Tpo src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-local-flat-file-store.c' object='src/src_moonshot-moonshot-local-flat-file-store.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-local-flat-file-store.o `test -f 'src/moonshot-local-flat-file-store.c' || echo '$(srcdir)/'`src/moonshot-local-flat-file-store.c
+
+src/src_moonshot-moonshot-local-flat-file-store.obj: src/moonshot-local-flat-file-store.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-local-flat-file-store.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Tpo -c -o src/src_moonshot-moonshot-local-flat-file-store.obj `if test -f 'src/moonshot-local-flat-file-store.c'; then $(CYGPATH_W) 'src/moonshot-local-flat-file-store.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-local-flat-file-store.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Tpo src/$(DEPDIR)/src_moonshot-moonshot-local-flat-file-store.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-local-flat-file-store.c' object='src/src_moonshot-moonshot-local-flat-file-store.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-local-flat-file-store.obj `if test -f 'src/moonshot-local-flat-file-store.c'; then $(CYGPATH_W) 'src/moonshot-local-flat-file-store.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-local-flat-file-store.c'; fi`
+
+src/src_moonshot-moonshot-idcard-store.o: src/moonshot-idcard-store.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-idcard-store.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Tpo -c -o src/src_moonshot-moonshot-idcard-store.o `test -f 'src/moonshot-idcard-store.c' || echo '$(srcdir)/'`src/moonshot-idcard-store.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Tpo src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-idcard-store.c' object='src/src_moonshot-moonshot-idcard-store.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-idcard-store.o `test -f 'src/moonshot-idcard-store.c' || echo '$(srcdir)/'`src/moonshot-idcard-store.c
+
+src/src_moonshot-moonshot-idcard-store.obj: src/moonshot-idcard-store.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-idcard-store.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Tpo -c -o src/src_moonshot-moonshot-idcard-store.obj `if test -f 'src/moonshot-idcard-store.c'; then $(CYGPATH_W) 'src/moonshot-idcard-store.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-idcard-store.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Tpo src/$(DEPDIR)/src_moonshot-moonshot-idcard-store.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-idcard-store.c' object='src/src_moonshot-moonshot-idcard-store.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-idcard-store.obj `if test -f 'src/moonshot-idcard-store.c'; then $(CYGPATH_W) 'src/moonshot-idcard-store.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-idcard-store.c'; fi`
+
 src/src_moonshot-moonshot-id.o: src/moonshot-id.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-id.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-id.Tpo -c -o src/src_moonshot-moonshot-id.o `test -f 'src/moonshot-id.c' || echo '$(srcdir)/'`src/moonshot-id.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-id.Tpo src/$(DEPDIR)/src_moonshot-moonshot-id.Po
@@ -998,22 +1120,6 @@ src/src_moonshot-moonshot-server.obj: src/moonshot-server.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-server.obj `if test -f 'src/moonshot-server.c'; then $(CYGPATH_W) 'src/moonshot-server.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-server.c'; fi`
 
-src/src_moonshot-moonshot-window.o: src/moonshot-window.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-window.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-window.Tpo -c -o src/src_moonshot-moonshot-window.o `test -f 'src/moonshot-window.c' || echo '$(srcdir)/'`src/moonshot-window.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-window.Tpo src/$(DEPDIR)/src_moonshot-moonshot-window.Po
-@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-window.c' object='src/src_moonshot-moonshot-window.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-window.o `test -f 'src/moonshot-window.c' || echo '$(srcdir)/'`src/moonshot-window.c
-
-src/src_moonshot-moonshot-window.obj: src/moonshot-window.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-window.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-window.Tpo -c -o src/src_moonshot-moonshot-window.obj `if test -f 'src/moonshot-window.c'; then $(CYGPATH_W) 'src/moonshot-window.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-window.c'; fi`
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-window.Tpo src/$(DEPDIR)/src_moonshot-moonshot-window.Po
-@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-window.c' object='src/src_moonshot-moonshot-window.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-window.obj `if test -f 'src/moonshot-window.c'; then $(CYGPATH_W) 'src/moonshot-window.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-window.c'; fi`
-
 src/src_moonshot-moonshot-password-dialog.o: src/moonshot-password-dialog.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-password-dialog.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-password-dialog.Tpo -c -o src/src_moonshot-moonshot-password-dialog.o `test -f 'src/moonshot-password-dialog.c' || echo '$(srcdir)/'`src/moonshot-password-dialog.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-password-dialog.Tpo src/$(DEPDIR)/src_moonshot-moonshot-password-dialog.Po
@@ -1030,6 +1136,22 @@ src/src_moonshot-moonshot-password-dialog.obj: src/moonshot-password-dialog.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-password-dialog.obj `if test -f 'src/moonshot-password-dialog.c'; then $(CYGPATH_W) 'src/moonshot-password-dialog.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-password-dialog.c'; fi`
 
+src/src_moonshot-moonshot-provisioning-common.o: src/moonshot-provisioning-common.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-provisioning-common.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Tpo -c -o src/src_moonshot-moonshot-provisioning-common.o `test -f 'src/moonshot-provisioning-common.c' || echo '$(srcdir)/'`src/moonshot-provisioning-common.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Tpo src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-provisioning-common.c' object='src/src_moonshot-moonshot-provisioning-common.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-provisioning-common.o `test -f 'src/moonshot-provisioning-common.c' || echo '$(srcdir)/'`src/moonshot-provisioning-common.c
+
+src/src_moonshot-moonshot-provisioning-common.obj: src/moonshot-provisioning-common.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-provisioning-common.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Tpo -c -o src/src_moonshot-moonshot-provisioning-common.obj `if test -f 'src/moonshot-provisioning-common.c'; then $(CYGPATH_W) 'src/moonshot-provisioning-common.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-provisioning-common.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Tpo src/$(DEPDIR)/src_moonshot-moonshot-provisioning-common.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-provisioning-common.c' object='src/src_moonshot-moonshot-provisioning-common.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -c -o src/src_moonshot-moonshot-provisioning-common.obj `if test -f 'src/moonshot-provisioning-common.c'; then $(CYGPATH_W) 'src/moonshot-provisioning-common.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-provisioning-common.c'; fi`
+
 src/src_moonshot-moonshot-utils.o: src/moonshot-utils.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_CFLAGS) $(CFLAGS) -MT src/src_moonshot-moonshot-utils.o -MD -MP -MF src/$(DEPDIR)/src_moonshot-moonshot-utils.Tpo -c -o src/src_moonshot-moonshot-utils.o `test -f 'src/moonshot-utils.c' || echo '$(srcdir)/'`src/moonshot-utils.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot-moonshot-utils.Tpo src/$(DEPDIR)/src_moonshot-moonshot-utils.Po
@@ -1078,6 +1200,22 @@ src/src_moonshot_webp-moonshot-webp-parser.obj: src/moonshot-webp-parser.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_webp_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_webp_CFLAGS) $(CFLAGS) -c -o src/src_moonshot_webp-moonshot-webp-parser.obj `if test -f 'src/moonshot-webp-parser.c'; then $(CYGPATH_W) 'src/moonshot-webp-parser.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-webp-parser.c'; fi`
 
+src/src_moonshot_webp-moonshot-provisioning-common.o: src/moonshot-provisioning-common.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_webp_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_webp_CFLAGS) $(CFLAGS) -MT src/src_moonshot_webp-moonshot-provisioning-common.o -MD -MP -MF src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Tpo -c -o src/src_moonshot_webp-moonshot-provisioning-common.o `test -f 'src/moonshot-provisioning-common.c' || echo '$(srcdir)/'`src/moonshot-provisioning-common.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Tpo src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-provisioning-common.c' object='src/src_moonshot_webp-moonshot-provisioning-common.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_webp_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_webp_CFLAGS) $(CFLAGS) -c -o src/src_moonshot_webp-moonshot-provisioning-common.o `test -f 'src/moonshot-provisioning-common.c' || echo '$(srcdir)/'`src/moonshot-provisioning-common.c
+
+src/src_moonshot_webp-moonshot-provisioning-common.obj: src/moonshot-provisioning-common.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_webp_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_webp_CFLAGS) $(CFLAGS) -MT src/src_moonshot_webp-moonshot-provisioning-common.obj -MD -MP -MF src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Tpo -c -o src/src_moonshot_webp-moonshot-provisioning-common.obj `if test -f 'src/moonshot-provisioning-common.c'; then $(CYGPATH_W) 'src/moonshot-provisioning-common.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-provisioning-common.c'; fi`
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Tpo src/$(DEPDIR)/src_moonshot_webp-moonshot-provisioning-common.Po
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='src/moonshot-provisioning-common.c' object='src/src_moonshot_webp-moonshot-provisioning-common.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_webp_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_webp_CFLAGS) $(CFLAGS) -c -o src/src_moonshot_webp-moonshot-provisioning-common.obj `if test -f 'src/moonshot-provisioning-common.c'; then $(CYGPATH_W) 'src/moonshot-provisioning-common.c'; else $(CYGPATH_W) '$(srcdir)/src/moonshot-provisioning-common.c'; fi`
+
 src/src_moonshot_webp-moonshot-id.o: src/moonshot-id.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_moonshot_webp_CPPFLAGS) $(CPPFLAGS) $(src_moonshot_webp_CFLAGS) $(CFLAGS) -MT src/src_moonshot_webp-moonshot-id.o -MD -MP -MF src/$(DEPDIR)/src_moonshot_webp-moonshot-id.Tpo -c -o src/src_moonshot_webp-moonshot-id.o `test -f 'src/moonshot-id.c' || echo '$(srcdir)/'`src/moonshot-id.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_moonshot_webp-moonshot-id.Tpo src/$(DEPDIR)/src_moonshot_webp-moonshot-id.Po
@@ -1114,11 +1252,21 @@ $(srcdir)/src/moonshot-webp-parser.c: $(srcdir)/src_moonshot_webp_vala.stamp
          rm -f $(srcdir)/src_moonshot_webp_vala.stamp; \
          $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_webp_vala.stamp; \
        fi
+$(srcdir)/src/moonshot-provisioning-common.c: $(srcdir)/src_moonshot_webp_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_webp_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_webp_vala.stamp; \
+       fi
 $(srcdir)/src/moonshot-id.c: $(srcdir)/src_moonshot_webp_vala.stamp
        @if test -f $@; then :; else \
          rm -f $(srcdir)/src_moonshot_webp_vala.stamp; \
          $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_webp_vala.stamp; \
        fi
+$(srcdir)/config.vapi: $(srcdir)/src_moonshot_webp_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_webp_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_webp_vala.stamp; \
+       fi
 src_moonshot_webp_vala.stamp: $(src_moonshot_webp_SOURCES)
        $(AM_V_VALAC)$(VALAC) $(src_moonshot_webp_VALAFLAGS) $(VALAFLAGS) -C $(src_moonshot_webp_SOURCES)
        $(AM_V_at)touch $@
@@ -1128,6 +1276,26 @@ tests_basic_vala.stamp: $(tests_basic_SOURCES)
 examples_service_selection_vala.stamp: $(examples_service_selection_SOURCES)
        $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(examples_service_selection_SOURCES)
        $(AM_V_at)touch $@
+$(srcdir)/src/moonshot-identity-manager-app.c: $(srcdir)/src_moonshot_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
+       fi
+$(srcdir)/src/moonshot-identity-management-view.c: $(srcdir)/src_moonshot_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
+       fi
+$(srcdir)/src/moonshot-local-flat-file-store.c: $(srcdir)/src_moonshot_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
+       fi
+$(srcdir)/src/moonshot-idcard-store.c: $(srcdir)/src_moonshot_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
+       fi
 $(srcdir)/src/moonshot-id.c: $(srcdir)/src_moonshot_vala.stamp
        @if test -f $@; then :; else \
          rm -f $(srcdir)/src_moonshot_vala.stamp; \
@@ -1163,12 +1331,12 @@ $(srcdir)/src/moonshot-server.c: $(srcdir)/src_moonshot_vala.stamp
          rm -f $(srcdir)/src_moonshot_vala.stamp; \
          $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
        fi
-$(srcdir)/src/moonshot-window.c: $(srcdir)/src_moonshot_vala.stamp
+$(srcdir)/src/moonshot-password-dialog.c: $(srcdir)/src_moonshot_vala.stamp
        @if test -f $@; then :; else \
          rm -f $(srcdir)/src_moonshot_vala.stamp; \
          $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
        fi
-$(srcdir)/src/moonshot-password-dialog.c: $(srcdir)/src_moonshot_vala.stamp
+$(srcdir)/src/moonshot-provisioning-common.c: $(srcdir)/src_moonshot_vala.stamp
        @if test -f $@; then :; else \
          rm -f $(srcdir)/src_moonshot_vala.stamp; \
          $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
@@ -1178,6 +1346,11 @@ $(srcdir)/src/moonshot-utils.c: $(srcdir)/src_moonshot_vala.stamp
          rm -f $(srcdir)/src_moonshot_vala.stamp; \
          $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
        fi
+$(srcdir)/config.vapi: $(srcdir)/src_moonshot_vala.stamp
+       @if test -f $@; then :; else \
+         rm -f $(srcdir)/src_moonshot_vala.stamp; \
+         $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) src_moonshot_vala.stamp; \
+       fi
 src_moonshot_vala.stamp: $(src_moonshot_SOURCES)
        $(AM_V_VALAC)$(VALAC) $(src_moonshot_VALAFLAGS) $(VALAFLAGS) -C $(src_moonshot_SOURCES)
        $(AM_V_at)touch $@
@@ -1638,20 +1811,25 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
+       -rm -f config.vapi
        -rm -f examples_client_vala.stamp
        -rm -f examples_service_selection_vala.stamp
        -rm -f libmoonshot_libmoonshot_la_vala.stamp
        -rm -f src/moonshot-add-dialog.c
        -rm -f src/moonshot-custom-vbox.c
        -rm -f src/moonshot-id.c
+       -rm -f src/moonshot-idcard-store.c
        -rm -f src/moonshot-idcard-widget.c
        -rm -f src/moonshot-identities-manager.c
+       -rm -f src/moonshot-identity-management-view.c
+       -rm -f src/moonshot-identity-manager-app.c
        -rm -f src/moonshot-identity-request.c
+       -rm -f src/moonshot-local-flat-file-store.c
        -rm -f src/moonshot-password-dialog.c
+       -rm -f src/moonshot-provisioning-common.c
        -rm -f src/moonshot-server.c
        -rm -f src/moonshot-utils.c
        -rm -f src/moonshot-webp-parser.c
-       -rm -f src/moonshot-window.c
        -rm -f src_moonshot_vala.stamp
        -rm -f src_moonshot_webp_vala.stamp
        -rm -f tests_basic_vala.stamp
@@ -1762,8 +1940,10 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbusserviceDATA \
        uninstall-libLTLIBRARIES uninstall-mimeDATA
 
 
+# Build the MSVC lib. The sed hack fixes execution in the case that
+# the MSVC toolchain isn't in the PATH.
 @OS_WIN32_TRUE@libmoonshot/libmoonshot.lib: libmoonshot/libmoonshot.def
-@OS_WIN32_TRUE@        "${MSVC_LIB}" -def:$< -out:$@ -machine:x86
+@OS_WIN32_TRUE@        PATH="$(shell echo "${MSVC_LIB}" | sed -e s,/VC/bin/lib,/Common7/IDE,)":$$PATH "${MSVC_LIB}" -def:$< -out:$@ -machine:x86
 
 @IPC_MSRPC_TRUE@libmoonshot/moonshot-msrpc.h: libmoonshot/moonshot-msrpc.idl libmoonshot/moonshot-msrpc.acf
 @IPC_MSRPC_TRUE@       ${AM_V_GEN} ${MIDL_WRAPPER} -o libmoonshot -m "${MIDL}" $^
@@ -1777,15 +1957,24 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbusserviceDATA \
 
 @OS_WIN32_TRUE@icons:
 @OS_WIN32_TRUE@        mkdir -p share/icons
-@OS_WIN32_TRUE@        cp c:/build/share/icons/gnome/48x48/status/avatar-default.png share/icons
-@OS_WIN32_TRUE@        "${IMAGEMAGICK_CONVERT}" -background none c:/build/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png
-@OS_WIN32_TRUE@        "${IMAGEMAGICK_CONVERT}" -background none c:/build/share/icons/gnome/scalable/actions/edit-find-symbolic.svg -size 13x13 share/icons/edit-find-symbolic.png
+@OS_WIN32_TRUE@        cp ${prefix}/share/icons/gnome/48x48/status/avatar-default.png share/icons
+@OS_WIN32_TRUE@        "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png
+@OS_WIN32_TRUE@        "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-find-symbolic.svg -size 13x13 share/icons/edit-find-symbolic.png
 
 @OS_WIN32_TRUE@installer: moonshot.msi
 
 @OS_WIN32_TRUE@moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
 @OS_WIN32_TRUE@        "${WIX_CANDLE}" $<
-@OS_WIN32_TRUE@        "${WIX_LIGHT}" -b c:/build -b c:/tools/mingw -o moonshot.msi app.wixobj
+@OS_WIN32_TRUE@        "${WIX_LIGHT}" -b ${prefix} -b ${prefix}/mingw -o moonshot.msi app.wixobj
+
+@OS_MACOS_TRUE@icons:
+@OS_MACOS_TRUE@        mkdir -p share/icons
+@OS_MACOS_TRUE@        cp mac/icons/process-stop.png share/icons
+@OS_MACOS_TRUE@        cp mac/icons/edit-find.png share/icons
+@OS_MACOS_TRUE@        cp mac/icons/avatar-default.png share/icons
+
+@OS_MACOS_TRUE@app-bundle:
+@OS_MACOS_TRUE@        gtk-mac-bundler ./mac/moonshot-ui.bundle
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.