attempt DBUS_GLIB fix

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 485979d..c3b9fd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
+ 
 SUBDIRS = po
 
 
@@ -8,23 +8,26 @@ lib_LTLIBRARIES = libmoonshot/libmoonshot.la
 bin_PROGRAMS = \
          src/moonshot \
          src/moonshot-webp
+pkglibexec_SCRIPTS = moonshot-dbus-launch
 
-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
 
@@ -46,17 +49,20 @@ src_moonshot_SOURCES = \
         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_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
 
@@ -81,9 +87,10 @@ endif
 
 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
@@ -103,7 +110,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 \
@@ -121,8 +128,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
@@ -136,8 +141,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
@@ -161,6 +171,7 @@ endif
 endif
 
 EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
+       moonshot-dbus-launch \
        moonshot-ui.spec
 
 noinst_PROGRAMS = \
@@ -226,11 +237,18 @@ if  OS_MACOS
 
 icons:
        mkdir -p share/icons
-       cp src/mac/icons/process-stop.png share/icons
-       cp src/mac/icons/edit-find.png share/icons
-       cp src/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/
+app-bundle:
+       gtk-mac-bundler ./mac/moonshot-ui.bundle
+
+## 3: Installer Package
 
-## Installer
+installerdir = $(HOME)/moonshot/mac-client-installer
 
 endif