diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-07 14:37:30 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-07 14:37:30 +0100 |
| commit | a09de5c004b8943456ea686e5e9d38fabade5834 (patch) | |
| tree | 37376451da6d89695ef98e306cf5da3d2ca3d82e /bus | |
| parent | cb90bd5eb334fdcd705c0ecde96ee34b54c59768 (diff) | |
| parent | f0d4e0fc974e642f54aaf58907db8d5284d9013d (diff) | |
| download | dbus-a09de5c004b8943456ea686e5e9d38fabade5834.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index dfb3bc34..bb895e2a 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -89,7 +89,7 @@ dbus_daemon_LDADD= \ $(EFENCE) \ $(DBUS_BUS_LIBS) -dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ LAUNCH_HELPER_SOURCES= \ $(XML_SOURCES) \ @@ -115,7 +115,7 @@ dbus_daemon_launch_helper_LDADD= \ $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) -dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## we build another binary so we can do the launch testing without root privs. ## DO NOT INSTALL THIS FILE @@ -127,7 +127,7 @@ dbus_daemon_launch_helper_test_LDADD= \ $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) -dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ dbus_daemon_launch_helper_test_CPPFLAGS= -DDBUS_STATIC_BUILD \ -DACTIVATION_LAUNCHER_TEST @@ -141,7 +141,7 @@ bus_test_launch_helper_LDADD= \ $(top_builddir)/dbus/libdbus-internal.la \ $(DBUS_LAUNCHER_LIBS) -bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ +bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \ -DACTIVATION_LAUNCHER_TEST \ -DACTIVATION_LAUNCHER_DO_OOM @@ -150,7 +150,9 @@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \ ## even when not doing "make check" noinst_PROGRAMS = $(TESTS) dbus_daemon_exec_PROGRAMS = dbus-daemon +if DBUS_UNIX libexec_PROGRAMS = dbus-daemon-launch-helper +endif DBUS_UNIX ## 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 |