X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2FMakefile.am;h=d3d1b95f273015939129dba1d36037d572e04603;hb=617eaa9ef9201ba6cdabfb4a6ec927744df9de22;hp=879a34c7fab799ab00a96abe0c8980d09b4cd910;hpb=6fe36d8791a66ce9415b845c5152ca2b5ec87195;p=platform%2Fupstream%2Fdbus.git

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 879a34c..d3d1b95 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,25 +1,116 @@
 
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
+configdir=$(sysconfdir)/dbus-1
 
-if HAVE_GLIB
-DBUS_GLIB_BUILT_INCLUDES=			\
-	dbus-glib-error-enum.h
+AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	-I$(top_srcdir) \
+	-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"\" \
+	$(NULL)
 
-GLIB_INCLUDES=					\
-	dbus-glib.h				\
-	dbus-glib-lowlevel.h			\
-	$(DBUS_GLIB_BUILT_INCLUDES)
-
-dbus-glib-error-enum.h: dbus-protocol.h make-dbus-glib-error-enum.sh
-	$(srcdir)/make-dbus-glib-error-enum.sh $(srcdir)/dbus-protocol.h $@
-
-endif
+# if assertions are enabled, improve backtraces
+AM_LDFLAGS = @R_DYNAMIC_LDFLAG@
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
 
 lib_LTLIBRARIES=libdbus-1.la
 
+#
+# Deal with W32 .def and version-info.rc stuff
+#
+if DBUS_WIN
+
+SUFFIXES = rc
+
+.rc.o:
+	$(WINDRES) $< -o $@
+
+dbus_res = versioninfo.o
+dbus_res_ldflag = -Wl,$(dbus_res)
+no_undefined = -no-undefined
+export_symbols =
+
+libdbus_1_la_DEPENDENCIES = $(dbus_res)
+intllibs =
+
+else
+dbus_res =
+dbus_res_ldflag =
+no_undefined =
+## don't export symbols that start with "_" (we use this
+## convention for internal symbols)
+export_symbols = -export-symbols-regex "^[^_].*"
+
+intllibs = @LTLIBINTL@
+
+endif
+
+
+#
+# Platform-dependent sources:
+#
+if DBUS_WIN
+DBUS_LIB_arch_sources = 			\
+	dbus-server-win.c 			\
+	dbus-server-win.h
+
+if DBUS_WINCE
+wince_source = dbus-sysdeps-wince-glue.h dbus-sysdeps-wince-glue.c
+else
+wince_source =
+endif
+
+DBUS_SHARED_arch_sources = 			\
+	$(wince_source)				\
+	dbus-file-win.c 			\
+	dbus-pipe-win.c 			\
+	dbus-sockets-win.h			\
+	dbus-sysdeps-win.c 			\
+	dbus-sysdeps-win.h			\
+	dbus-sysdeps-thread-win.c		\
+	dbus-transport-win.c			\
+	dbus-transport-win.h
+
+DBUS_UTIL_arch_sources =			\
+	dbus-sysdeps-util-win.c			\
+	dbus-spawn-win.c
+else
+
+if DBUS_ENABLE_LAUNCHD
+launchd_source = dbus-server-launchd.h dbus-server-launchd.c
+else
+launchd_source =
+endif
+
+DBUS_LIB_arch_sources = 			\
+	dbus-uuidgen.c				\
+	dbus-uuidgen.h				\
+	dbus-server-unix.c 			\
+	dbus-server-unix.h
+
+DBUS_SHARED_arch_sources = 			\
+	$(launchd_source)			\
+	dbus-file-unix.c 			\
+	dbus-pipe-unix.c 			\
+	dbus-sysdeps-unix.c 			\
+	dbus-sysdeps-unix.h			\
+	dbus-sysdeps-pthread.c			\
+	dbus-transport-unix.c			\
+	dbus-transport-unix.h			\
+	dbus-userdb.c				\
+	dbus-userdb.h 				\
+	sd-daemon.c                             \
+	sd-daemon.h
+
+DBUS_UTIL_arch_sources = 			\
+	dbus-sysdeps-util-unix.c		\
+	dbus-userdb-util.c			\
+	dbus-spawn.c
+endif
+
 dbusinclude_HEADERS=				\
 	dbus.h					\
 	dbus-address.h				\
@@ -29,15 +120,17 @@ dbusinclude_HEADERS=				\
 	dbus-macros.h				\
 	dbus-memory.h				\
 	dbus-message.h				\
+	dbus-misc.h				\
 	dbus-pending-call.h			\
 	dbus-protocol.h				\
 	dbus-server.h				\
 	dbus-shared.h				\
+	dbus-signature.h			\
 	dbus-threads.h				\
-	dbus-types.h				\
-	$(GLIB_INCLUDES)
+	dbus-types.h
+
 
-dbusarchinclude_HEADERS=			\
+nodist_dbusarchinclude_HEADERS=			\
 	dbus-arch-deps.h
 
 ### source code that goes in the installed client library
@@ -46,11 +139,11 @@ 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		\
+	dbus-credentials.c			\
+	dbus-credentials.h			\
 	dbus-errors.c				\
 	dbus-keyring.c				\
 	dbus-keyring.h				\
@@ -65,21 +158,25 @@ DBUS_LIB_SOURCES=				\
 	dbus-message.c				\
 	dbus-message-internal.h			\
 	dbus-message-private.h			\
+	dbus-misc.c				\
+	dbus-nonce.h				\
+	dbus-nonce.c				\
 	dbus-object-tree.c			\
 	dbus-object-tree.h			\
 	dbus-pending-call.c			\
+	dbus-pending-call-internal.h		\
 	dbus-resources.c			\
 	dbus-resources.h			\
 	dbus-server.c				\
 	dbus-server-debug-pipe.c		\
 	dbus-server-debug-pipe.h		\
 	dbus-server-protected.h			\
-	dbus-server-unix.c			\
-	dbus-server-unix.h			\
+	dbus-server-socket.c			\
+	dbus-server-socket.h			\
+	$(DBUS_LIB_arch_sources)		\
 	dbus-sha.c				\
 	dbus-sha.h				\
 	dbus-signature.c			\
-	dbus-signature.h			\
 	dbus-timeout.c				\
 	dbus-timeout.h				\
 	dbus-threads-internal.h			\
@@ -87,21 +184,20 @@ DBUS_LIB_SOURCES=				\
 	dbus-transport.c			\
 	dbus-transport.h			\
 	dbus-transport-protected.h		\
-	dbus-transport-unix.c			\
-	dbus-transport-unix.h			\
+	dbus-transport-socket.c			\
+	dbus-transport-socket.h			\
 	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 
+### AND is generic utility functionality used by the
+### daemon or test programs (all symbols in here should
 ### be underscore-prefixed)
 DBUS_SHARED_SOURCES=				\
 	dbus-dataslot.c				\
 	dbus-dataslot.h				\
+	dbus-file.c                 \
+	dbus-file.h                 \
 	dbus-hash.c				\
 	dbus-hash.h				\
 	dbus-internals.c			\
@@ -113,21 +209,25 @@ DBUS_SHARED_SOURCES=				\
 	dbus-memory.c				\
 	dbus-mempool.c				\
 	dbus-mempool.h				\
+	dbus-pipe.c                 \
+	dbus-pipe.h                 \
 	dbus-string.c				\
 	dbus-string.h				\
 	dbus-string-private.h			\
+	$(DBUS_SHARED_arch_sources)		\
 	dbus-sysdeps.c				\
-	dbus-sysdeps.h				\
-	dbus-userdb.c				\
-	dbus-userdb.h
+	dbus-sysdeps.h
 
 ### source code that is generic utility functionality used
 ### by the bus daemon or test apps, but is NOT included
-### in the D-BUS client library (all symbols in here 
-### should be underscore-prefixed but don't really need 
+### in the D-Bus client library (all symbols in here
+### should be underscore-prefixed but don't really need
 ### to be unless they move to DBUS_SHARED_SOURCES later)
 DBUS_UTIL_SOURCES=				\
+	dbus-auth-script.c			\
+	dbus-auth-script.h			\
 	dbus-auth-util.c			\
+	dbus-credentials-util.c			\
 	dbus-mainloop.c				\
 	dbus-mainloop.h				\
 	dbus-marshal-byteswap-util.c		\
@@ -136,56 +236,65 @@ DBUS_UTIL_SOURCES=				\
 	dbus-message-factory.c			\
 	dbus-message-factory.h			\
 	dbus-message-util.c			\
-	dbus-spawn.c				\
+	dbus-shell.c				\
+	dbus-shell.h				\
+	$(DBUS_UTIL_arch_sources)		\
 	dbus-spawn.h				\
 	dbus-string-util.c			\
 	dbus-sysdeps-util.c			\
 	dbus-test.c				\
-	dbus-test.h				\
-	dbus-userdb-util.c
+	dbus-test.h
 
 libdbus_1_la_SOURCES=				\
 	$(DBUS_LIB_SOURCES)			\
 	$(DBUS_SHARED_SOURCES)
 
-libdbus_convenience_la_SOURCES=			\
+libdbus_internal_la_SOURCES=			\
 	$(DBUS_LIB_SOURCES)			\
 	$(DBUS_SHARED_SOURCES)			\
 	$(DBUS_UTIL_SOURCES)
 
-
-BUILT_SOURCES=$(dbusarchinclude_HEADERS) $(DBUS_GLIB_BUILT_INCLUDES)
-EXTRA_DIST=dbus-arch-deps.h.in make-dbus-glib-error-enum.sh
-CLEANFILES=$(DBUS_GLIB_BUILT_INCLUDES)
+BUILT_SOURCES=$(nodist_dbusarchinclude_HEADERS)
+EXTRA_DIST=dbus-arch-deps.h.in
 
 ## this library is the same as libdbus, but exports all the symbols
 ## and is only used for static linking within the dbus package.
-noinst_LTLIBRARIES=libdbus-convenience.la
+noinst_LTLIBRARIES=libdbus-internal.la
 
-libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
-## don't export symbols that start with "_" (we use this 
-## convention for internal symbols)
-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+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)
+
+noinst_PROGRAMS =
 
-## 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=
+# We can't actually run this til we've reached test/
+noinst_PROGRAMS += dbus-test
 endif
 
-## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
-## even when not doing "make check"
-noinst_PROGRAMS=$(TESTS)
-
 dbus_test_SOURCES=				\
 	dbus-test-main.c
 
-dbus_test_LDADD=libdbus-convenience.la
+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