mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-02 16:38:13 +02:00
8c7bbdbaea
* glib/dbus-gvalue-utils.h (_dbus_g_type_specialized_builtins_init) (dbus_g_type_is_fixed, dbus_g_type_fixed_get_size) (dbus_gvalue_set_from_pointer, dbus_g_hash_table_value_foreach) (dbus_g_hash_table_insert_values, dbus_g_hash_table_insert_steal_values) (dbus_gtype_is_valid_hash_key, dbus_gtype_is_valid_hash_value) (dbus_g_hash_func_from_gtype, dbus_g_hash_free_from_gtype) (dbus_g_hash_equal_from_gtype, dbus_gvalue_stor, dbus_gvalue_take): * glib/dbus-gvalue.h (dbus_g_value_types_init) (dbus_gvalue_demarshal, dbus_gvalue_demarshal_variant) (dbus_gvalue_demarshal_message, dbus_gvalue_marshal): Prefix name with _ to ensure they're not exported. All callers updated. * glib/dbus-gvalue.c (typecode_to_gtype) (dbus_typecode_maps_to_basic, basic_typecode_to_gtype) (signature_iter_to_g_type_dict) (signature_iter_to_g_type_array) (dbus_gtype_from_signature_iter, dbus_gtype_from_signature) (dbus_gtypes_from_arg_signature): Move to dbus-gsignature.c. * glib/dbus-binding-tool-glib.c (dbus_binding_tool_output_glib_server): Call dbus_g_type_specialized_builtins_init instead of dbus_g_value_types_init. (dbus_binding_tool_output_glib_client): Ditto. * glib/Makefile.am (DBUS_GLIB_INTERNALS): Add dbus-gsignature.c and dbus-gsignature.h * test/glib/test-service-glib.c (my_object_rec_arrays): Delete unused variable.
105 lines
3 KiB
Makefile
105 lines
3 KiB
Makefile
SUBDIRS = . examples
|
|
|
|
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
|
|
|
|
lib_LTLIBRARIES=libdbus-glib-1.la
|
|
|
|
dbus-glib-error-switch.h: $(top_srcdir)/dbus/dbus-protocol.h make-dbus-glib-error-switch.sh
|
|
libtool --mode=execute $(srcdir)/make-dbus-glib-error-switch.sh $(top_srcdir)/dbus/dbus-protocol.h $@
|
|
|
|
BUILT_SOURCES = dbus-glib-error-switch.h
|
|
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
DBUS_GLIB_INTERNALS = \
|
|
dbus-gtype-specialized.c \
|
|
dbus-gutils.c \
|
|
dbus-gutils.h \
|
|
dbus-gsignature.c \
|
|
dbus-gsignature.h \
|
|
dbus-gvalue.h \
|
|
dbus-gvalue-utils.c \
|
|
dbus-gvalue-utils.h
|
|
|
|
libdbus_glib_1_la_SOURCES = \
|
|
dbus-glib-error-switch.h \
|
|
dbus-glib.c \
|
|
dbus-gmain.c \
|
|
dbus-gmarshal.c \
|
|
dbus-gmarshal.h \
|
|
dbus-gobject.c \
|
|
dbus-gobject.h \
|
|
dbus-gproxy.c \
|
|
dbus-gtest.c \
|
|
dbus-gtest.h \
|
|
dbus-gvalue.c \
|
|
dbus-gvalue.h \
|
|
dbus-gthread.c \
|
|
$(DBUS_GLIB_INTERNALS)
|
|
|
|
libdbus_glib_HEADERS = \
|
|
dbus-gtype-specialized.h
|
|
|
|
libdbus_glibdir = $(includedir)/dbus-1.0/dbus
|
|
|
|
libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
|
|
## don't export symbols that start with "_" (we use this
|
|
## convention for internal symbols)
|
|
libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
|
|
|
|
# convenience lib used here and by dbus-viewer
|
|
noinst_LTLIBRARIES=libdbus-gtool.la
|
|
|
|
libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \
|
|
dbus-gidl.c \
|
|
dbus-gidl.h \
|
|
dbus-gloader-expat.c \
|
|
dbus-gparser.c \
|
|
dbus-gparser.h
|
|
|
|
libdbus_gtool_la_LIBADD = libdbus-glib-1.la
|
|
|
|
bin_PROGRAMS=dbus-binding-tool
|
|
|
|
dbus_binding_tool_SOURCES = \
|
|
dbus-binding-tool-glib.h \
|
|
dbus-binding-tool-glib.c \
|
|
dbus-glib-tool.h \
|
|
dbus-glib-tool.c
|
|
|
|
dbus_binding_tool_LDADD= -lexpat libdbus-gtool.la
|
|
|
|
## we just rebuilt these manually and check them into cvs; easier than
|
|
## convincing automake/make to do this properly
|
|
regenerate-built-sources:
|
|
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --header > dbus-gmarshal.h && \
|
|
echo '#include "dbus-gmarshal.h"' > dbus-gmarshal.c && \
|
|
@GLIB_GENMARSHAL@ --prefix=_dbus_g_marshal dbus-gmarshal.list --body >> dbus-gmarshal.c
|
|
|
|
EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh
|
|
|
|
if DBUS_BUILD_TESTS
|
|
|
|
## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
|
|
## build even when not doing "make check"
|
|
noinst_PROGRAMS= $(TESTS)
|
|
|
|
## note that TESTS has special meaning (stuff to use in make check)
|
|
## so if adding tests not to be run in make check, don't add them to
|
|
## TESTS
|
|
TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus
|
|
TESTS=dbus-glib-test
|
|
|
|
## FIXME we aren't running dbus-glib-tool --self-test
|
|
|
|
dbus_glib_test_SOURCES= \
|
|
dbus-gtest-main.c
|
|
|
|
dbus_glib_test_LDADD= $(top_builddir)/glib/libdbus-glib-1.la
|
|
|
|
else
|
|
### not building tests
|
|
TESTS=
|
|
|
|
endif
|
|
|