Merge branch 'master' of gitorious.org:moonshot-identity-client/moonshot-client

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b6b1fa..7b03494 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,8 @@ AM_CFLAGS =
 AM_CPPFLAGS = \
        -include config.h \
        -DLOCALEDIR=\""$(localedir)"\" \
-       -I$(top_srcdir)/libmoonshot
+       -I$(top_srcdir)/libmoonshot \
+       -I$(top_builddir)/libmoonshot
 
 AM_VALAFLAGS = \
         config.vapi \
@@ -68,8 +69,10 @@ AM_VALAFLAGS += --define=OS_WIN32
 
 noinst_DATA = libmoonshot/libmoonshot.lib
 
+# Build the MSVC lib. The sed hack fixes execution in the case that
+# the MSVC toolchain isn't in the PATH.
 libmoonshot/libmoonshot.lib: libmoonshot/libmoonshot.def
-       "${MSVC_LIB}" -def:$< -out:$@ -machine:x86
+       PATH="$(shell echo "${MSVC_LIB}" | sed -e s,/VC/bin/lib,/Common7/IDE,)":$$PATH "${MSVC_LIB}" -def:$< -out:$@ -machine:x86
 
 endif
 
@@ -130,13 +133,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) \
@@ -173,15 +184,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
@@ -194,6 +205,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