Merge branch 'master' of http://www.project-moonshot.org/git/moonshot-ui

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0d37532..7fcca41 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,8 @@ bin_PROGRAMS = \
          src/moonshot-webp
 pkglibexec_SCRIPTS = moonshot-dbus-launch
 
+dist_pkgdata_DATA = webprovisioning/default-identity.msht
+
 AM_CFLAGS = -g -O0 -Wall
 
 AM_CPPFLAGS =  \
@@ -32,6 +34,7 @@ libmoonshot_libmoonshot_la_CPPFLAGS = \
 libmoonshot_libmoonshot_la_SOURCES = libmoonshot/libmoonshot-common.c
 
 libmoonshot_libmoonshot_la_LIBADD = $(libmoonshot_LIBS)
+libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined -version-info 1:0:0
 
 include_HEADERS = libmoonshot/libmoonshot.h
 noinst_HEADERS = libmoonshot/libmoonshot-common.h
@@ -66,10 +69,10 @@ 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
+src_moonshot_webp_LDFLAGS =
 
 if OS_WIN32
 
-libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 src_moonshot_CFLAGS = -mwindows
 src_moonshot_webp_CFLAGS = -mwindows
@@ -99,6 +102,7 @@ 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
 
 ## Installing mime type data
 mimedir = $(datadir)/mime/packages