Use --pkg to avoid parsing moonshot-msrpc.vapi unless needed

diff --git a/Makefile.am b/Makefile.am
index b36f1a5..20e3434 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,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 \
@@ -126,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
@@ -239,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/
@@ -250,5 +248,4 @@ app-bundle:
 
 installerdir = $(HOME)/moonshot/mac-client-installer
 
-       
 endif

diff --git a/src/moonshot-msrpc.vapi b/vapi/moonshot-msrpc.vapi
similarity index 100%
rename from src/moonshot-msrpc.vapi
rename to vapi/moonshot-msrpc.vapi