From 7ac6ede99ac309c7e28f3c2993fbc9bbbe28a68b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 23 May 2004 10:39:50 +0000 Subject: Use LIBS instead of LDFLAGS --- cups/Makefile.am | 2 +- dund/Makefile.am | 2 +- hcid/Makefile.am | 6 +++--- hidd/Makefile.am | 2 +- pand/Makefile.am | 2 +- rfcomm/Makefile.am | 2 +- sdpd/Makefile.am | 2 +- test/Makefile.am | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cups/Makefile.am b/cups/Makefile.am index 2e4ba707..837bbfa2 100644 --- a/cups/Makefile.am +++ b/cups/Makefile.am @@ -6,7 +6,7 @@ noinst_PROGRAMS = bluetooth bluetooth_SOURCES = main.c sdp.c spp.c hcrp.c -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ diff --git a/dund/Makefile.am b/dund/Makefile.am index 9c967ce0..1c8f4069 100644 --- a/dund/Makefile.am +++ b/dund/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = dund dund_SOURCES = main.c dun.c dund.h sdp.c lib.h msdun.c -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ diff --git a/hcid/Makefile.am b/hcid/Makefile.am index 3cbdfaa2..fe04202b 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -6,18 +6,18 @@ sbin_PROGRAMS = hcid if DBUS dbus_hcid_sources = dbus.c -dbus_hcid_ldflags = @DBUS_LIBS@ +dbus_hcid_libs = @DBUS_LIBS@ dbus_hcid_cflags = -DENABLE_DBUS -DDBUS_API_SUBJECT_TO_CHANGE else dbus_hcid_sources = -dbus_hcid_ldflags = +dbus_hcid_libs = dbus_hcid_cflags = endif hcid_SOURCES = main.c security.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) hcid_CONFIG = hcid.conf -LDFLAGS = $(dbus_hcid_ldflags) @BLUEZ_LIBS@ +LIBS = $(dbus_hcid_libs) @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ @DBUS_INCLUDES@ $(dbus_hcid_cflags) diff --git a/hidd/Makefile.am b/hidd/Makefile.am index e74f154d..6b5ff2dc 100644 --- a/hidd/Makefile.am +++ b/hidd/Makefile.am @@ -6,6 +6,6 @@ bin_PROGRAMS = hidd hidd_SOURCES = main.c hidd.h sdp.c -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ diff --git a/pand/Makefile.am b/pand/Makefile.am index 20b99270..0520dc3d 100644 --- a/pand/Makefile.am +++ b/pand/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = pand pand_SOURCES = main.c pand.h bnep.c sdp.c -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ diff --git a/rfcomm/Makefile.am b/rfcomm/Makefile.am index 980b0900..b1386b02 100644 --- a/rfcomm/Makefile.am +++ b/rfcomm/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = rfcomm rfcomm_SOURCES = main.c parser.h parser.y lexer.l kword.h kword.c rfcomm_CONFIG = rfcomm.conf -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am index 97f9b9e1..6fb5411f 100644 --- a/sdpd/Makefile.am +++ b/sdpd/Makefile.am @@ -6,7 +6,7 @@ sbin_PROGRAMS = sdpd sdpd_SOURCES = main.c request.c service.c cstate.c servicedb.c sdpd.h -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ diff --git a/test/Makefile.am b/test/Makefile.am index 79386603..8c105565 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,7 @@ noinst_PROGRAMS = l2test scotest rctest attest hstest -LDFLAGS = @BLUEZ_LIBS@ +LIBS = @BLUEZ_LIBS@ INCLUDES = @BLUEZ_INCLUDES@ -- cgit