summaryrefslogtreecommitdiffstats
path: root/sdpd/Makefile.am
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-01-20 05:26:15 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-01-20 05:26:15 +0000
commit8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch)
tree0d20c6f621673dbdb6095fb4854077152c1d9b40 /sdpd/Makefile.am
parent884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff)
Make it possible to support an embedded GLib
Diffstat (limited to 'sdpd/Makefile.am')
-rw-r--r--sdpd/Makefile.am14
1 files changed, 4 insertions, 10 deletions
diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am
index 0a425f74..12740584 100644
--- a/sdpd/Makefile.am
+++ b/sdpd/Makefile.am
@@ -1,12 +1,4 @@
-if GLIB
-glib_cflags = @GLIB_CFLAGS@
-glib_ldadd = @GLIB_LIBS@
-else
-glib_cflags =
-glib_ldadd =
-endif
-
noinst_LIBRARIES = libsdpserver.a
libsdpserver_a_SOURCES = sdpd.h server.c cstate.c request.c service.c servicedb.c
@@ -16,10 +8,12 @@ sbin_PROGRAMS = sdpd
sdpd_SOURCES = main.c
-sdpd_LDADD = $(glib_ldadd) @BLUEZ_LIBS@ libsdpserver.a $(top_builddir)/common/libhelper.a
+sdpd_LDADD = libsdpserver.a \
+ $(top_builddir)/common/libhelper.a \
+ @GLIB_LIBS@ @BLUEZ_LIBS@
endif
-AM_CFLAGS = @BLUEZ_CFLAGS@ $(glib_cflags)
+AM_CFLAGS = @BLUEZ_CFLAGS@ @GLIB_CFLAGS@
INCLUDES = -I$(top_srcdir)/common