diff options
| -rw-r--r-- | .bzrignore | 7 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libindicator/Makefile.am | 2 | ||||
| -rw-r--r-- | libindicator/indicator3-0.4.pc.in.in | 2 |
5 files changed, 25 insertions, 5 deletions
@@ -172,3 +172,10 @@ libindicator/s-enum-types-h libindicator/gen-indicator-service.xml.c libindicator/gen-indicator-service.xml.h libindicator/libindicator_la-gen-indicator-service.xml.lo +libindicator/indicator-0.4.pc.in +libindicator/indicator3-0.4.pc +libindicator/indicator3-0.4.pc.in +libindicator/libindicator3_la-gen-indicator-service.xml.lo +tools/indicator-loader3 +libindicator-[0-9]*.[0-9]*.[0-9]* +build-aux diff --git a/Makefile.am b/Makefile.am index 1cb279e..182cb2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,13 +2,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = \ libindicator \ - tests \ tools -tests: libindicator - tools: libindicator +if WANT_TESTS +SUBDIRS += \ + tests + +tests: libindicator +endif + DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations DISTCLEANFILES = \ diff --git a/configure.ac b/configure.ac index 42a476a..4710901 100644 --- a/configure.ac +++ b/configure.ac @@ -108,6 +108,14 @@ AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir]) AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir]) ######################### +# Check if build tests +######################### +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [disable tests]),, + [enable_tests=yes]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"]) + +######################### # Debug symbols ######################### AC_ARG_ENABLE([debug], @@ -155,6 +163,7 @@ Libindicator Configuration: Prefix: $prefix GTK+ Version: $with_gtk + Enable tests: $enable_tests Enable debugging: $enable_debug Coverage reporting: $use_gcov ]) diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 0f5ad34..b574519 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -26,7 +26,7 @@ CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc include $(top_srcdir)/Makefile.am.marshal -libindicatorincludedir=$(includedir)/libindicator-0.$(INDICATOR_API_VERSION)/libindicator +libindicatorincludedir=$(includedir)/libindicator$(VER)-0.$(INDICATOR_API_VERSION)/libindicator indicator_headers = \ indicator.h \ diff --git a/libindicator/indicator3-0.4.pc.in.in b/libindicator/indicator3-0.4.pc.in.in index 1f34567..d4b5f0f 100644 --- a/libindicator/indicator3-0.4.pc.in.in +++ b/libindicator/indicator3-0.4.pc.in.in @@ -7,7 +7,7 @@ includedir=@includedir@ indicatordir=${libdir}/indicators3/@indicator_abi_version@/ iconsdir=@datarootdir@/@PACKAGE@/icons/ -Cflags: -I${includedir}/libindicator-0.@indicator_api_version@ +Cflags: -I${includedir}/libindicator3-0.@indicator_api_version@ Requires: gtk+-3.0 Libs: -lindicator3 |