projects
/
moonshot-ui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump the version number in configure.ac to 1.0.5
[moonshot-ui.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
7fcca41
..
11b5f48
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,14
+20,25
@@
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
+
+if LOG4VALA
+MOONSHOT_LOG_PKG= --pkg $(LOG4VALA_VERSION) -X -l$(LOG4VALA_VERSION) --define=USE_LOG4VALA
+MOONSHOT_LOG_LIBS= -l$(LOG4VALA_VERSION)
+else
+MOONSHOT_LOG_PKG=
+MOONSHOT_LOG_LIBS=
+endif
+
+
AM_VALAFLAGS = -g \
config.vapi \
AM_VALAFLAGS = -g \
config.vapi \
- --vapidir=$(top_srcdir)/vapi \
- --pkg gio-2.0
-
+
--vapidir=$(top_srcdir)/vapi \
+ --pkg gio-2.0
\
+ $(MOONSHOT_LOG_PKG)
libmoonshot_libmoonshot_la_CPPFLAGS = \
$(libmoonshot_CFLAGS) \
libmoonshot_libmoonshot_la_CPPFLAGS = \
$(libmoonshot_CFLAGS) \
@@
-46,36
+59,45
@@
src_moonshot_SOURCES = \
src/moonshot-keyring-store.vala \
src/moonshot-idcard-store.vala \
src/moonshot-id.vala \
src/moonshot-keyring-store.vala \
src/moonshot-idcard-store.vala \
src/moonshot-id.vala \
- src/moonshot-
add
-dialog.vala \
+ src/moonshot-
identity
-dialog.vala \
src/moonshot-idcard-widget.vala \
src/moonshot-custom-vbox.vala \
src/moonshot-identities-manager.vala \
src/moonshot-identity-request.vala \
src/moonshot-idcard-widget.vala \
src/moonshot-custom-vbox.vala \
src/moonshot-identities-manager.vala \
src/moonshot-identity-request.vala \
- src/moonshot-server.vala \
+ src/moonshot-server-linux.vala \
+ src/moonshot-settings.vala \
src/moonshot-password-dialog.vala \
src/moonshot-provisioning-common.vala \
src/moonshot-password-dialog.vala \
src/moonshot-provisioning-common.vala \
- src/moonshot-utils.vala
+ src/moonshot-trust-anchor-dialog.vala \
+ src/moonshot-utils.vala \
+ src/moonshot-futils.c \
+ src/moonshot-crypto-utils.c \
+ src/moonshot-logger.vala \
+ src/moonshot-warning-dialog.vala
src_moonshot_webp_SOURCES = \
src_moonshot_webp_SOURCES = \
+ src/moonshot-crypto-utils.c \
src/moonshot-webp-parser.vala \
src/moonshot-provisioning-common.vala \
src/moonshot-webp-parser.vala \
src/moonshot-provisioning-common.vala \
- src/moonshot-id.vala
+ src/moonshot-id.vala \
+ src/moonshot-logger.vala
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 --pkg gee-1.0 $(AM_VALAFLAGS)
+
+src_moonshot_VALAFLAGS = --pkg $(GTK_VERSION) --pkg $(GEE_VERSION) $(AM_VALAFLAGS)
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_LDADD = $(moonshot_LIBS)
-src_moonshot_LDFLAGS = -g -O0
+src_moonshot_LDADD = $(moonshot_LIBS)
+src_moonshot_LDFLAGS = -g -O0
$(MOONSHOT_LOG_LIBS)
-src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg
gtk+-2.0 --pkg gdk-2.0
--pkg libmoonshot $(AM_VALAFLAGS)
+src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg
$(GEE_VERSION)
--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_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la
-src_moonshot_webp_LDFLAGS =
+src_moonshot_webp_LDFLAGS =
$(MOONSHOT_LOG_LIBS)
if OS_WIN32
src_moonshot_CFLAGS = -mwindows
if OS_WIN32
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
@@
-101,8
+123,8
@@
if OS_LINUX
AM_CPPFLAGS += -I/usr/include/gnome-keyring-1
AM_VALAFLAGS += --pkg moonshot-gnome-keyring --define=GNOME_KEYRING
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
+src_moonshot_LDFLAGS += -lgnome-keyring
-lcrypto
+src_moonshot_webp_LDFLAGS += -lgnome-keyring
-lcrypto
## Installing mime type data
mimedir = $(datadir)/mime/packages
## Installing mime type data
mimedir = $(datadir)/mime/packages
@@
-164,13
+186,14
@@
$(dbusservice_DATA): $(dbusservice_in_files) Makefile
libmoonshot_libmoonshot_la_SOURCES += libmoonshot/libmoonshot-dbus.c
libmoonshot_libmoonshot_la_SOURCES += libmoonshot/libmoonshot-dbus.c
-CLEANFILES = $(dbusservice_DATA)
+CLEANFILES = $(dbusservice_DATA)
src_moonshot_vala.stamp src_moonshot_vala.stamp-t
if IPC_DBUS_GLIB
AM_VALAFLAGS += \
--pkg dbus-glib-1 \
--define=IPC_DBUS_GLIB \
--define=IPC_DBUS
if IPC_DBUS_GLIB
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 \
else
AM_VALAFLAGS += \
--pkg gio-2.0 \
@@
-178,10
+201,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 \