fix merge conflict

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7857056..88cf4df 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
 SUBDIRS = po
 
+moonshotsysconfdir=${sysconfdir}/moonshot
 
 lib_LTLIBRARIES = libmoonshot/libmoonshot.la
 
@@ -10,12 +11,16 @@ bin_PROGRAMS = \
          src/moonshot-webp
 pkglibexec_SCRIPTS = moonshot-dbus-launch
 
+dist_pkgdata_DATA = webprovisioning/default-identity.msht
+dist_moonshotsysconf_DATA=flatstore-users
+
 AM_CFLAGS = -g -O0 -Wall
 
 AM_CPPFLAGS =  \
        -include config.h \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMOONSHOT_LAUNCH_SCRIPT='"$(pkglibexecdir)/moonshot-dbus-launch"' \
+        -DMOONSHOT_FLATSTORE_USERS='"$(moonshotsysconfdir)/flatstore-users"' \
        -I$(top_srcdir)/libmoonshot \
        -I$(top_builddir)/libmoonshot
 
@@ -32,6 +37,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
@@ -51,7 +57,8 @@ src_moonshot_SOURCES = \
         src/moonshot-server.vala \
         src/moonshot-password-dialog.vala \
         src/moonshot-provisioning-common.vala \
-        src/moonshot-utils.vala
+        src/moonshot-utils.vala \
+        src/moonshot-futils.c
 
 src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
@@ -70,10 +77,9 @@ src_moonshot_webp_LDFLAGS =
 
 if OS_WIN32
 
-libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 src_moonshot_CFLAGS = -mwindows
-src_moonshot_webp_CFLAGS = -mwindows
+src_moonshot_webp_CFLAGS = -mconsole
     
 AM_CPPFLAGS += -DOS_WIN32
 AM_VALAFLAGS += --define=OS_WIN32
@@ -169,6 +175,7 @@ AM_VALAFLAGS += \
        --pkg dbus-glib-1 \
        --define=IPC_DBUS_GLIB \
        --define=IPC_DBUS
+AM_CPPFLAGS += -DIPC_DBUS_GLIB
 else
 AM_VALAFLAGS += \
        --pkg gio-2.0 \