projects
/
moonshot-ui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/0.7.2' into debian
[moonshot-ui.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
0798d86
..
c4f0c80
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
@@
-10,12
+11,16
@@
bin_PROGRAMS = \
src/moonshot-webp
pkglibexec_SCRIPTS = moonshot-dbus-launch
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"' \
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
-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_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
include_HEADERS = libmoonshot/libmoonshot.h
noinst_HEADERS = libmoonshot/libmoonshot-common.h
@@
-40,6
+46,7
@@
src_moonshot_SOURCES = \
src/moonshot-identity-manager-app.vala \
src/moonshot-identity-management-view.vala \
src/moonshot-local-flat-file-store.vala \
src/moonshot-identity-manager-app.vala \
src/moonshot-identity-management-view.vala \
src/moonshot-local-flat-file-store.vala \
+ src/moonshot-keyring-store.vala \
src/moonshot-idcard-store.vala \
src/moonshot-id.vala \
src/moonshot-add-dialog.vala \
src/moonshot-idcard-store.vala \
src/moonshot-id.vala \
src/moonshot-add-dialog.vala \
@@
-50,14
+57,15
@@
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-provisioning-common.vala \
src/moonshot-id.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_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-
0.8
$(AM_VALAFLAGS)
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_LDADD = $(moonshot_LIBS)
src_moonshot_LDFLAGS = -g -O0
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_LDADD = $(moonshot_LIBS)
src_moonshot_LDFLAGS = -g -O0
@@
-65,13
+73,13
@@
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_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
if OS_WIN32
-libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
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
@@
-95,6
+103,11
@@
endif
if OS_LINUX
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
mime_DATA = webprovisioning/moonshot.xml
## Installing mime type data
mimedir = $(datadir)/mime/packages
mime_DATA = webprovisioning/moonshot.xml
@@
-110,7
+123,7
@@
if IPC_MSRPC
AM_CPPFLAGS += -Isrc
AM_VALAFLAGS += \
AM_CPPFLAGS += -Isrc
AM_VALAFLAGS += \
- --pkg moonshot-msrpc
.vapi
--pkg msrpc-1.0 \
+ --pkg moonshot-msrpc --pkg msrpc-1.0 \
--define=IPC_MSRPC
BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
--define=IPC_MSRPC
BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
@@
-162,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 \
@@
-169,10
+183,16
@@
AM_VALAFLAGS += \
--define=IPC_DBUS
endif
endif
--define=IPC_DBUS
endif
endif
+if GIO_VAPI_USES_ARRAYS
+AM_VALAFLAGS += --define=GIO_VAPI_USES_ARRAYS
+endif
EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+ webprovisioning/complex-test.msht webprovisioning/sample.msht \
+ README.webprovisioning README.windows \
moonshot-dbus-launch \
moonshot-dbus-launch \
- moonshot-ui.spec
+ moonshot-ui.spec \
+ vapi/moonshot-gnome-keyring.vapi libmoonshot/libmoonshot.vapi
noinst_PROGRAMS = \
examples/client \
noinst_PROGRAMS = \
examples/client \