projects
/
moonshot-ui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added the MoonshotLogger class, which by default, does nothing. But if the --enable...
[moonshot-ui.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
d90b7b1
..
f480c26
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-2,26
+2,43
@@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = po
SUBDIRS = po
+moonshotsysconfdir=${sysconfdir}/moonshot
lib_LTLIBRARIES = libmoonshot/libmoonshot.la
bin_PROGRAMS = \
src/moonshot \
src/moonshot-webp
lib_LTLIBRARIES = libmoonshot/libmoonshot.la
bin_PROGRAMS = \
src/moonshot \
src/moonshot-webp
+pkglibexec_SCRIPTS = moonshot-dbus-launch
-AM_CFLAGS =
+dist_pkgdata_DATA = webprovisioning/default-identity.msht
+dist_moonshotsysconf_DATA=flatstore-users
-AM_CPPFLAGS = \
+AM_CFLAGS = -g -O0 -Wall
+
+AM_CPPFLAGS = \
-include config.h \
-DLOCALEDIR=\""$(localedir)"\" \
-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
-AM_VALAFLAGS = \
- config.vapi \
- --vapidir=$(top_srcdir)/vapi \
- --pkg gio-2.0
+if LOG4VALA
+MOONSHOT_LOG_PKG= --pkg log4vala-0.1 -X -llog4vala-0.1 --define=USE_LOG4VALA
+MOONSHOT_LOG_LIBS= -llog4vala-0.1
+else
+MOONSHOT_LOG_PKG=
+MOONSHOT_LOG_LIBS=
+endif
+
+
+AM_VALAFLAGS = -g \
+ config.vapi \
+ --vapidir=$(top_srcdir)/vapi \
+ --pkg gio-2.0 \
+ $(MOONSHOT_LOG_PKG)
libmoonshot_libmoonshot_la_CPPFLAGS = \
$(libmoonshot_CFLAGS) \
libmoonshot_libmoonshot_la_CPPFLAGS = \
$(libmoonshot_CFLAGS) \
@@
-30,6
+47,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
@@
-38,6
+56,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 \
@@
-48,27
+67,30
@@
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-logger.vala
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-1.0
$(AM_VALAFLAGS)
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_LDADD = $(moonshot_LIBS)
+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_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
@@
-92,6
+114,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
@@
-107,7
+134,7
@@
if IPC_MSRPC
AM_CPPFLAGS += -Isrc
AM_VALAFLAGS += \
AM_CPPFLAGS += -Isrc
AM_VALAFLAGS += \
- --pkg msrpc-1.0 \
+ --pkg m
oonshot-msrpc --pkg m
srpc-1.0 \
--define=IPC_MSRPC
BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
--define=IPC_MSRPC
BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
@@
-125,8
+152,6
@@
libmoonshot/moonshot-msrpc_c.c: libmoonshot/moonshot-msrpc.h
libmoonshot_libmoonshot_la_SOURCES += \
libmoonshot/libmoonshot-msrpc.c
libmoonshot_libmoonshot_la_SOURCES += \
libmoonshot/libmoonshot-msrpc.c
-src_moonshot_SOURCES += \
- src/moonshot-msrpc.vapi
nodist_src_moonshot_SOURCES = \
libmoonshot/moonshot-msrpc_s.c
nodist_src_moonshot_SOURCES = \
libmoonshot/moonshot-msrpc_s.c
@@
-140,8
+165,13
@@
if IPC_DBUS
# DBus service file
dbusservicedir = $(datadir)/dbus-1/services
# DBus service file
dbusservicedir = $(datadir)/dbus-1/services
+if OS_MACOS
+dbusservice_in_files = org.janet.Moonshot.service.mac
+dbusservice_DATA = $(dbusservice_in_files:.service.mac=.service)
+else
dbusservice_in_files = org.janet.Moonshot.service.in
dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
dbusservice_in_files = org.janet.Moonshot.service.in
dbusservice_DATA = $(dbusservice_in_files:.service.in=.service)
+endif
# Rule to make the service file with bindir expanded
$(dbusservice_DATA): $(dbusservice_in_files) Makefile
# Rule to make the service file with bindir expanded
$(dbusservice_DATA): $(dbusservice_in_files) Makefile
@@
-149,13
+179,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 \
@@
-163,9
+194,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) \
- moonshot-ui.spec
+ webprovisioning/complex-test.msht webprovisioning/sample.msht \
+ README.webprovisioning README.windows \
+ moonshot-dbus-launch \
+ moonshot-ui.spec \
+ vapi/moonshot-gnome-keyring.vapi libmoonshot/libmoonshot.vapi
noinst_PROGRAMS = \
examples/client \
noinst_PROGRAMS = \
examples/client \
@@
-233,7
+271,7
@@
icons:
cp mac/icons/process-stop.png share/icons
cp mac/icons/edit-find.png share/icons
cp mac/icons/avatar-default.png share/icons
cp mac/icons/process-stop.png share/icons
cp mac/icons/edit-find.png share/icons
cp mac/icons/avatar-default.png share/icons
-
+
## 2. App bundle
## gtk-app-bundler must be installed
## moonshot-ui.app will be built in moonshot/mac-client-installer/moonshot-ui/
## 2. App bundle
## gtk-app-bundler must be installed
## moonshot-ui.app will be built in moonshot/mac-client-installer/moonshot-ui/
@@
-244,5
+282,4
@@
app-bundle:
installerdir = $(HOME)/moonshot/mac-client-installer
installerdir = $(HOME)/moonshot/mac-client-installer
-
endif
endif