diff options
| author | Allan LeSage <allanlesage@gmail.com> | 2012-03-20 15:30:16 -0500 |
|---|---|---|
| committer | Allan LeSage <allanlesage@gmail.com> | 2012-03-20 15:30:16 -0500 |
| commit | f7d971a8407224ddd8b1b8744d18a33032c9142d (patch) | |
| tree | 3e1ddc33da39b4b5aeed4b50cf117bf3effeac12 | |
| parent | 6251928d97a1e10fb7e0e4c2df6372e8cead133e (diff) | |
| download | ayatana-indicator-messages-f7d971a8407224ddd8b1b8744d18a33032c9142d.tar.gz ayatana-indicator-messages-f7d971a8407224ddd8b1b8744d18a33032c9142d.tar.bz2 ayatana-indicator-messages-f7d971a8407224ddd8b1b8744d18a33032c9142d.zip | |
Makefile fixes for code under test lib.
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | test/Makefile.am | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 0b5a4a3..bef67bd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,8 +7,15 @@ SUBDIRS = \ if BUILD_TESTS SUBDIRS += \ test + +# build src first +test: src + endif + + + DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall --enable-deprecations dist-hook: diff --git a/configure.ac b/configure.ac index 8646a0f..5ec945a 100644 --- a/configure.ac +++ b/configure.ac @@ -59,8 +59,7 @@ AS_IF([test "x$with_gtk" = x3], indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION indicate-0.7 >= $INDICATE_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION - glib-2.0 >= GLIB_REQUIRED_VERSION) - + glib-2.0 >= $GLIB_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION diff --git a/test/Makefile.am b/test/Makefile.am index 522568a..8986a40 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -80,8 +80,7 @@ libindicator_messages_service_la_CFLAGS = \ libindicator_messages_service_la_LIBADD = \ $(APPLET_LIBS) \ - libindicator-messages-status-provider.la + $(top_builddir)/src/.libs/libindicator-messages-status-provider.la libindicator_messages_service_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) - |