X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy%2FMakefile.am;h=6a6e2ce7e517ddf3bb44b92896c0ba96dd66cdb0;hp=b20c49bf39bbed51a245baca4c1b10bfa7daad27;hb=7429c7622ffad91a96df4d729637184c3044fed1;hpb=5c5890caba5e3ddc4298f138f3bb802993b21b4d

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b20c49bf..6a6e2ce7 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -15,13 +15,12 @@ AM_CPPFLAGS =                                           \
 	$(GEOCODE_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
 	$(CONNMAN_CFLAGS)				\
+	$(UDEV_CFLAGS)					\
+	$(GOA_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
-	empathy-marshal.h				\
-	empathy-marshal.c				\
-	empathy-marshal.list				\
 	empathy-enum-types.h				\
 	empathy-enum-types.c
 
@@ -32,14 +31,14 @@ libempathy_headers =				\
 	empathy-account-settings.h		\
 	empathy-auth-factory.h			\
 	empathy-camera-monitor.h		\
-	empathy-channel-factory.h		\
 	empathy-chatroom-manager.h		\
 	empathy-chatroom.h			\
+	empathy-client-factory.h \
 	empathy-connection-managers.h		\
 	empathy-connectivity.h			\
+	empathy-connection-aggregator.h		\
 	empathy-contact-groups.h		\
 	empathy-contact-list.h			\
-	empathy-contact-manager.h		\
 	empathy-contact.h			\
 	empathy-debug.h				\
 	empathy-ft-factory.h			\
@@ -53,6 +52,7 @@ libempathy_headers =				\
 	empathy-keyring.h 			\
 	empathy-location.h			\
 	empathy-message.h			\
+	empathy-pkg-kit.h		\
 	empathy-request-util.h			\
 	empathy-server-sasl-handler.h		\
 	empathy-server-tls-handler.h		\
@@ -63,7 +63,6 @@ libempathy_headers =				\
 	empathy-tp-chat.h			\
 	empathy-tp-contact-factory.h		\
 	empathy-tp-contact-list.h		\
-	empathy-tp-file.h			\
 	empathy-tp-roomlist.h			\
 	empathy-tp-streamed-media.h		\
 	empathy-types.h				\
@@ -75,14 +74,14 @@ libempathy_handwritten_source =				\
 	empathy-account-settings.c			\
 	empathy-auth-factory.c				\
 	empathy-camera-monitor.c			\
-	empathy-channel-factory.c			\
 	empathy-chatroom-manager.c			\
 	empathy-chatroom.c				\
+	empathy-client-factory.c \
 	empathy-connection-managers.c			\
 	empathy-connectivity.c				\
+	empathy-connection-aggregator.c		\
 	empathy-contact-groups.c			\
 	empathy-contact-list.c				\
-	empathy-contact-manager.c			\
 	empathy-contact.c				\
 	empathy-debug.c					\
 	empathy-ft-factory.c				\
@@ -94,6 +93,7 @@ libempathy_handwritten_source =				\
 	empathy-irc-server.c				\
 	empathy-keyring.c				\
 	empathy-message.c				\
+	empathy-pkg-kit.c		\
 	empathy-request-util.c				\
 	empathy-server-sasl-handler.c			\
 	empathy-server-tls-handler.c			\
@@ -104,15 +104,45 @@ libempathy_handwritten_source =				\
 	empathy-tp-chat.c				\
 	empathy-tp-contact-factory.c			\
 	empathy-tp-contact-list.c			\
-	empathy-tp-file.c				\
 	empathy-tp-roomlist.c				\
 	empathy-tp-streamed-media.c			\
 	empathy-utils.c
 
+# these are sources that depend on GOA
+goa_sources = \
+	empathy-goa-auth-handler.c \
+	empathy-goa-auth-handler.h \
+	$(NULL)
+
 libempathy_la_SOURCES = \
 	$(libempathy_handwritten_source) \
 	cheese-camera-device-monitor.c cheese-camera-device-monitor.h
 
+dtddir = $(datadir)/empathy
+dtd_DATA = 					\
+	empathy-status-presets.dtd		\
+	empathy-contact-groups.dtd		\
+	empathy-chatroom-manager.dtd		\
+	empathy-irc-networks.dtd
+
+ircnetworksdir = $(datadir)/empathy
+ircnetworks_DATA =		\
+	irc-networks.xml
+
+EXTRA_DIST = 			\
+	$(dtd_DATA)		\
+	$(ircnetworks_DATA)
+
+CLEANFILES = 				\
+	$(BUILT_SOURCES)		\
+	stamp-empathy-enum-types.h
+
+if HAVE_GOA
+libempathy_la_SOURCES += $(goa_sources)
+else
+EXTRA_DIST += $(goa_sources)
+endif
+
 # do not distribute generated files
 nodist_libempathy_la_SOURCES =\
 	$(BUILT_SOURCES)
@@ -125,31 +155,19 @@ libempathy_la_LIBADD =		\
 	$(GEOCLUE_LIBS) \
 	$(GEOCODE_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \
-	$(CONNMAN_LIBS)
+	$(CONNMAN_LIBS) \
+	$(UDEV_LIBS) \
+	$(GOA_LIBS) \
+	$(LIBM)
 
 check_c_sources = \
-    $(libempathy_handwritten_source)
+    $(libempathy_handwritten_source) \
+    $(goa_sources) \
+    $(NULL)
+
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-empathy-marshal.list: $(libempathy_la_SOURCES) Makefile.am
-	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*empathy_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
-	$(libempathy_la_SOURCES) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp
-	@if cmp -s $@.tmp $@; then \
-		rm $@.tmp; \
-	else \
-		mv $@.tmp $@; \
-	fi
-
-empathy-marshal.h: empathy-marshal.list Makefile
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --header --prefix=_empathy_marshal $< > empathy-marshal.h
-
-empathy-marshal.c: empathy-marshal.list Makefile
-	$(AM_V_GEN)echo "#include \"empathy-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) --body --prefix=_empathy_marshal $< >> empathy-marshal.c
-
 empathy-enum-types.h: stamp-empathy-enum-types.h
 	$(AM_V_GEN)true
 stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
@@ -187,23 +205,3 @@ empathy-enum-types.c: $(libempathy_headers) Makefile
 		$(libempathy_headers) ) > xgen-gtc \
 	&& cp xgen-gtc $(@F) \
 	&& rm -f xgen-gtc
-
-dtddir = $(datadir)/empathy
-dtd_DATA = 					\
-	empathy-status-presets.dtd		\
-	empathy-contact-groups.dtd		\
-	empathy-chatroom-manager.dtd		\
-	empathy-irc-networks.dtd
-
-ircnetworksdir = $(datadir)/empathy
-ircnetworks_DATA =		\
-	irc-networks.xml
-
-EXTRA_DIST = 			\
-	empathy-marshal.list	\
-	$(dtd_DATA)		\
-	$(ircnetworks_DATA)
-
-CLEANFILES = 				\
-	$(BUILT_SOURCES)		\
-	stamp-empathy-enum-types.h