Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/facebook/Makefile.am	Mon Aug 22 03:14:16 2016 -0400
+++ b/libpurple/protocols/facebook/Makefile.am	Mon Aug 22 03:38:13 2016 -0400
@@ -1,6 +1,6 @@
 EXTRA_DIST = \
 	Makefile.mingw \
-	marshaller.list
+	marshal.list
 
 pkgdir = @PURPLE_PLUGINDIR@
 
@@ -29,12 +29,12 @@
 	marshal.c \
 	marshal.h
 
-marshal.c: $(srcdir)/marshaller.list marshal.h
+marshal.c: $(srcdir)/marshal.list marshal.h
 	$(AM_V_GEN)echo "#include \"marshal.h\"" > $@
-	$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=fb_marshal --body $(srcdir)/marshaller.list >> $@
+	$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=fb_marshal --body $(srcdir)/marshal.list >> $@
 
-marshal.h: $(srcdir)/marshaller.list
-	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=fb_marshal --header $(srcdir)/marshaller.list > $@
+marshal.h: $(srcdir)/marshal.list
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=fb_marshal --header $(srcdir)/marshal.list > $@
 
 AM_CFLAGS = $(st)
 

--- a/libpurple/protocols/facebook/Makefile.mingw	Mon Aug 22 03:14:16 2016 -0400
+++ b/libpurple/protocols/facebook/Makefile.mingw	Mon Aug 22 03:38:13 2016 -0400
@@ -85,12 +85,12 @@
 $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
 
-marshal.c: marshaller.list marshal.h
+marshal.c: marshal.list marshal.h
 	@echo "#include \"marshal.h\"" > $@
-	@$(GLIB_GENMARSHAL) --prefix=fb_marshal --body marshaller.list >> $@
+	@$(GLIB_GENMARSHAL) --prefix=fb_marshal --body marshal.list >> $@
 
-marshal.h: marshaller.list
-	@$(GLIB_GENMARSHAL) --prefix=fb_marshal --header marshaller.list > $@
+marshal.h: marshal.list
+	@$(GLIB_GENMARSHAL) --prefix=fb_marshal --header marshal.list > $@
 
 ##
 ## CLEAN RULES

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/facebook/marshal.list	Mon Aug 22 03:38:13 2016 -0400
@@ -0,0 +1,6 @@
+VOID:INT64
+VOID:OBJECT
+VOID:POINTER
+VOID:POINTER,BOOLEAN
+VOID:STRING,BOXED
+VOID:VOID

--- a/libpurple/protocols/facebook/marshaller.list	Mon Aug 22 03:14:16 2016 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-VOID:INT64
-VOID:OBJECT
-VOID:POINTER
-VOID:POINTER,BOOLEAN
-VOID:STRING,BOXED
-VOID:VOID

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/facebook/meson.build	Mon Aug 22 03:38:13 2016 -0400
@@ -0,0 +1,39 @@
+FACEBOOKSOURCES = [
+	'api.c',
+	'api.h',
+	'data.c',
+	'data.h',
+	'facebook.h',
+	'facebook.c',
+	'http.c',
+	'http.h',
+	'id.h',
+	'json.c',
+	'json.h',
+	'mqtt.c',
+	'mqtt.h',
+	'thrift.c',
+	'thrift.h',
+	'util.c',
+	'util.h'
+]
+
+marshal_h = glib_genmarshal_h.process('marshal.list',
+                                      extra_args : ['--prefix=fb_marshal'])
+marshal_c = glib_genmarshal_c.process('marshal.list',
+                                      extra_args : ['--prefix=fb_marshal'])
+FACEBOOKSOURCES += [marshal_c, marshal_h]
+
+if STATIC_FACEBOOK
+	facebook_prpl = static_library('facebook', FACEBOOKSOURCES,
+	    include_directories : [toplevel_inc, libpurple_inc],
+	    c_args : '-DPURPLE_STATIC_PRPL',
+	    link_with : libpurple,
+	    dependencies : [json, gplugin, glib])
+elif DYNAMIC_FACEBOOK
+	facebook_prpl = shared_library('facebook', FACEBOOKSOURCES,
+	    include_directories : [toplevel_inc, libpurple_inc],
+	    link_with : libpurple,
+	    dependencies : [json, gplugin, glib],
+	    install : true, install_dir : PURPLE_PLUGINDIR)
+endif

--- a/libpurple/protocols/meson.build	Mon Aug 22 03:14:16 2016 -0400
+++ b/libpurple/protocols/meson.build	Mon Aug 22 03:38:13 2016 -0400
@@ -1,5 +1,5 @@
 subdir('bonjour')
-#subdir('facebook')
+subdir('facebook')
 #subdir('gg')
 #subdir('irc')
 #subdir('jabber')