autoreconf

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d90b7b1..20e3434 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,15 +9,15 @@ bin_PROGRAMS = \
          src/moonshot \
          src/moonshot-webp
 
-AM_CFLAGS =
+AM_CFLAGS = -g -O0
 
-AM_CPPFLAGS = \
+AM_CPPFLAGS = -g -O0 \
        -include config.h \
        -DLOCALEDIR=\""$(localedir)"\" \
        -I$(top_srcdir)/libmoonshot \
        -I$(top_builddir)/libmoonshot
 
-AM_VALAFLAGS = \
+AM_VALAFLAGS = -g \
         config.vapi \
        --vapidir=$(top_srcdir)/vapi \
         --pkg gio-2.0
@@ -58,6 +58,7 @@ src_moonshot_webp_SOURCES = \
 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 gtk+-2.0 --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
 src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
@@ -107,7 +108,7 @@ if IPC_MSRPC
 AM_CPPFLAGS += -Isrc
 
 AM_VALAFLAGS += \
-       --pkg msrpc-1.0 \
+       --pkg moonshot-msrpc.vapi --pkg msrpc-1.0 \
        --define=IPC_MSRPC
 
 BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
@@ -125,8 +126,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
@@ -140,8 +139,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
@@ -233,7 +237,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
-       
+
 ## 2. App bundle
 ## gtk-app-bundler must be installed
 ## moonshot-ui.app will be built in moonshot/mac-client-installer/moonshot-ui/
@@ -244,5 +248,4 @@ app-bundle:
 
 installerdir = $(HOME)/moonshot/mac-client-installer
 
-       
 endif