X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2FMakefile.am;h=0f9033d1ed92c452d23347a79c3cd909ee01057c;hb=cc28d8d91055e7640932c67031ca0ec86dddac06;hp=2e6ca1dea9de9360cde99347e7494a14466c4936;hpb=53db0b73c4d103ab0081993474c0fac7cc05ffc0;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 2e6ca1d..0f9033d 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -1,12 +1,23 @@ configdir=$(sysconfdir)/dbus-1 -INCLUDES = -I$(top_builddir) -I$(top_srcdir) \ - $(DBUS_CLIENT_CFLAGS) \ +AM_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + $(SYSTEMD_CFLAGS) \ + $(VALGRIND_CFLAGS) \ -DDBUS_COMPILATION \ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ - -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" + -DDBUS_SESSION_CONFIG_FILE=\""$(configdir)/session.conf"\" \ + $(NULL) + +# On Linux with glibc 2.17, sd-daemon.c support for POSIX message queues +# results in an otherwise unnecessary dependency on librt. Disable it. +AM_CPPFLAGS += -DSD_DAEMON_DISABLE_MQ + +# if assertions are enabled, improve backtraces +AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ dbusincludedir=$(includedir)/dbus-1.0/dbus dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus @@ -27,9 +38,8 @@ dbus_res = versioninfo.o dbus_res_ldflag = -Wl,$(dbus_res) no_undefined = -no-undefined export_symbols = -export_symvols_internal = -libdbus_1_la_DEPENDENCIES = $(dbus_res) +EXTRA_libdbus_1_la_DEPENDENCIES = $(dbus_res) intllibs = else @@ -39,7 +49,6 @@ no_undefined = ## don't export symbols that start with "_" (we use this ## convention for internal symbols) export_symbols = -export-symbols-regex "^[^_].*" -export_symbols_internal = intllibs = @LTLIBINTL@ @@ -108,6 +117,10 @@ DBUS_UTIL_arch_sources = \ dbus-spawn.c endif +if HAVE_LINUX_EPOLL +DBUS_UTIL_arch_sources += dbus-socket-set-epoll.c +endif + dbusinclude_HEADERS= \ dbus.h \ dbus-address.h \ @@ -123,6 +136,7 @@ dbusinclude_HEADERS= \ dbus-server.h \ dbus-shared.h \ dbus-signature.h \ + dbus-syntax.h \ dbus-threads.h \ dbus-types.h @@ -136,8 +150,6 @@ DBUS_LIB_SOURCES= \ dbus-address.c \ dbus-auth.c \ dbus-auth.h \ - dbus-auth-script.c \ - dbus-auth-script.h \ dbus-bus.c \ dbus-connection.c \ dbus-connection-internal.h \ @@ -176,6 +188,7 @@ DBUS_LIB_SOURCES= \ dbus-sha.c \ dbus-sha.h \ dbus-signature.c \ + dbus-syntax.c \ dbus-timeout.c \ dbus-timeout.h \ dbus-threads-internal.h \ @@ -188,9 +201,6 @@ DBUS_LIB_SOURCES= \ dbus-watch.c \ dbus-watch.h -## dbus-md5.c \ -## dbus-md5.h \ - ### source code that goes in the installed client library ### AND is generic utility functionality used by the ### daemon or test programs (all symbols in here should @@ -218,7 +228,8 @@ DBUS_SHARED_SOURCES= \ dbus-string-private.h \ $(DBUS_SHARED_arch_sources) \ dbus-sysdeps.c \ - dbus-sysdeps.h + dbus-sysdeps.h \ + dbus-valgrind-internal.h ### source code that is generic utility functionality used ### by the bus daemon or test apps, but is NOT included @@ -226,6 +237,10 @@ DBUS_SHARED_SOURCES= \ ### should be underscore-prefixed but don't really need ### to be unless they move to DBUS_SHARED_SOURCES later) DBUS_UTIL_SOURCES= \ + dbus-asv-util.c \ + dbus-asv-util.h \ + dbus-auth-script.c \ + dbus-auth-script.h \ dbus-auth-util.c \ dbus-credentials-util.c \ dbus-mainloop.c \ @@ -239,6 +254,9 @@ DBUS_UTIL_SOURCES= \ dbus-shell.c \ dbus-shell.h \ $(DBUS_UTIL_arch_sources) \ + dbus-socket-set.h \ + dbus-socket-set.c \ + dbus-socket-set-poll.c \ dbus-spawn.h \ dbus-string-util.c \ dbus-sysdeps-util.c \ @@ -261,38 +279,51 @@ EXTRA_DIST=dbus-arch-deps.h.in ## and is only used for static linking within the dbus package. noinst_LTLIBRARIES=libdbus-internal.la -libdbus_1_la_CPPFLAGS= -Ddbus_1_EXPORTS -libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS) -libdbus_1_la_LDFLAGS= $(export_symbols) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ +libdbus_1_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -Ddbus_1_EXPORTS \ + $(NULL) +libdbus_1_la_LIBADD= $(LIBDBUS_LIBS) +libdbus_1_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(export_symbols) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ + -no-undefined \ + $(NULL) + +libdbus_internal_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDBUS_STATIC_BUILD \ + $(NULL) +libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS) $(SYSTEMD_LIBS) -libdbus_internal_la_CPPFLAGS = -DDBUS_STATIC_BUILD -libdbus_internal_la_LIBADD=$(DBUS_CLIENT_LIBS) -libdbus_internal_la_LDFLAGS=$(export_symbols_internal) @R_DYNAMIC_LDFLAG@ - -## 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 -if DBUS_BUILD_TESTS -TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus -TESTS=dbus-test -else -TESTS= +if DBUS_WIN +# This must be a separate convenience library, otherwise libtool notices +# that libdbus-1 might contain C++, links it with g++ and links in libstdc++, +# even on Unix where in fact it doesn't contain any C++. For Windows, where +# this code is used, we don't actually need libstdc++. +noinst_LTLIBRARIES += libdbus-init-win.la +libdbus_init_win_la_SOURCES = dbus-init-win.cpp +libdbus_1_la_LIBADD += libdbus-init-win.la +libdbus_internal_la_LIBADD += libdbus-init-win.la endif -## we use noinst_PROGRAMS not check_PROGRAMS so that we build -## even when not doing "make check" -noinst_PROGRAMS=$(TESTS) +noinst_PROGRAMS = + +if DBUS_ENABLE_EMBEDDED_TESTS +# We can't actually run this til we've reached test/ +noinst_PROGRAMS += dbus-test +endif dbus_test_SOURCES= \ dbus-test-main.c -dbus_test_LDADD=libdbus-internal.la $(DBUS_TEST_LIBS) -dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ +dbus_test_LDADD = libdbus-internal.la ## mop up the gcov files clean-local: /bin/rm *.bb *.bbg *.da *.gcov .libs/*.da .libs/*.bbg || true update-systemd: - curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c > sd-daemon.c - curl http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h > sd-daemon.h + curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > $(srcdir)/sd-daemon.c + curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > $(srcdir)/sd-daemon.h