diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2005-04-21 21:34:08 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2005-04-21 21:34:08 +0000 |
| commit | adbb22a47c9356e0c191a75daec0439e8d941bd1 (patch) | |
| tree | 6c186bc090dd637de53c393d8173426f02530a09 | |
| parent | f5a214f76f2d93702b5bc3b0b168389d8f8b34f2 (diff) | |
Use LDADD instead of LIBS
| -rw-r--r-- | cups/Makefile.am | 3 | ||||
| -rw-r--r-- | dund/Makefile.am | 3 | ||||
| -rw-r--r-- | extra/Makefile.am | 2 | ||||
| -rw-r--r-- | hcid/Makefile.am | 3 | ||||
| -rw-r--r-- | hidd/Makefile.am | 3 | ||||
| -rw-r--r-- | pand/Makefile.am | 3 | ||||
| -rw-r--r-- | rfcomm/Makefile.am | 3 | ||||
| -rw-r--r-- | sdpd/Makefile.am | 3 | ||||
| -rw-r--r-- | test/Makefile.am | 12 |
9 files changed, 19 insertions, 16 deletions
diff --git a/cups/Makefile.am b/cups/Makefile.am index c43cac54..ea4aa876 100644 --- a/cups/Makefile.am +++ b/cups/Makefile.am @@ -8,8 +8,7 @@ cupsdir = $(libdir)/cups/backend cups_PROGRAMS = bluetooth bluetooth_SOURCES = main.c sdp.c spp.c hcrp.c - -LDADD = @BLUEZ_LIBS@ +bluetooth_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ endif diff --git a/dund/Makefile.am b/dund/Makefile.am index 3ff2b36c..236decc6 100644 --- a/dund/Makefile.am +++ b/dund/Makefile.am @@ -5,8 +5,7 @@ bin_PROGRAMS = dund dund_SOURCES = main.c dun.c dund.h sdp.c lib.h msdun.c - -LIBS = @BLUEZ_LIBS@ +dund_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/extra/Makefile.am b/extra/Makefile.am index 8bbaa2c8..7ce141c0 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -11,7 +11,7 @@ usb_DATA = $(datafiles) usb_PROGRAMS = bcm203x -LDADD = @USB_LIBS@ +bcm203x_LDADD = @USB_LIBS@ AM_CFLAGS = @USB_CFLAGS@ endif diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 32b02005..02dd7b56 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -19,8 +19,7 @@ dbus_hcid_cflags = endif hcid_SOURCES = main.c security.c storage.c hcid.h lib.c lib.h parser.h parser.y lexer.l kword.h kword.c glib-ectomy.h glib-ectomy.c $(dbus_hcid_sources) - -LIBS = $(dbus_hcid_libs) @BLUEZ_LIBS@ +hcid_LDADD = $(dbus_hcid_libs) @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ $(dbus_hcid_cflags) diff --git a/hidd/Makefile.am b/hidd/Makefile.am index 5519143a..0860d265 100644 --- a/hidd/Makefile.am +++ b/hidd/Makefile.am @@ -5,8 +5,7 @@ bin_PROGRAMS = hidd hidd_SOURCES = main.c hidd.h sdp.c - -LIBS = @BLUEZ_LIBS@ +hidd_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/pand/Makefile.am b/pand/Makefile.am index 3ed77891..9e7c3648 100644 --- a/pand/Makefile.am +++ b/pand/Makefile.am @@ -5,8 +5,7 @@ bin_PROGRAMS = pand pand_SOURCES = main.c pand.h bnep.c sdp.c - -LIBS = @BLUEZ_LIBS@ +pand_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/rfcomm/Makefile.am b/rfcomm/Makefile.am index bedb07f6..65a5af53 100644 --- a/rfcomm/Makefile.am +++ b/rfcomm/Makefile.am @@ -9,8 +9,7 @@ conf_DATA = rfcomm.conf bin_PROGRAMS = rfcomm rfcomm_SOURCES = main.c parser.h parser.y lexer.l kword.h kword.c - -LIBS = @BLUEZ_LIBS@ +rfcomm_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am index 44d4ba8d..f2d55754 100644 --- a/sdpd/Makefile.am +++ b/sdpd/Makefile.am @@ -5,8 +5,7 @@ sbin_PROGRAMS = sdpd sdpd_SOURCES = main.c request.c service.c cstate.c servicedb.c sdpd.h - -LIBS = @BLUEZ_LIBS@ +sdpd_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ diff --git a/test/Makefile.am b/test/Makefile.am index 7bfb74c3..bf41fb03 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -7,7 +7,17 @@ bin_PROGRAMS = l2test rctest noinst_PROGRAMS = scotest attest hstest bdaddr -LDADD = @BLUEZ_LIBS@ +l2test_LDADD = @BLUEZ_LIBS@ + +rctest_LDADD = @BLUEZ_LIBS@ + +scotest_LDADD = @BLUEZ_LIBS@ + +attest_LDADD = @BLUEZ_LIBS@ + +hstest_LDADD = @BLUEZ_LIBS@ + +bdaddr_LDADD = @BLUEZ_LIBS@ AM_CFLAGS = @BLUEZ_CFLAGS@ endif |