Add simple test for service selection

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1f2d4f1..a8f83eb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,9 @@ SUBDIRS = po
 
 lib_LTLIBRARIES = libmoonshot/libmoonshot.la
 
-bin_PROGRAMS = src/moonshot
-
+bin_PROGRAMS = \
+         src/moonshot \
+         src/moonshot-webp
 
 AM_CFLAGS =
 
@@ -16,8 +17,8 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/libmoonshot
 
 AM_VALAFLAGS = \
-       config.vapi \
-       --pkg gtk+-2.0
+        config.vapi \
+        --pkg gio-2.0
 
 
 libmoonshot_libmoonshot_la_CPPFLAGS = \
@@ -28,6 +29,8 @@ libmoonshot_libmoonshot_la_SOURCES = libmoonshot/libmoonshot-common.c
 
 libmoonshot_libmoonshot_la_LIBADD = $(libmoonshot_LIBS)
 
+include_HEADERS = libmoonshot/libmoonshot.h
+noinst_HEADERS = libmoonshot/libmoonshot-common.h
 
 src_moonshot_SOURCES = \
         src/moonshot-id.vala \
@@ -41,25 +44,46 @@ src_moonshot_SOURCES = \
         src/moonshot-password-dialog.vala \
         src/moonshot-utils.vala
 
-src_moonshot_LDADD = \
-        $(moonshot_LIBS)
+src_moonshot_webp_SOURCES = \
+        src/moonshot-webp-parser.vala \
+        src/moonshot-id.vala
 
-src_moonshot_CPPFLAGS = \
-        $(moonshot_CFLAGS) \
-        $(AM_CPPFLAGS)
+src_moonshot_VALAFLAGS = --pkg gdk-2.0 --pkg gtk+-2.0 $(AM_VALAFLAGS)
+src_moonshot_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
+src_moonshot_LDADD = $(moonshot_LIBS)
 
+src_moonshot_webp_VALAFLAGS = --vapidir=$(top_srcdir)/libmoonshot --pkg gdk-2.0 --pkg libmoonshot $(AM_VALAFLAGS)
+src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
+src_moonshot_webp_LDADD = $(moonshot_LIBS) ${top_builddir}/libmoonshot/libmoonshot.la
 
 if OS_WIN32
 
 libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
 
 src_moonshot_CFLAGS = -mwindows
+src_moonshot_webp_CFLAGS = -mwindows
 
 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
 
+if OS_LINUX
+
+## Installing mime type data
+mimedir = $(datadir)/mime/packages
+mime_DATA = webprovisioning/moonshot.xml
+
+## Installing
+dotdesktopdir = $(datadir)/applications
+dotdesktop_DATA = moonshot.desktop moonshot-webp.desktop
+
+endif
 
 if IPC_MSRPC
 
@@ -82,8 +106,7 @@ libmoonshot/moonshot-msrpc_s.c: libmoonshot/moonshot-msrpc.h
 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
@@ -91,15 +114,9 @@ src_moonshot_SOURCES += \
 nodist_src_moonshot_SOURCES = \
         libmoonshot/moonshot-msrpc_s.c
 
-bin_PROGRAMS += src/msrpc-client
-
-nodist_src_msrpc_client_SOURCES = \
-        src/msrpc-client.vala \
-        src/moonshot-msrpc.vapi \
+nodist_libmoonshot_libmoonshot_la_SOURCES = \
         libmoonshot/moonshot-msrpc_c.c
 
-src_msrpc_client_LDADD = $(moonshot_LIBS)
-
 endif
 
 if IPC_DBUS
@@ -119,35 +136,36 @@ AM_VALAFLAGS += \
 
 libmoonshot_libmoonshot_la_SOURCES += libmoonshot/libmoonshot-dbus.c
 
-bin_PROGRAMS += src/dbus-client
-
-src_dbus_client_SOURCES = src/dbus-client.vala
-src_dbus_client_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_dbus_client_LDADD = $(moonshot_LIBS)
-
 CLEANFILES = $(dbusservice_DATA)
-EXTRA_DIST = $(dbusservice_in_files)
-
 endif
 
+EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files)
 
-bin_PROGRAMS += src/moonshot-webp
-
-src_moonshot_webp_SOURCES = src/moonshot-webp-parser.vala
-src_moonshot_webp_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
-src_moonshot_webp_LDADD = $(moonshot_LIBS)
+noinst_PROGRAMS = \
+        examples/client \
+        examples/service-selection \
+        tests/basic
 
-if OS_WIN32
-moonshot_webp_CFLAGS = -mwindows
-endif
+examples_service_selection_SOURCES = examples/service-selection.c
+examples_service_selection_CPPFLAGS = $(libmoonshot_CFLAGS) $(AM_CPPFLAGS)
+examples_service_selection_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
 
-
-noinst_PROGRAMS = tests/basic
+examples_client_SOURCES = examples/client.c
+examples_client_CPPFLAGS = $(libmoonshot_CFLAGS) $(AM_CPPFLAGS)
+examples_client_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
 
 tests_basic_SOURCES = tests/basic.c
-tests_basic_CPPFLAGS = $(libmoonshot_CFLAGS) $(AM_CPPFLAGS)
-tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
-
+tests_basic_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
+tests_basic_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la $(moonshot_LIBS)
+
+##if OS_LINUX
+##install-data-hook:
+##     "${UPDATE_MIME_DATABASE}" $(datadir)/mime
+##     "${UPDATE_DESKTOP_DATABASE}" $(datadir)/applications
+##uninstall-hook:
+##     "${UPDATE_MIME_DATABASE}" $(datadir)/mime
+##     "${UPDATE_DESKTOP_DATABASE}" $(datadir)/applications
+##endif
 
 if OS_WIN32
 
@@ -173,7 +191,7 @@ icons:
 
 installer: moonshot.msi
 
-moonshot.msi: windows/app.wxs
+moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
        "${WIX_CANDLE}" $<
        "${WIX_LIGHT}" -b c:/build -b c:/tools/mingw -o moonshot.msi app.wixobj