Merge branch 'master' of origin

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b0c8ece..eedc248 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,8 @@ src_moonshot_SOURCES = \
         src/moonshot-idcard-widget.vala \
         src/moonshot-custom-vbox.vala \
         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
@@ -41,19 +43,18 @@ AM_VALAFLAGS += \
        --pkg msrpc-1.0 \
        --define=IPC_MSRPC
 
-noinst_HEADERS = src/moonshot-msrpc.h
-
 src_moonshot_SOURCES += \
-        src/moonshot-msrpc-server.vala \
-        src/moonshot-msrpc_s.c \
         src/moonshot-msrpc.vapi
 
+nodist_src_moonshot_SOURCES = \
+        src/moonshot-msrpc_s.c
+
 bin_PROGRAMS += src/msrpc-client
 
-src_msrpc_client_SOURCES = \
+nodist_src_msrpc_client_SOURCES = \
         src/msrpc-client.vala \
-        src/moonshot-msrpc_c.c \
-        src/moonshot-msrpc.vapi
+        src/moonshot-msrpc.vapi \
+        src/moonshot-msrpc_c.c
 
 src_msrpc_client_LDADD = \
         $(moonshot_LIBS)
@@ -67,9 +68,9 @@ src/moonshot-msrpc.h: src/moonshot-msrpc.idl src/moonshot-msrpc.acf
 
 src/moonshot-msrpc_s.c: src/moonshot-msrpc.h
 
-else
+endif
 
-# IPC_DBUS
+if IPC_DBUS
 
 # DBus service file
 dbusservicedir = $(datadir)/dbus-1/services
@@ -81,11 +82,9 @@ $(dbusservice_DATA): $(dbusservice_in_files) Makefile
        @sed -e "s|\@bindir\@|$(bindir)|" $< > $@
 
 AM_VALAFLAGS += \
-       --pkg dbus-glib-1
+       --pkg dbus-glib-1 \
        --define=IPC_DBUS
 
-src_moonshot_SOURCES += src/moonshot-dbus-server.vala
-
 bin_PROGRAMS += src/dbus-client
 
 src_dbus_client_SOURCES = \