Seems to be all working correctly.

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f06fe4b..8b5b014 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,10 @@ include_HEADERS = libmoonshot/libmoonshot.h
 noinst_HEADERS = libmoonshot/libmoonshot-common.h
 
 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 \
@@ -41,7 +45,6 @@ src_moonshot_SOURCES = \
         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
 
@@ -49,7 +52,7 @@ src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
         src/moonshot-id.vala
 
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 $(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)
 
@@ -63,7 +66,7 @@ libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 src_moonshot_CFLAGS = -mwindows
 src_moonshot_webp_CFLAGS = -mwindows
-
+    
 AM_CPPFLAGS += -DOS_WIN32
 AM_VALAFLAGS += --define=OS_WIN32
 
@@ -133,13 +136,21 @@ dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
 $(dbusservice_DATA): $(dbusservice_in_files) Makefile
        @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 
-AM_VALAFLAGS += \
-       --pkg dbus-glib-1 \
-       --define=IPC_DBUS
-
 libmoonshot_libmoonshot_la_SOURCES += libmoonshot/libmoonshot-dbus.c
 
 CLEANFILES = $(dbusservice_DATA)
+
+if IPC_DBUS_GLIB
+AM_VALAFLAGS += \
+       --pkg dbus-glib-1 \
+       --define=IPC_DBUS_GLIB \
+       --define=IPC_DBUS
+else
+AM_VALAFLAGS += \
+       --pkg gio-2.0 \
+       --define=IPC_GDBUS \
+       --define=IPC_DBUS
+endif
 endif
 
 EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
@@ -176,15 +187,15 @@ if OS_WIN32
 ## A couple of Windows-specific targets:
 
 ## 1. Icons. You must have gnome-icon-theme and gnome-icon-theme-symbolic installed
-##    in c:/build prefix; and ImageMagick installed in c:/tools/ImageMagick. This
+##    in the install prefix; and ImageMagick installed in c:/tools/ImageMagick. This
 ##    pulls in the icons required by moonshot and converts svg's to png's (we have
 ##    no svg support built in to Windows Gtk+ right now).
 
 icons:
        mkdir -p share/icons
-       cp c:/build/share/icons/gnome/48x48/status/avatar-default.png share/icons
-       "${IMAGEMAGICK_CONVERT}" -background none c:/build/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png
-       "${IMAGEMAGICK_CONVERT}" -background none c:/build/share/icons/gnome/scalable/actions/edit-find-symbolic.svg -size 13x13 share/icons/edit-find-symbolic.png
+       cp ${prefix}/share/icons/gnome/48x48/status/avatar-default.png share/icons
+       "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png
+       "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-find-symbolic.svg -size 13x13 share/icons/edit-find-symbolic.png
 
 
 ## 2. Installer. You must have the Windows Installer XML toolkit version 3.5
@@ -197,6 +208,6 @@ installer: moonshot.msi
 
 moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
        "${WIX_CANDLE}" $<
-       "${WIX_LIGHT}" -b c:/build -b c:/tools/mingw -o moonshot.msi app.wixobj
+       "${WIX_LIGHT}" -b ${prefix} -b ${prefix}/mingw -o moonshot.msi app.wixobj
 
 endif