summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--finch/libgnt/meson.build2
-rw-r--r--finch/meson.build165
-rw-r--r--libpurple/meson.build4
-rw-r--r--meson.build9
-rw-r--r--package_revision.h.in1
5 files changed, 176 insertions, 5 deletions
diff --git a/finch/libgnt/meson.build b/finch/libgnt/meson.build
index 8597030dcc..046b05c0fe 100644
--- a/finch/libgnt/meson.build
+++ b/finch/libgnt/meson.build
@@ -78,7 +78,7 @@ libgnt = library('gnt',
libgnt_dep = declare_dependency(
include_directories : [toplevel_inc, libgnt_inc],
link_with : libgnt,
- dependencies : [glib])
+ dependencies : [ncurses, glib])
configure_file(input : 'gnt.pc.in',
output : 'gnt.pc',
diff --git a/finch/meson.build b/finch/meson.build
new file mode 100644
index 0000000000..974a37f9f9
--- /dev/null
+++ b/finch/meson.build
@@ -0,0 +1,165 @@
+subdir('libgnt')
+
+libfinch_SOURCES = [
+ 'gntaccount.c',
+ 'gntblist.c',
+ 'gntcertmgr.c',
+ 'gntconn.c',
+ 'gntconv.c',
+ 'gntdebug.c',
+ 'gntidle.c',
+ 'gntlog.c',
+ 'gntmedia.c',
+ 'gntmenuutil.c',
+ 'gntnotify.c',
+ 'gntplugin.c',
+ 'gntpounce.c',
+ 'gntprefs.c',
+ 'gntrequest.c',
+ 'gntroomlist.c',
+ 'gntsound.c',
+ 'gntstatus.c',
+ 'gntui.c',
+ 'gntxfer.c',
+ package_revision,
+ 'libfinch.c'
+]
+
+libfinch_headers = [
+ 'gntaccount.h',
+ 'gntblist.h',
+ 'gntcertmgr.h',
+ 'gntconn.h',
+ 'gntconv.h',
+ 'gntdebug.h',
+ 'finch.h',
+ 'gntidle.h',
+ 'gntlog.h',
+ 'gntmedia.h',
+ 'gntmenuutil.h',
+ 'gntnotify.h',
+ 'gntplugin.h',
+ 'gntpounce.h',
+ 'gntprefs.h',
+ 'gntrequest.h',
+ 'gntroomlist.h',
+ 'gntsound.h',
+ 'gntstatus.h',
+ 'gntui.h',
+ 'gntxfer.h'
+]
+
+finch_SOURCES = [
+ 'finch.c'
+]
+
+if ENABLE_GNT
+ install_headers(libfinch_headers, subdir : 'finch')
+
+ libfinch_inc = include_directories('.')
+ libfinch = static_library('finch',
+ libfinch_SOURCES,
+ c_args : '-DSTANDALONE',
+ include_directories : [toplevel_inc],
+ soversion : purple_lt_current,
+ version : PURPLE_LT_VERSION_INFO,
+ dependencies : [libpurple_dep, libgnt_dep, glib])
+ libfinch_dep = declare_dependency(
+ include_directories : [toplevel_inc, libfinch_inc],
+ link_with : libfinch,
+ dependencies : [libpurple_dep, libgnt_dep, glib])
+
+ finch = executable('finch',
+ finch_SOURCES,
+ c_args : '-DSTANDALONE',
+ dependencies : [libpurple_dep, libgnt_dep, libfinch_dep])
+
+ configure_file(input : 'finch.pc.in',
+ output : 'finch.pc',
+ configuration : conf,
+ install : true,
+ install_dir : get_option('libdir') + '/pkgconfig')
+endif
+
+if IS_WIN32
+# libfinch_la_LIBADD += \
+# -lwinmm
+
+ # TODO: Use this for something:
+ FINCH_WIN32RES = WINDRES.process('finch_winres.rc')
+ LIBFINCH_WIN32RES = WINDRES.process('libfinch_winres.rc')
+endif
+
+#AM_CPPFLAGS = \
+# -DSTANDALONE \
+# -I$(top_srcdir)/libpurple/ \
+# -I$(top_builddir)/libpurple \
+# -I$(top_srcdir) \
+# -I$(srcdir)/libgnt/ \
+# $(DEBUG_CFLAGS) \
+# $(GLIB_CFLAGS) \
+# $(GPLUGIN_CFLAGS) \
+# $(DBUS_CFLAGS) \
+# $(LIBXML_CFLAGS) \
+# $(GSTREAMER_CFLAGS) \
+# $(INTROSPECTION_CFLAGS) \
+# $(GNT_CFLAGS)
+
+if ENABLE_GNT
+# -include $(INTROSPECTION_MAKEFILE)
+# INTROSPECTION_GIRS =
+# INTROSPECTION_SCANNER_ARGS = \
+# --warn-all \
+# --add-include-path=$(prefix)/share/gir-1.0 \
+# --add-include-path=$(builddir)/libgnt \
+# --add-include-path=$(top_builddir)/libpurple
+
+# INTROSPECTION_COMPILER_ARGS = \
+# --includedir=$(prefix)/share/gir-1.0 \
+# --includedir=$(builddir)/libgnt \
+# --includedir=$(top_builddir)/libpurple
+
+ if enable_introspection
+# introspection_sources = $(libfinchinclude_HEADERS)
+
+# Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir: $(builddir)/libfinch.la
+# Finch_3_0_gir_INCLUDES = \
+# Gnt-$(GNT_MAJOR_VERSION).$(GNT_MINOR_VERSION) \
+# Purple-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION)
+
+# Finch_3_0_gir_CFLAGS = \
+# $(INCLUDES) \
+# -DSTANDALONE \
+# -DDATADIR=\"$(datadir)\" \
+# -DLIBDIR=\"$(libdir)/finch/\" \
+# -DLOCALEDIR=\"$(datadir)/locale\" \
+# -DSYSCONFDIR=\"$(sysconfdir)\" \
+# -I$(top_srcdir)/libpurple/ \
+# -I$(top_builddir)/libpurple/ \
+# -I$(top_srcdir) \
+# -I$(srcdir)/libgnt/ \
+# $(GLIB_CFLAGS) \
+# $(GPLUGIN_CFLAGS) \
+# $(DBUS_CFLAGS) \
+# $(LIBXML_CFLAGS) \
+# $(GSTREAMER_CFLAGS) \
+# $(INTROSPECTION_CFLAGS) \
+# $(GNT_CFLAGS)
+
+# Finch_3_0_gir_LIBS = $(builddir)/libfinch.la
+# Finch_3_0_gir_FILES = $(introspection_sources)
+# INTROSPECTION_GIRS += Finch-$(PURPLE_MAJOR_VERSION).$(PURPLE_MINOR_VERSION).gir
+
+# girdir = \
+# $(prefix)/share/gir-1.0 \
+# $(INTROSPECTION_GIRDIR)
+# gir_DATA = $(INTROSPECTION_GIRS)
+
+# typelibdir = \
+# $(prefix)/share/gir-1.0 \
+# $(INTROSPECTION_TYPELIBDIR)
+# typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+ endif
+endif # ENABLE_GNT
+
+#subdir('plugins')
diff --git a/libpurple/meson.build b/libpurple/meson.build
index 8f91a1ccb9..39f286620e 100644
--- a/libpurple/meson.build
+++ b/libpurple/meson.build
@@ -423,7 +423,7 @@ libpurple = library('purple',
soversion : purple_lt_current,
version : PURPLE_LT_VERSION_INFO,
dependencies : # static_link_libs
- [dbus, dbus_glib, dnsapi, glib, gplugin, libxml, #networkmanager,
+ [dbus, dbus_glib, dnsapi, glib, gio, gplugin, libxml, #networkmanager,
#intllibs,
farstream, gstreamer, gstreamer_video,
gstreamer_app, idn, json, gnutls,
@@ -431,7 +431,7 @@ libpurple = library('purple',
libpurple_dep = declare_dependency(
include_directories : [toplevel_inc, libpurple_inc],
link_with : libpurple,
- dependencies : [gplugin, glib])
+ dependencies : [gstreamer, gplugin, glib, gio])
if ENABLE_DBUS
diff --git a/meson.build b/meson.build
index 67feb67681..82a8fc723e 100644
--- a/meson.build
+++ b/meson.build
@@ -98,6 +98,11 @@ GNT_LT_VERSION_INFO = '@0@.@1@.@2@'.format(gnt_lt_current,
gnt_minor_version)
version_conf.set('GNT_LT_VERSION_INFO', GNT_LT_VERSION_INFO)
+package_revision = vcs_tag(
+ input : 'package_revision.h.in',
+ output : 'package_revision.h',
+ fallback : meson.project_version())
+
sedpath = find_program('sed')
xxdpath = find_program('xxd')
@@ -1871,8 +1876,8 @@ subdir('libpurple')
#subdir('libpurple/tests')
subdir('share/sounds')
subdir('share/ca-certs')
-#subdir('finch')
-subdir('finch/libgnt')
+subdir('finch')
+#subdir('finch/libgnt')
#subdir('finch/libgnt/wms')
#subdir('finch/plugins')
diff --git a/package_revision.h.in b/package_revision.h.in
new file mode 100644
index 0000000000..058fb7ff0c
--- /dev/null
+++ b/package_revision.h.in
@@ -0,0 +1 @@
+#define REVISION "@VCS_TAG@"
View Lorry Controller Status