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

diff --git a/src/Makefile.am b/src/Makefile.am
index ef7af74f..c792dd51 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,9 +2,13 @@ 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)				\
@@ -15,6 +19,7 @@ AM_LDFLAGS = $(LIBM)
 AM_CPPFLAGS =						\
 	$(CPPFLAGS_COMMON)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
+	$(UOA_CFLAGS)					\
 	$(NULL)
 
 LDADD =								\
@@ -23,7 +28,9 @@ LDADD =								\
 	$(top_builddir)/extensions/libemp-extensions.la		\
 	$(GCR_LIBS) 						\
 	$(EMPATHY_LIBS)						\
+	$(TPAW_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
+	$(UOA_LIBS)						\
 	$(NULL)
 
 noinst_LTLIBRARIES = libempathy-accounts-common.la
@@ -39,7 +46,6 @@ libempathy_accounts_common_la_SOURCES =					\
 
 libempathy_accounts_common_la_LIBADD =					\
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la		\
-	$(EDS_LIBS)							\
         $(EMPATHY_LIBS)							\
         $(LIBCHAMPLAIN_LIBS)						\
 	$(NULL)
@@ -52,13 +58,17 @@ bin_PROGRAMS =			\
 
 libexec_PROGRAMS = \
 	empathy-auth-client \
-	empathy-call \
-	empathy-chat
+	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					\
@@ -75,12 +85,18 @@ empathy_auth_client_SOURCES =						\
 	$(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 \
-	gedit-close-button.c gedit-close-button.h \
+	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 = \
@@ -99,6 +115,8 @@ empathy_call_SOURCES = \
        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 \
@@ -116,7 +134,7 @@ empathy_call_SOURCES = \
        empathy-mic-monitor.c \
        empathy-mic-monitor.h
 
-empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
+empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS) -DGST_USE_UNSTABLE_API
 empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
 empathy_handwritten_source = \
@@ -133,11 +151,12 @@ empathy_handwritten_source = \
 	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 \
+	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 =								\
@@ -179,9 +198,35 @@ ui_DATA = 					\
 
 EXTRA_DIST =			\
 	$(autostart_DATA)	\
-	$(ui_DATA)
+	$(ui_DATA)		\
+	empathy-chat.js		\
+	empathy-chat.gresource.xml \
+	Chat_Manager.xml
 
 dist_man_MANS =			\
 	empathy.1 \
 	empathy-accounts.1
 
+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 $<