diff options
| author | Ted Gould <ted@canonical.com> | 2009-01-16 12:47:51 -0600 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-01-16 12:47:51 -0600 |
| commit | 8f801277df211416ca9636b3d28ead43f9f50a35 (patch) | |
| tree | 9ba348e8bdd89ecaec99fe600641673e44eff206 | |
| parent | 487239d3df7362f7f5ec5d4934a8672787f557e7 (diff) | |
| download | libayatana-indicator-8f801277df211416ca9636b3d28ead43f9f50a35.tar.gz libayatana-indicator-8f801277df211416ca9636b3d28ead43f9f50a35.tar.bz2 libayatana-indicator-8f801277df211416ca9636b3d28ead43f9f50a35.zip | |
Moving the tests so that they can guarantee to build after the library
builds as otherwise they end up getting built first.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libindicate/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am (renamed from libindicate/tests/Makefile.am) | 12 | ||||
| -rw-r--r-- | tests/indicate-alot.c (renamed from libindicate/tests/indicate-alot.c) | 0 | ||||
| -rw-r--r-- | tests/indicate-and-crash.c (renamed from libindicate/tests/indicate-and-crash.c) | 0 | ||||
| -rw-r--r-- | tests/listen-and-print.c (renamed from libindicate/tests/listen-and-print.c) | 0 | ||||
| -rwxr-xr-x | tests/test.js (renamed from libindicate/tests/test.js) | 0 |
8 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 083ceff..555e6d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,5 +2,6 @@ SUBDIRS = \ src \ libindicate \ + tests \ data \ po diff --git a/configure.ac b/configure.ac index cff6775..7fe6675 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,7 @@ Makefile src/Makefile libindicate/Makefile libindicate/indicate.pc -libindicate/tests/Makefile +tests/Makefile data/Makefile data/icons/Makefile data/icons/16x16/Makefile diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am index 53917b7..d2a0811 100644 --- a/libindicate/Makefile.am +++ b/libindicate/Makefile.am @@ -1,6 +1,4 @@ -SUBDIRS = tests - INCLUDES= \ -DG_LOG_DOMAIN=\"libindicate\" diff --git a/libindicate/tests/Makefile.am b/tests/Makefile.am index 208da5b..03ec716 100644 --- a/libindicate/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,31 +8,31 @@ indicate_and_crash_SOURCES = \ indicate-and-crash.c indicate_and_crash_CFLAGS = \ - -I $(srcdir)/../.. \ + -I $(srcdir)/.. \ $(LIBINDICATE_CFLAGS) indicate_and_crash_LDADD = \ - ../libindicate.la \ + ../libindicate/libindicate.la \ $(LIBINDICATE_LIBS) indicate_alot_SOURCES = \ indicate-alot.c indicate_alot_CFLAGS = \ - -I $(srcdir)/../.. \ + -I $(srcdir)/.. \ $(LIBINDICATE_CFLAGS) indicate_alot_LDADD = \ - ../libindicate.la \ + ../libindicate/libindicate.la \ $(LIBINDICATE_LIBS) listen_and_print_SOURCES = \ listen-and-print.c listen_and_print_CFLAGS = \ - -I $(srcdir)/../.. \ + -I $(srcdir)/.. \ $(LIBINDICATE_CFLAGS) listen_and_print_LDADD = \ - ../libindicate.la \ + ../libindicate/libindicate.la \ $(LIBINDICATE_LIBS) diff --git a/libindicate/tests/indicate-alot.c b/tests/indicate-alot.c index bebf726..bebf726 100644 --- a/libindicate/tests/indicate-alot.c +++ b/tests/indicate-alot.c diff --git a/libindicate/tests/indicate-and-crash.c b/tests/indicate-and-crash.c index 5a50e30..5a50e30 100644 --- a/libindicate/tests/indicate-and-crash.c +++ b/tests/indicate-and-crash.c diff --git a/libindicate/tests/listen-and-print.c b/tests/listen-and-print.c index 9ad2cc8..9ad2cc8 100644 --- a/libindicate/tests/listen-and-print.c +++ b/tests/listen-and-print.c diff --git a/libindicate/tests/test.js b/tests/test.js index 45b0d05..45b0d05 100755 --- a/libindicate/tests/test.js +++ b/tests/test.js |