diff options
| author | Colin Walters <walters@verbum.org> | 2010-01-28 17:09:15 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-01-28 17:09:15 -0500 |
| commit | 7a4cd46284dd634c165b5c4eb23606b7c0ff4ade (patch) | |
| tree | bf0390d7c05896f538e8c6739108bb3d681f8ef7 /bus/Makefile.am | |
| parent | 1e82db47431fb19b78f8943c17d63227156e2432 (diff) | |
| parent | b93476ce07acce83ff3b396616bb8a0eaf719916 (diff) | |
| download | dbus-7a4cd46284dd634c165b5c4eb23606b7c0ff4ade.tar.gz | |
Merge branch 'my-dbus-1.2'
Conflicts:
bus/Makefile.am
dbus/dbus-sysdeps-util-unix.c
dbus/dbus-transport.c
test/test-service.c
Diffstat (limited to 'bus/Makefile.am')
| -rw-r--r-- | bus/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bus/Makefile.am b/bus/Makefile.am index b1ee36c8..72233f10 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -103,8 +103,8 @@ dbus_daemon_launch_helper_SOURCES= \ $(LAUNCH_HELPER_SOURCES) dbus_daemon_launch_helper_LDADD= \ - $(DBUS_LAUNCHER_LIBS) \ - $(top_builddir)/dbus/libdbus-convenience.la + $(top_builddir)/dbus/libdbus-convenience.la \ + $(DBUS_LAUNCHER_LIBS) dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @@ -115,8 +115,8 @@ dbus_daemon_launch_helper_test_SOURCES= \ $(LAUNCH_HELPER_SOURCES) dbus_daemon_launch_helper_test_LDADD= \ - $(DBUS_LAUNCHER_LIBS) \ - $(top_builddir)/dbus/libdbus-convenience.la + $(top_builddir)/dbus/libdbus-convenience.la \ + $(DBUS_LAUNCHER_LIBS) dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ dbus_daemon_launch_helper_test_CPPFLAGS= \ @@ -129,8 +129,8 @@ bus_test_launch_helper_SOURCES= \ $(LAUNCH_HELPER_SOURCES) bus_test_launch_helper_LDADD= \ - $(DBUS_LAUNCHER_LIBS) \ - $(top_builddir)/dbus/libdbus-convenience.la + $(top_builddir)/dbus/libdbus-convenience.la \ + $(DBUS_LAUNCHER_LIBS) bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ bus_test_launch_helper_CPPFLAGS= \ |