Merge remote-tracking branch 'origin/master' into debian

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 29ffcf0..d90b7b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,17 +47,19 @@ src_moonshot_SOURCES = \
         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 --pkg gee-1.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_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
 
@@ -85,7 +87,7 @@ if  OS_MACOS
 AM_CPPFLAGS += -DOS_MACOS $(MAC_CFLAGS)
 AM_VALAFLAGS += --define=OS_MACOS --pkg gtk-mac-integration
 moonshot_LIBS += $(MAC_LIBS)
-
+src_moonshot_LDADD += $(MAC_LIBS)
 endif
 
 if OS_LINUX