From 68eb5dd2486611d08d1d14e02ff1624ec27997c7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 6 Aug 2004 23:07:48 +0000
Subject: add mainloop test utility fix glib mainloop support

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@106 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 polyp/Makefile.am | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'polyp/Makefile.am')

diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index c0be8ce0..1be04f41 100644
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -21,18 +21,21 @@ AM_CFLAGS=-ansi -D_GNU_SOURCE -DDLSEARCHDIR=\"$(pkglibdir)\" -I$(srcdir)/..
 AM_LDADD=-L.
 AM_LIBADD=-L.
 
+polypincludedir=$(includedir)/polyp
+
 EXTRA_DIST = polypaudio.pa depmod.py
 bin_PROGRAMS = polypaudio pacat pactl
-noinst_PROGRAMS = pacat-simple parec-simple
+noinst_PROGRAMS = pacat-simple parec-simple glib-test
 
-pkginclude_HEADERS=polyplib.h \
+polypinclude_HEADERS=polyplib.h \
 		polyplib-def.h \
 		polyplib-simple.h \
 		polyplib-error.h \
 		mainloop-api.h \
 		mainloop.h \
 		mainloop-signal.h \
-		sample.h
+		sample.h \
+		glib-mainloop.h
 
 pkglib_LTLIBRARIES=libiochannel.la \
 		libsocket-server.la \
@@ -312,9 +315,13 @@ libpolyp_mainloop_glib_la_SOURCES = glib-mainloop.h glib-mainloop.c
 libpolyp_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
 libpolyp_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpolyp-mainloop.la $(GLIB20_LIBS)
 
+glib_test_SOURCES = glib-test.c
+glib_test_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
+glib_test_LDADD = $(AM_LDADD) $(GLIB20_LIBS) libpolyp.la libpolyp-mainloop-glib.la
+
 if BUILD_LIBPOLYPCORE
 
-pkginclude_HEADERS+=cli-command.h\
+polypinclude_HEADERS+=cli-command.h\
 		client.h \
 		core.h \
 		dynarray.h \
@@ -380,3 +387,4 @@ libpolypcore_la_SOURCES = idxset.c idxset.h \
 		dynarray.c dynarray.h
 
 endif
+
-- 
cgit