Merge branch 'master' of ssh://69.25.196.28:822/srv/git/moonshot-ui

diff --combined Makefile.am
index 99e3392,295282b..e7e930c
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -29,6 -29,8 +29,8 @@@ libmoonshot_libmoonshot_la_SOURCES = li
  
  libmoonshot_libmoonshot_la_LIBADD = $(libmoonshot_LIBS)
  
+ include_HEADERS = libmoonshot/libmoonshot.h
+ noinst_HEADERS = libmoonshot/libmoonshot-common.h
  
  src_moonshot_SOURCES = \
          src/moonshot-id.vala \
@@@ -49,7 -51,6 +51,6 @@@ src_moonshot_CPPFLAGS = 
          $(moonshot_CFLAGS) \
          $(AM_CPPFLAGS)
  
- 
  if OS_WIN32
  
  libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
@@@ -59,11 -60,6 +60,11 @@@ src_moonshot_CFLAGS = -mwindow
  AM_CPPFLAGS += -DOS_WIN32
  AM_VALAFLAGS += --define=OS_WIN32
  
 +noinst_DATA = libmoonshot/libmoonshot.lib
 +
 +libmoonshot/libmoonshot.lib: libmoonshot/libmoonshot.def
 +      "${MSVC_LIB}" -def:$< -out:$@ -machine:x86
 +
  endif
  
  
@@@ -88,8 -84,7 +89,7 @@@ libmoonshot/moonshot-msrpc_s.c: libmoon
  libmoonshot/moonshot-msrpc_c.c: libmoonshot/moonshot-msrpc.h
  
  libmoonshot_libmoonshot_la_SOURCES += \
-         libmoonshot/libmoonshot-msrpc.c \
-         libmoonshot/moonshot-msrpc_c.c
+         libmoonshot/libmoonshot-msrpc.c
  
  src_moonshot_SOURCES += \
          src/moonshot-msrpc.vapi
@@@ -97,6 -92,9 +97,9 @@@
  nodist_src_moonshot_SOURCES = \
          libmoonshot/moonshot-msrpc_s.c
  
+ nodist_libmoonshot_libmoonshot_la_SOURCES = \
+         libmoonshot/moonshot-msrpc_c.c
+ 
  endif
  
  if IPC_DBUS
@@@ -142,7 -140,7 +145,7 @@@ examples_client_CPPFLAGS = $(libmoonsho
  examples_client_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
  
  tests_basic_SOURCES = tests/basic.c
 -tests_basic_CPPFLAGS = $(libmoonshot_CFLAGS) $(AM_CPPFLAGS)
 +tests_basic_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
  tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la $(moonshot_LIBS)