projects
/
moonshot-ui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 0.7.1 to include upstream copyrights
[moonshot-ui.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
7fcca41
..
88cf4df
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,6
+2,7
@@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = po
SUBDIRS = po
+moonshotsysconfdir=${sysconfdir}/moonshot
lib_LTLIBRARIES = libmoonshot/libmoonshot.la
lib_LTLIBRARIES = libmoonshot/libmoonshot.la
@@
-11,6
+12,7
@@
bin_PROGRAMS = \
pkglibexec_SCRIPTS = moonshot-dbus-launch
dist_pkgdata_DATA = webprovisioning/default-identity.msht
pkglibexec_SCRIPTS = moonshot-dbus-launch
dist_pkgdata_DATA = webprovisioning/default-identity.msht
+dist_moonshotsysconf_DATA=flatstore-users
AM_CFLAGS = -g -O0 -Wall
AM_CFLAGS = -g -O0 -Wall
@@
-18,6
+20,7
@@
AM_CPPFLAGS = \
-include config.h \
-DLOCALEDIR=\""$(localedir)"\" \
-DMOONSHOT_LAUNCH_SCRIPT='"$(pkglibexecdir)/moonshot-dbus-launch"' \
-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
-I$(top_srcdir)/libmoonshot \
-I$(top_builddir)/libmoonshot
@@
-54,7
+57,8
@@
src_moonshot_SOURCES = \
src/moonshot-server.vala \
src/moonshot-password-dialog.vala \
src/moonshot-provisioning-common.vala \
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 \
src_moonshot_webp_SOURCES = \
src/moonshot-webp-parser.vala \
@@
-75,7
+79,7
@@
if OS_WIN32
src_moonshot_CFLAGS = -mwindows
src_moonshot_CFLAGS = -mwindows
-src_moonshot_webp_CFLAGS = -m
windows
+src_moonshot_webp_CFLAGS = -m
console
AM_CPPFLAGS += -DOS_WIN32
AM_VALAFLAGS += --define=OS_WIN32
AM_CPPFLAGS += -DOS_WIN32
AM_VALAFLAGS += --define=OS_WIN32
@@
-171,6
+175,7
@@
AM_VALAFLAGS += \
--pkg dbus-glib-1 \
--define=IPC_DBUS_GLIB \
--define=IPC_DBUS
--pkg dbus-glib-1 \
--define=IPC_DBUS_GLIB \
--define=IPC_DBUS
+AM_CPPFLAGS += -DIPC_DBUS_GLIB
else
AM_VALAFLAGS += \
--pkg gio-2.0 \
else
AM_VALAFLAGS += \
--pkg gio-2.0 \