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 /dbus/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 'dbus/Makefile.am')
| -rw-r--r-- | dbus/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index cabe2b0f..1c710ac5 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -247,6 +247,7 @@ noinst_LTLIBRARIES=libdbus-convenience.la 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@ @PIC_LDFLAGS@ +libdbus_convenience_la_LIBADD=$(DBUS_CLIENT_LIBS) libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@ ## note that TESTS has special meaning (stuff to use in make check) |