First go at using Gtk3. Everything builds but there is stuff (Pango modules) missing...

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b03494..bf49796 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
+ 
 SUBDIRS = po
 
 
@@ -34,6 +34,10 @@ 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-idcard-store.vala \
         src/moonshot-id.vala \
         src/moonshot-add-dialog.vala \
         src/moonshot-idcard-widget.vala \
@@ -41,7 +45,6 @@ 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-utils.vala
 
@@ -49,7 +52,7 @@ src_moonshot_webp_SOURCES = \
         src/moonshot-webp-parser.vala \
         src/moonshot-id.vala
 
-src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 $(AM_VALAFLAGS)
+src_moonshot_VALAFLAGS =--pkg gee-1.0 $(AM_VALAFLAGS)
 src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
 src_moonshot_LDADD = $(moonshot_LIBS)
 
@@ -63,9 +66,9 @@ libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 src_moonshot_CFLAGS = -mwindows
 src_moonshot_webp_CFLAGS = -mwindows
-
+    
 AM_CPPFLAGS += -DOS_WIN32
-AM_VALAFLAGS += --define=OS_WIN32
+AM_VALAFLAGS += --define=OS_WIN32 --pkg gdk-2.0 --pkg gtk+-2.0 
 
 noinst_DATA = libmoonshot/libmoonshot.lib
 
@@ -76,8 +79,17 @@ libmoonshot/libmoonshot.lib: libmoonshot/libmoonshot.def
 
 endif
 
+if  OS_MACOS
+
+AM_CPPFLAGS += -DOS_MACOS
+AM_VALAFLAGS += --define=OS_MACOS --pkg gdk-3.0 --pkg gtk+-3.0 
+
+endif
+
 if OS_LINUX
 
+AM_VALAFLAGS += --define=OS_MACOS --pkg gdk-2.0 --pkg gtk+-2.0 
+
 ## Installing mime type data
 mimedir = $(datadir)/mime/packages
 mime_DATA = webprovisioning/moonshot.xml
@@ -208,3 +220,27 @@ 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