diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-08-07 10:52:43 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-08-07 10:52:43 +0000 |
| commit | e9bed206d22c6985bce66d09867dc1256b9fc2e6 (patch) | |
| tree | 0d646a29a67dcd9bff9e77160937dde5529e050e | |
| parent | 209c9dd88294be7aa9e7b552e69f98a5b0263aa8 (diff) | |
better mainloop test build system
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@109 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | polyp/Makefile.am | 13 | ||||
| -rw-r--r-- | polyp/mainloop-test.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 1be04f41..b1c911a4 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -25,7 +25,7 @@ polypincludedir=$(includedir)/polyp EXTRA_DIST = polypaudio.pa depmod.py bin_PROGRAMS = polypaudio pacat pactl -noinst_PROGRAMS = pacat-simple parec-simple glib-test +noinst_PROGRAMS = pacat-simple parec-simple mainloop-test mainloop-test-glib polypinclude_HEADERS=polyplib.h \ polyplib-def.h \ @@ -287,6 +287,7 @@ libpolyp_mainloop_la_SOURCES = mainloop-api.h mainloop-api.c \ mainloop.c mainloop.h \ mainloop-signal.c mainloop-signal.h libpolyp_mainloop_la_CFLAGS = $(AM_CFLAGS) +libpolyp_mainloop_la_LIBADD = $(AM_LIBADD) libpolyp.la libpolyp_error_la_SOURCES = polyplib-error.c polyplib-error.h libpolyp_error_la_CFLAGS = $(AM_CFLAGS) @@ -315,9 +316,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 +mainloop_test_SOURCES = mainloop-test.c +mainloop_test_CFLAGS = $(AM_CFLAGS) +mainloop_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la + +mainloop_test_glib_SOURCES = $(mainloop_test_SOURCES) +mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP +mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpolyp-mainloop-glib.la if BUILD_LIBPOLYPCORE diff --git a/polyp/mainloop-test.c b/polyp/mainloop-test.c index a03387e7..31caaa03 100644 --- a/polyp/mainloop-test.c +++ b/polyp/mainloop-test.c @@ -3,8 +3,6 @@ #include <sys/time.h> #include <assert.h> -#define GLIB_MAIN_LOOP - #ifdef GLIB_MAIN_LOOP #include <glib.h> #include "glib-mainloop.h" |