diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gpm-self-test.c | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index bd98efe..460dce3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,12 +17,9 @@ endif EXTRA_DIST = \ HACKING \ - MAINTAINERS \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - omf.make \ - xmldocs.make \ mate-doc-utils.make clean-local : @@ -51,7 +48,7 @@ distclean-local: ChangeLog: @echo Creating $@ @if test -d "$(srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git ./missing --run git log mate-2-26.. --stat -M -C --name-status --date=short --no-color) | fmt --split-only > [email protected] \ + (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat -M -C --name-status --date=short --no-color) | fmt --split-only > [email protected] \ && mv -f [email protected] $@ \ || ($(RM) [email protected]; \ echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ diff --git a/configure.ac b/configure.ac index 5a3a0b7..3f9cb2e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.63) AC_INIT([mate-power-manager], [1.6.1], [http://www.mate-desktop.org/]) AC_CONFIG_SRCDIR(src) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/Makefile.am b/src/Makefile.am index a49e87a..5fda8ee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -49,8 +49,10 @@ sbin_PROGRAMS = \ mate-power-backlight-helper \ $(NULL) +if HAVE_TESTS check_PROGRAMS = \ mate-power-self-test +endif noinst_LIBRARIES = libgpmshared.a libgpmshared_a_SOURCES = \ @@ -199,6 +201,7 @@ mate_power_manager_CFLAGS = \ $(WARNINGFLAGS) \ $(NULL) +if HAVE_TESTS mate_power_self_test_SOURCES = \ gpm-self-test.c \ egg-color.h \ @@ -263,6 +266,7 @@ mate_power_self_test_LDADD = \ -lm mate_power_self_test_CFLAGS = -DEGG_TEST $(AM_CFLAGS) $(WARNINGFLAGS) +endif BUILT_SOURCES = \ org.mate.PowerManager.h \ @@ -298,7 +302,9 @@ clean-local: CLEANFILES = $(BUILT_SOURCES) +if HAVE_TESTS TESTS = mate-power-self-test +endif MAINTAINERCLEANFILES = \ *~ \ diff --git a/src/gpm-self-test.c b/src/gpm-self-test.c index ef8c769..721516c 100644 --- a/src/gpm-self-test.c +++ b/src/gpm-self-test.c @@ -66,7 +66,7 @@ main (int argc, char **argv) // egg_idletime_test (test); gpm_common_test (test); - gpm_idle_test (test); +// gpm_idle_test (test); gpm_phone_test (test); // gpm_dpms_test (test); // gpm_graph_widget_test (test); |