diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-02-13 18:19:10 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-02-13 18:19:10 +0100 |
commit | e954a89d89a88774a7a8ebb32f08f9b0f377d4fe (patch) | |
tree | 6be0dabceebc45905e302aaaad02d32eb7fcaa91 /src/Makefile.am | |
parent | f863756b430bed8cd43c31535eda5d973abbc1b1 (diff) |
properly read icon/application name/display from gtk/glib/gdk
Diffstat (limited to 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 811b1204..f385c0ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -308,6 +308,11 @@ TESTS_BINARIES += \ mainloop-test-glib endif +if HAVE_GTK20 +TESTS_BINARIES += \ + gtk-test +endif + if BUILD_TESTS_DEFAULT noinst_PROGRAMS = $(TESTS_BINARIES) else @@ -504,6 +509,11 @@ prioq_test_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecomm prioq_test_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) prioq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(LIBOIL_LIBS) +gtk_test_SOURCES = tests/gtk-test.c +gtk_test_LDADD = $(AM_LDADD) libpulse.la libpulse-mainloop-glib.la +gtk_test_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS) +gtk_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(GTK20_LIBS) + ################################### # Common library # ################################### @@ -571,6 +581,9 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS = $(AM_CFLAGS) libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) +# proplist-util.h uses these header files, but not the library itself! +libpulsecommon_@PA_MAJORMINORMICRO@_la_CFLAGS += $(GLIB20_CFLAGS) $(GTK20_CFLAGS) + ## Please note that libpulsecommon implicitly also depends on< ## libpulse! i.e. we have a cyclic dependancy here. Which is intended ## since libpulse only includes stable, official APIs, while |