X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=7fcca412dad8e7dab0fb3a8b8a87e0778db74444;hb=da22d2a66bcec6c6965e0b15076683276679178f;hp=4750fa8025b8effc09818455568f30aa438d6589;hpb=976e2dcc902e0d8cb10ab8bc1ddc425bb67c36e0;p=moonshot-ui.git

diff --git a/Makefile.am b/Makefile.am
index 4750fa8..7fcca41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
+ 
 SUBDIRS = po
 
 
@@ -8,34 +8,42 @@ lib_LTLIBRARIES = libmoonshot/libmoonshot.la
 bin_PROGRAMS = \
          src/moonshot \
          src/moonshot-webp
+pkglibexec_SCRIPTS = moonshot-dbus-launch
+
+dist_pkgdata_DATA = webprovisioning/default-identity.msht
 
-AM_CFLAGS =
+AM_CFLAGS = -g -O0 -Wall
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS =  \
 	-include config.h \
 	-DLOCALEDIR=\""$(localedir)"\" \
+	-DMOONSHOT_LAUNCH_SCRIPT='"$(pkglibexecdir)/moonshot-dbus-launch"' \
 	-I$(top_srcdir)/libmoonshot \
 	-I$(top_builddir)/libmoonshot
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS = -g \
         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
 
 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
 
 src_moonshot_SOURCES = \
         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 \
@@ -44,29 +52,31 @@ src_moonshot_SOURCES = \
         src/moonshot-identities-manager.vala \
         src/moonshot-identity-request.vala \
         src/moonshot-server.vala \
-        src/moonshot-window.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 $(AM_VALAFLAGS)
-src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_LDADD = $(moonshot_LIBS)
+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_LDFLAGS = -g -O0
 
-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
+src_moonshot_webp_LDFLAGS =
 
 if OS_WIN32
 
-libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 src_moonshot_CFLAGS = -mwindows
 src_moonshot_webp_CFLAGS = -mwindows
-
+    
 AM_CPPFLAGS += -DOS_WIN32
 AM_VALAFLAGS += --define=OS_WIN32
 
@@ -79,8 +89,21 @@ libmoonshot/libmoonshot.lib: libmoonshot/libmoonshot.def
 
 endif
 
+if  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
 
+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
@@ -96,7 +119,7 @@ if IPC_MSRPC
 AM_CPPFLAGS += -Isrc
 
 AM_VALAFLAGS += \
-	--pkg msrpc-1.0 \
+	--pkg moonshot-msrpc --pkg msrpc-1.0 \
 	--define=IPC_MSRPC
 
 BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
@@ -114,8 +137,6 @@ libmoonshot/moonshot-msrpc_c.c: libmoonshot/moonshot-msrpc.h
 libmoonshot_libmoonshot_la_SOURCES += \
         libmoonshot/libmoonshot-msrpc.c
 
-src_moonshot_SOURCES += \
-        src/moonshot-msrpc.vapi
 
 nodist_src_moonshot_SOURCES = \
         libmoonshot/moonshot-msrpc_s.c
@@ -129,8 +150,13 @@ if IPC_DBUS
 
 # 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
@@ -154,6 +180,7 @@ endif
 endif
 
 EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+	moonshot-dbus-launch \
 	moonshot-ui.spec
 
 noinst_PROGRAMS = \
@@ -211,3 +238,26 @@ moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
 	"${WIX_LIGHT}" -b ${prefix} -b ${prefix}/mingw -o moonshot.msi app.wixobj
 
 endif
+
+if  OS_MACOS
+## Mac-specific targets
+
+## 1. Icons. 
+
+icons:
+	mkdir -p 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/
+app-bundle:
+	gtk-mac-bundler ./mac/moonshot-ui.bundle
+
+## 3: Installer Package
+
+installerdir = $(HOME)/moonshot/mac-client-installer
+
+endif