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

Conflicts:
	Makefile.am

diff --cc Makefile.am
index 1f2d4f1,de028e5..5e7886d
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -133,22 -101,26 +133,22 @@@ endi
  
  bin_PROGRAMS += src/moonshot-webp
  
- src_moonshot_webp_SOURCES = src/moonshot-webp-parser.vala
+ src_moonshot_webp_SOURCES = src/moonshot-webp-parser.vala src/moonshot-id.vala
 +src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
  src_moonshot_webp_LDADD = $(moonshot_LIBS)
  
 -if IPC_DBUS
 -AM_VALAFLAGS += \
 -      --pkg dbus-glib-1 \
 -      --define=IPC_DBUS
 -endif
 -
 -if IPC_MSRPC
 -AM_VALAFLAGS += \
 -      --pkg msrpc-1.0 \
 -      --define=IPC_MSRPC
 -endif
 -
  if OS_WIN32
  moonshot_webp_CFLAGS = -mwindows
 -AM_VALAFLAGS += --define=OS_WIN32
  endif
  
 +
 +noinst_PROGRAMS = tests/basic
 +
 +tests_basic_SOURCES = tests/basic.c
 +tests_basic_CPPFLAGS = $(libmoonshot_CFLAGS) $(AM_CPPFLAGS)
 +tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
 +
 +
  if OS_WIN32
  
  ## A couple of Windows-specific targets: