Merge branch 'log-window-webview'

[empathy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 72cc541dff5e63595ae01ef0a68bc8af193bad70..0232ffe0ae57443fe728c4097ac3972f4444d633 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =                                      \
+       $(YELL_CFLAGS)                                  \
        $(EMPATHY_CFLAGS)                               \
        $(EDS_CFLAGS)                                   \
        $(ERROR_CFLAGS)                                 \
@@ -15,7 +16,6 @@ AM_LDFLAGS = -lm
 AM_CPPFLAGS =                                          \
        $(CPPFLAGS_COMMON)                              \
        $(LIBCHAMPLAIN_CFLAGS)                          \
-       $(WEBKIT_CFLAGS)                                \
        $(NULL)
 
 LDADD =                                                                \
@@ -24,8 +24,9 @@ LDADD =                                                               \
        $(top_builddir)/extensions/libemp-extensions.la         \
        $(GCR_LIBS)                                             \
        $(EMPATHY_LIBS)                                         \
+       $(YELL_LIBS)                                            \
        $(LIBCHAMPLAIN_LIBS)                                    \
-       $(WEBKIT_LIBS)
+       $(NULL)
 
 noinst_LTLIBRARIES = libempathy-accounts-common.la
 
@@ -45,7 +46,6 @@ libempathy_accounts_common_la_LIBADD =                                        \
        $(EDS_LIBS)                                                     \
         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
-        $(WEBKIT_LIBS)                                                 \
        $(NULL)
 
 if HAVE_CONTROL_CENTER_EMBEDDING
@@ -80,11 +80,14 @@ bin_PROGRAMS =                      \
        $(NULL)
 
 libexec_PROGRAMS = \
-       empathy-av \
        empathy-auth-client \
+       empathy-av \
        empathy-chat
 
-BUILT_SOURCES=
+BUILT_SOURCES = \
+       src-marshal.h \
+       src-marshal.c \
+       src-marshal.list
 
 empathy_accounts_SOURCES =                                             \
        empathy-accounts.c empathy-accounts.h                           \
@@ -100,16 +103,32 @@ empathy_debugger_SOURCES =                                                \
        empathy-debugger.c                                              \
        $(NULL)
 
-empathy_handwritten_av_source = \
+empathy_av_SOURCES = \
        empathy-av.c \
-       empathy-streamed-media-window-fullscreen.c empathy-streamed-media-window-fullscreen.h   \
-       empathy-streamed-media-window.c empathy-streamed-media-window.h \
+       empathy-audio-sink.c \
+       empathy-audio-sink.h \
+       empathy-audio-src.c \
+       empathy-audio-src.h \
+       empathy-streamed-media-factory.c \
+       empathy-streamed-media-factory.h \
+       empathy-streamed-media-handler.c \
+       empathy-streamed-media-handler.h \
+       empathy-streamed-media-window-fullscreen.c \
+       empathy-streamed-media-window-fullscreen.h \
+       empathy-streamed-media-window.c \
+       empathy-streamed-media-window.h \
+       empathy-video-src.c \
+       empathy-video-src.h \
+       empathy-video-widget.c \
+       empathy-video-widget.h \
+       ev-sidebar.c \
+       ev-sidebar.h \
        $(NULL)
 
-empathy_av_SOURCES =                                           \
-       $(empathy_handwritten_av_source) \
-       ev-sidebar.c ev-sidebar.h \
-       $(NULL)
+nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
+
+empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
+empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS)
 
 empathy_auth_client_SOURCES =                                          \
        empathy-auth-client.c \
@@ -121,8 +140,51 @@ empathy_chat_SOURCES =                                             \
        empathy-chat-window.c empathy-chat-window.h             \
        empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
        empathy-chat.c \
+       gedit-close-button.c gedit-close-button.h \
        $(NULL)
 
+if HAVE_CALL
+
+libexec_PROGRAMS += empathy-call
+
+empathy_call_SOURCES = \
+       empathy-call.c \
+       empathy-call-factory.c \
+       empathy-call-factory.h \
+       empathy-call-handler.c \
+       empathy-call-handler.h \
+       empathy-call-window.c \
+       empathy-call-window.h \
+       empathy-call-window-fullscreen.c \
+       empathy-call-window-fullscreen.h \
+       empathy-about-dialog.c \
+       empathy-about-dialog.h \
+       empathy-audio-sink.c \
+       empathy-audio-sink.h \
+       empathy-audio-src.c \
+       empathy-audio-src.h \
+       empathy-video-src.c \
+       empathy-video-src.h \
+       empathy-video-widget.c \
+       empathy-video-widget.h \
+       empathy-preferences.c \
+       empathy-preferences.h \
+       ev-sidebar.c \
+       ev-sidebar.h \
+       empathy-camera-menu.c \
+       empathy-camera-menu.h \
+       empathy-mic-menu.c \
+       empathy-mic-menu.h \
+       empathy-rounded-actor.c \
+       empathy-rounded-actor.h
+
+nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
+
+empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
+empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
+
+endif
+
 empathy_handwritten_source = \
        empathy-about-dialog.c empathy-about-dialog.h                   \
        empathy-chat-window.c empathy-chat-window.h                     \
@@ -134,9 +196,11 @@ empathy_handwritten_source = \
        empathy-migrate-butterfly-logs.c empathy-migrate-butterfly-logs.h \
        empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h     \
        empathy-notifications-approver.c empathy-notifications-approver.h \
+       empathy-call-observer.c empathy-call-observer.h                 \
        empathy-preferences.c empathy-preferences.h                     \
        empathy-status-icon.c empathy-status-icon.h                     \
        empathy-chat-manager.c empathy-chat-manager.h                   \
+       gedit-close-button.c gedit-close-button.h \
        empathy.c
 
 empathy_SOURCES =                                                      \
@@ -150,7 +214,6 @@ empathy_LDADD =                                                             \
         $(top_builddir)/extensions/libemp-extensions.la                        \
         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
-        $(WEBKIT_LIBS)                                                 \
        $(NULL)
 
 nodist_empathy_SOURCES = $(BUILT_SOURCES)
@@ -168,6 +231,7 @@ ui_DATA =                                   \
        empathy-accounts-dialog.ui              \
        empathy-call-window-fullscreen.ui       \
        empathy-call-window.ui                  \
+       empathy-streamed-media-window.ui        \
        empathy-chat-window.ui                  \
        empathy-chatrooms-window.ui             \
        empathy-ft-manager.ui                   \
@@ -205,6 +269,24 @@ dist_man_MANS =                    \
        empathy.1 \
        empathy-accounts.1
 
+src-marshal.list: $(empathy_SOURCES) $(empathy_call_SOURCES) Makefile.am
+       $(AM_V_GEN)( cd $(srcdir) && \
+       sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+       $(empathy_SOURCES) $(empathy_av_SOURCES) $(empathy_call_SOURCES) ) \
+       | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
+       @if cmp -s $@.tmp $@; then \
+               rm $@.tmp; \
+       else \
+               mv $@.tmp $@; \
+       fi
+
+%-marshal.h: %-marshal.list Makefile
+       $(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_$(subst -,_,$*)_marshal $< > $*-marshal.h
+
+%-marshal.c: %-marshal.list Makefile
+       $(AM_V_GEN)echo "#include \"src-marshal.h\"" > $@ && \
+       $(GLIB_GENMARSHAL) --body --prefix=_$(subst -,_,$*)_marshal $< >> $*-marshal.c
+
 # rules for making the glib enum objects
 %-enumtypes.h: %.h Makefile.in
        $(AM_V_GEN)glib-mkenums \