Merge client library with moonshot-ui

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7ff1792..f76fd31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,19 +2,33 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = po
 
+
+lib_LTLIBRARIES = libmoonshot/libmoonshot.la
+
 bin_PROGRAMS = src/moonshot
 
+
 AM_CFLAGS =
 
 AM_CPPFLAGS = \
        -include config.h \
        -DLOCALEDIR=\""$(localedir)"\" \
-       $(moonshot_CFLAGS)
+       -I$(top_srcdir)/libmoonshot
 
 AM_VALAFLAGS = \
        config.vapi \
        --pkg gtk+-2.0
 
+
+libmoonshot_libmoonshot_la_CPPFLAGS = \
+        $(libmoonshot_CFLAGS) \
+        $(AM_CPPFLAGS)
+
+libmoonshot_libmoonshot_la_SOURCES = libmoonshot/libmoonshot-common.c
+
+libmoonshot_libmoonshot_la_LIBADD = $(libmoonshot_LIBS)
+
+
 src_moonshot_SOURCES = \
         src/moonshot-id.vala \
         src/moonshot-add-dialog.vala \
@@ -22,6 +36,7 @@ src_moonshot_SOURCES = \
         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
@@ -29,11 +44,23 @@ src_moonshot_SOURCES = \
 src_moonshot_LDADD = \
         $(moonshot_LIBS)
 
+src_moonshot_CPPFLAGS = \
+        $(moonshot_CFLAGS) \
+        $(AM_CPPFLAGS)
+
+
 if OS_WIN32
+
+libmoonshot_libmoonshot_la_LDFLAGS = -no-undefined
+
 src_moonshot_CFLAGS = -mwindows
+
+AM_CPPFLAGS += -DOS_WIN32
 AM_VALAFLAGS += --define=OS_WIN32
+
 endif
 
+
 if IPC_MSRPC
 
 AM_CPPFLAGS += -Isrc
@@ -42,35 +69,40 @@ AM_VALAFLAGS += \
        --pkg msrpc-1.0 \
        --define=IPC_MSRPC
 
-noinst_HEADERS = src/moonshot-msrpc.h
+BUILT_SOURCES = libmoonshot/moonshot-msrpc.h \
+                libmoonshot/moonshot-msrpc_s.c \
+                libmoonshot/moonshot-msrpc_c.c
 
-src_moonshot_SOURCES += \
-        src/moonshot-msrpc-server.vala \
-        src/moonshot-msrpc_s.c \
-        src/moonshot-msrpc.vapi
+DISTCLEANFILES = ${BUILT_SOURCES}
 
-bin_PROGRAMS += src/msrpc-client
+libmoonshot/moonshot-msrpc.h: libmoonshot/moonshot-msrpc.idl libmoonshot/moonshot-msrpc.acf
+       ${AM_V_GEN} ${MIDL_WRAPPER} -o libmoonshot -m "${MIDL}" $^
 
-src_msrpc_client_SOURCES = \
-        src/msrpc-client.vala \
-        src/moonshot-msrpc_c.c \
-        src/moonshot-msrpc.vapi
+libmoonshot/moonshot-msrpc_s.c: libmoonshot/moonshot-msrpc.h
+libmoonshot/moonshot-msrpc_c.c: libmoonshot/moonshot-msrpc.h
 
-src_msrpc_client_LDADD = \
-        $(moonshot_LIBS)
+libmoonshot_libmoonshot_la_SOURCES += \
+        libmoonshot/libmoonshot-msrpc.c \
+        libmoonshot/moonshot-msrpc_c.c
 
-BUILT_SOURCES = src/moonshot-msrpc.h src/moonshot-msrpc_s.c src/moonshot-msrpc_c.c
+src_moonshot_SOURCES += \
+        src/moonshot-msrpc.vapi
 
-DISTCLEANFILES = ${BUILT_SOURCES}
+nodist_src_moonshot_SOURCES = \
+        libmoonshot/moonshot-msrpc_s.c
 
-src/moonshot-msrpc.h: src/moonshot-msrpc.idl src/moonshot-msrpc.acf
-       ${AM_V_GEN} ${MIDL_WRAPPER} -o src -m "${MIDL}" $^
+bin_PROGRAMS += src/msrpc-client
 
-src/moonshot-msrpc_s.c: src/moonshot-msrpc.h
+nodist_src_msrpc_client_SOURCES = \
+        src/msrpc-client.vala \
+        src/moonshot-msrpc.vapi \
+        libmoonshot/moonshot-msrpc_c.c
+
+src_msrpc_client_LDADD = $(moonshot_LIBS)
 
-else
+endif
 
-# IPC_DBUS
+if IPC_DBUS
 
 # DBus service file
 dbusservicedir = $(datadir)/dbus-1/services
@@ -85,7 +117,7 @@ AM_VALAFLAGS += \
        --pkg dbus-glib-1 \
        --define=IPC_DBUS
 
-src_moonshot_SOURCES += src/moonshot-dbus-server.vala
+libmoonshot_libmoonshot_la_SOURCES += libmoonshot/libmoonshot-dbus.c
 
 bin_PROGRAMS += src/dbus-client
 
@@ -101,6 +133,36 @@ EXTRA_DIST = $(dbusservice_in_files)
 endif
 
 
+bin_PROGRAMS += src/moonshot-webp
+
+src_moonshot_webp_SOURCES = src/moonshot-webp-parser.vala
+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_LDADD = ${top_builddir}/libmoonshot/libmoonshot.la
+tests_basic_SOURCES = tests/basic.c
+
+
 if OS_WIN32
 
 ## A couple of Windows-specific targets: