AM_VALAFLAGS = \
config.vapi \
+ --vapidir=$(top_srcdir)/vapi \
--pkg gio-2.0
libmoonshot_libmoonshot_la_CPPFLAGS = \
$(libmoonshot_CFLAGS) \
- $(AM_CPPFLAGS)
+ $(AM_CPPFLAGS)
libmoonshot_libmoonshot_la_SOURCES = libmoonshot/libmoonshot-common.c
src/moonshot-identity-request.vala \
src/moonshot-server.vala \
src/moonshot-password-dialog.vala \
+ src/moonshot-provisioning-common.vala \
src/moonshot-utils.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_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_LDADD = $(moonshot_LIBS)
+src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
+src_moonshot_LDADD = $(moonshot_LIBS)
-src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
+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
if OS_MACOS
-AM_CPPFLAGS += -DOS_MACOS
-AM_VALAFLAGS += --define=OS_MACOS
-
+AM_CPPFLAGS += -DOS_MACOS $(MAC_CFLAGS)
+AM_VALAFLAGS += --define=OS_MACOS --pkg gtk-mac-integration
+moonshot_LIBS += $(MAC_LIBS)
+src_moonshot_LDADD += $(MAC_LIBS)
endif
if OS_LINUX
# 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)
+endif
# Rule to make the service file with bindir expanded
$(dbusservice_DATA): $(dbusservice_in_files) Makefile
installerdir = $(HOME)/moonshot/mac-client-installer
-installer:
- cd $(installerdir) && pwd
-
-# fix up the cyrus-sasl links
- cd $(installerdir) && mkdir -p sasl/usr/lib
- cd $(installerdir)/sasl/usr/lib && ln -fs ../local/lib/sasl2
- cd $(installerdir) && mkdir -p resources
-
-# Ensure the permissions are correct for the files to be installed
-
- cd $(installerdir) && sudo chown -R root:admin sasl
- cd $(installerdir) && sudo chmod -R g+w sasl
-
-# create the installer package
- cd $(installerdir) && /Developer/usr/bin/packagemaker --doc Moonshot\ Client\ Software.pmdoc \
- --version 0.1 --filter "/.DS_Store" --resources ./resources/ --root-volume-only\
- --domain system --verbose --no-relocate -l "/" --target 10.5 \
- --id ja.net.moonshotClientSoftware --out Moonshot\ Client\ Software.pkg
endif