X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2FMakefile.am;h=c792dd51e68ab4f54185b5b432f2df69fc9025ee;hp=d2b7f013d58dc67529c60c7450b5f9ffd74dd753;hb=15aa6a83ff96fad9f959762f2b57646f9e735cd1;hpb=e4d6dc647732a895dbf6c1b0983ccad39ed3a61c

diff --git a/src/Makefile.am b/src/Makefile.am
index d2b7f013..c792dd51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,20 +2,24 @@ include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
-	$(EDS_CFLAGS)					\
+	$(TPAW_CFLAGS)					\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)                          	\
+	-I$(top_srcdir)/libempathy-gtk			\
+	-I$(top_srcdir)/libempathy			\
+	-I$(top_srcdir)/extensions			\
+	-I$(top_builddir)/libempathy-gtk		\
+	-I$(top_builddir)/libempathy			\
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DBIN_DIR=\"$(bindir)\"                         \
 	$(DISABLE_DEPRECATED)				\
 	$(WARN_CFLAGS)					\
 	$(NULL)
 
-AM_LDFLAGS = -lm
+AM_LDFLAGS = $(LIBM)
 AM_CPPFLAGS =						\
 	$(CPPFLAGS_COMMON)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
-	$(WEBKIT_CFLAGS)				\
+	$(UOA_CFLAGS)					\
 	$(NULL)
 
 LDADD =								\
@@ -24,16 +28,16 @@ LDADD =								\
 	$(top_builddir)/extensions/libemp-extensions.la		\
 	$(GCR_LIBS) 						\
 	$(EMPATHY_LIBS)						\
+	$(TPAW_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
-	$(WEBKIT_LIBS)
+	$(UOA_LIBS)						\
+	$(NULL)
 
 noinst_LTLIBRARIES = libempathy-accounts-common.la
 
 libempathy_accounts_common_la_SOURCES =					\
 	empathy-accounts-common.c empathy-accounts-common.h		\
-	empathy-account-assistant.c empathy-account-assistant.h		\
 	empathy-accounts-dialog.c empathy-accounts-dialog.h		\
-	empathy-auto-salut-account-helper.c empathy-auto-salut-account-helper.h \
 	empathy-import-dialog.c empathy-import-dialog.h			\
 	empathy-import-pidgin.c empathy-import-pidgin.h			\
 	empathy-import-widget.c empathy-import-widget.h			\
@@ -42,37 +46,10 @@ libempathy_accounts_common_la_SOURCES =					\
 
 libempathy_accounts_common_la_LIBADD =					\
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la		\
-	$(EDS_LIBS)							\
         $(EMPATHY_LIBS)							\
         $(LIBCHAMPLAIN_LIBS)						\
-        $(WEBKIT_LIBS)							\
-	$(NULL)
-
-if HAVE_CONTROL_CENTER_EMBEDDING
-ccmodulesdir = $(CONTROL_CENTER_EXTENSIONDIR)
-ccmodules_LTLIBRARIES = libempathy-accounts-panel.la
-
-libempathy_accounts_panel_la_SOURCES =				\
-	empathy-accounts-module.c				\
-	cc-empathy-accounts-panel.c				\
-	cc-empathy-accounts-panel.h				\
 	$(NULL)
 
-libempathy_accounts_panel_la_CPPFLAGS =				\
-	$(CPPFLAGS_COMMON)					\
-	$(CONTROL_CENTER_EMBEDDING_CFLAGS)			\
-	-DLOCALEDIR=\""$(datadir)/locale"\"			\
-	$(NULL)
-
-libempathy_accounts_panel_la_LDFLAGS = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'
-
-libempathy_accounts_panel_la_LIBADD =				\
-	$(EMPATHY_LIBS)						\
-	$(CONTROL_CENTER_EMBEDDING_LIBS)			\
-	libempathy-accounts-common.la				\
-	$(NULL)
-endif
-
 bin_PROGRAMS =			\
 	empathy			\
 	empathy-accounts	\
@@ -80,19 +57,18 @@ bin_PROGRAMS =			\
 	$(NULL)
 
 libexec_PROGRAMS = \
-	empathy-av \
 	empathy-auth-client \
-	empathy-chat
-
-BUILT_SOURCES = \
-	src-marshal.h \
-	src-marshal.c \
-	src-marshal.list
+	empathy-call
 
 empathy_accounts_SOURCES =						\
 	empathy-accounts.c empathy-accounts.h				\
 	$(NULL)
 
+empathy_accounts_CPPFLAGS =						\
+	$(AM_CPPFLAGS) \
+	$(CHEESE_CFLAGS) \
+	$(NULL)
+
 empathy_accounts_LDADD =						\
 	$(LDADD)							\
 	libempathy-accounts-common.la					\
@@ -103,28 +79,63 @@ empathy_debugger_SOURCES =						\
 	empathy-debugger.c		 				\
 	$(NULL)
 
-empathy_handwritten_av_source = \
-	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	\
-	$(NULL)
-
-empathy_av_SOURCES =						\
-	$(empathy_handwritten_av_source) \
-	ev-sidebar.c ev-sidebar.h \
-	$(NULL)
-
 empathy_auth_client_SOURCES =						\
+	empathy-sanity-cleaning.c empathy-sanity-cleaning.h \
 	empathy-auth-client.c \
 	$(NULL)
 
 empathy_chat_SOURCES =						\
+	chat-manager-interface.c chat-manager-interface.h \
 	empathy-about-dialog.c empathy-about-dialog.h			\
 	empathy-chat-manager.c empathy-chat-manager.h		\
 	empathy-chat-window.c empathy-chat-window.h		\
 	empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
 	empathy-chat.c \
-	$(NULL)
+	polari-fixed-size-frame.c  polari-fixed-size-frame.h \
+	$(NULL)
+
+nodist_empathy_chat_SOURCES = \
+	empathy-chat-resources.c \
+	empathy-chat-resources.h \
+	$(NULL)
+
+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-audio-utils.c \
+       empathy-audio-utils.h \
+       empathy-video-src.c \
+       empathy-video-src.h \
+       empathy-preferences.c \
+       empathy-preferences.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 \
+       empathy-rounded-rectangle.c \
+       empathy-rounded-rectangle.h \
+       empathy-rounded-texture.c \
+       empathy-rounded-texture.h \
+       empathy-mic-monitor.c \
+       empathy-mic-monitor.h
+
+empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS) -DGST_USE_UNSTABLE_API
+empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
 empathy_handwritten_source = \
 	empathy-about-dialog.c empathy-about-dialog.h			\
@@ -133,17 +144,19 @@ empathy_handwritten_source = \
 	empathy-event-manager.c empathy-event-manager.h			\
 	empathy-ft-manager.c empathy-ft-manager.h			\
 	empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
-	empathy-main-window.c empathy-main-window.h			\
-	empathy-migrate-butterfly-logs.c empathy-migrate-butterfly-logs.h \
+	empathy-roster-window.c empathy-roster-window.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			\
+	polari-fixed-size-frame.c  polari-fixed-size-frame.h \
 	empathy.c
 
 empathy_SOURCES =							\
 	$(empathy_handwritten_source)					\
+	chat-manager-interface.c chat-manager-interface.h \
 	$(NULL)
 
 empathy_LDADD =								\
@@ -153,15 +166,17 @@ empathy_LDADD =								\
         $(top_builddir)/extensions/libemp-extensions.la			\
         $(EMPATHY_LIBS)							\
         $(LIBCHAMPLAIN_LIBS)						\
-        $(WEBKIT_LIBS)							\
 	$(NULL)
 
-nodist_empathy_SOURCES = $(BUILT_SOURCES)
-
 check_c_sources = \
     $(empathy_handwritten_source) \
     $(empathy_logs_SOURCES) \
-    $(empathy_handwritten_av_source)
+    $(libempathy_accounts_common_la_SOURCES) \
+    $(empathy_accounts_SOURCES) \
+    $(empathy_debugger_SOURCES) \
+    $(empathy_auth_client_SOURCES) \
+    $(empathy_chat_SOURCES) \
+    $(empathy_call_SOURCES)
 
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
@@ -175,74 +190,43 @@ ui_DATA = 					\
 	empathy-chatrooms-window.ui		\
 	empathy-ft-manager.ui			\
 	empathy-import-dialog.ui		\
-	empathy-main-window.ui			\
+	empathy-roster-window.ui			\
+	empathy-roster-window-menubar.ui		\
 	empathy-new-chatroom-dialog.ui		\
 	empathy-preferences.ui			\
 	empathy-status-icon.ui
 
 EXTRA_DIST =			\
 	$(autostart_DATA)	\
-	$(ui_DATA)
-
-if HAVE_LIBCHAMPLAIN
-empathy_handwritten_source += 				\
-	empathy-map-view.c			\
-	empathy-map-view.h
-
-ui_DATA += 					\
-	empathy-map-view.ui
-else
-EXTRA_DIST +=					\
-	empathy-map-view.c			\
-	empathy-map-view.h			\
-	empathy-map-view.ui
-endif
-
-if !HAVE_CONTROL_CENTER_EMBEDDING
-EXTRA_DIST += $(libempathy_accounts_panel_la_SOURCES)
-else
-check_c_sources += $(libempathy_accounts_panel_la_SOURCES)
-endif
+	$(ui_DATA)		\
+	empathy-chat.js		\
+	empathy-chat.gresource.xml \
+	Chat_Manager.xml
 
 dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1
 
-src-marshal.list: $(empathy_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*src_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(wildcard *.c) ) \
-	| 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 \
-	--fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-	--fprod "/* enumerations from \"@filename@\" */\n" \
-	--vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
-	--ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \
-	$< > $@
-
-%-enumtypes.c: %.h Makefile.in
-	$(AM_V_GEN)glib-mkenums \
-	--fhead "#include <$*.h>\n#include <$*-enumtypes.h>" \
-	--fprod "\n/* enumerations from \"@filename@\" */" \
-	--vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"     \
-	--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@VALUENAME@\" }," \
-	--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-	$< > $@
+chat-manager-interface.c: chat-manager-interface.h
+chat-manager-interface.h: Makefile.am Chat_Manager.xml
+	gdbus-codegen \
+		--interface-prefix org.gnome.Empathy. \
+		--c-namespace EmpathyGen \
+		--generate-c-code chat-manager-interface \
+		Chat_Manager.xml
+
+BUILT_SOURCES = \
+	$(nodist_empathy_chat_SOURCES) \
+	chat-manager-interface.c \
+	chat-manager-interface.h \
+	$(NULL)
 
 CLEANFILES = $(BUILT_SOURCES)
 
+chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-chat.gresource.xml)
+
+empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<