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

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5e7886d..c37573e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ lib_LTLIBRARIES = libmoonshot/libmoonshot.la
 bin_PROGRAMS = src/moonshot
 
 
+
 AM_CFLAGS =
 
 AM_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 \
@@ -48,7 +51,6 @@ src_moonshot_CPPFLAGS = \
         $(moonshot_CFLAGS) \
         $(AM_CPPFLAGS)
 
-
 if OS_WIN32
 
 libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
@@ -58,8 +60,22 @@ src_moonshot_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
+mime_DATA = webprovisioning/moonshot.xml
+mimedir = $(datadir)/mime/packages
+
+## Installing
+dotdesktop_DATA = moonshot.desktop moonshot-webp.desktop
+dotdesktopdir = $(datadir)/applications
+endif
 
 if IPC_MSRPC
 
@@ -82,8 +98,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 +106,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,12 +128,6 @@ 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)
 
@@ -142,12 +145,23 @@ moonshot_webp_CFLAGS = -mwindows
 endif
 
 
-noinst_PROGRAMS = tests/basic
+noinst_PROGRAMS = \
+        examples/client \
+        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
+endif
 
 if OS_WIN32