diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:03:46 +0200 |
| commit | b4d146190da79eaf88b63d38e7d0d40856b5262f (patch) | |
| tree | cd3b5e99ccb2ba8a7fd32fe20d78b9c6563ef82f /tests/Makefile.am | |
| parent | 34b4a4d73f886573fc992d0618f44817ec12c3a5 (diff) | |
| parent | d14f25ad6ec36e956cd2d2c031147b8cb2fddec3 (diff) | |
| download | libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.gz libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.tar.bz2 libayatana-indicator-b4d146190da79eaf88b63d38e7d0d40856b5262f.zip | |
Merging new upstream release and some changes from Ubuntu.
Don't drop debian/source
* Merged in fix for (LP: #603489)
* New upstream release.
* Removing checking for style properties that aren't used.
* Make it so that a watcher dying is the same as unregistering.
* Merge debian changes
* Drop debian/source/*
* debian/control: Switch VCS for this branch to be the indicator
applet developers branch.
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 13fef2d..9d5e496 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -304,6 +304,60 @@ TESTS += service-version-tester DISTCLEANFILES += service-version-tester service-version-bad.service service-version-good.service ############################# +# Service Versions +############################# + +check_PROGRAMS += service-version-multiwatch-manager + +service_version_manager_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-manager.c + +service_version_multiwatch_manager_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_manager_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +check_PROGRAMS += service-version-multiwatch-manager-impolite + +service_version_manager_impolite_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-manager-impolite.c + +service_version_multiwatch_manager_impolite_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_manager_impolite_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +check_PROGRAMS += service-version-multiwatch-service + +service_version_multiwatch_service_SOURCES = \ + service-version-values.h \ + service-version-multiwatch-service.c + +service_version_multiwatch_service_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +service_version_multiwatch_service_LDADD = \ + $(LIBINDICATOR_LIBS) \ + $(top_builddir)/libindicator/.libs/libindicator.a + +service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am + @echo "#!/bin/sh" > $@ + @echo dbus-test-runner --task ./service-version-multiwatch-service --task-name Service --task ./service-version-multiwatch-manager --task-name Manager1 --task ./service-version-multiwatch-manager --task-name Manager2 --task ./service-version-multiwatch-manager --task-name Manager3 --task ./service-version-multiwatch-manager --task-name Manager4 --task ./service-version-multiwatch-manager --task-name Manager5 --task ./service-version-multiwatch-manager-impolite --task-name Impolite1 --task ./service-version-multiwatch-manager-impolite --task-name Impolite2 --task ./service-version-multiwatch-manager-impolite --task-name Impolite3 >> $@ + @chmod +x $@ + +TESTS += service-version-multiwatch-tester +DISTCLEANFILES += service-version-multiwatch-tester + +############################# # Service Manager Shutdown ############################# |