diff options
| author | Alexander Larsson <alexl@redhat.com> | 2015-12-16 15:19:32 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2015-12-16 15:27:42 +0100 |
| commit | 570ba8b55fd06793f6f36d33faad84a2477a3a77 (patch) | |
| tree | 83121ab5df2c52817fc3e36170ebc0d2d5bafab1 | |
| parent | 619adeb74c6b7228c521f8855ca8d2ecde5728b5 (diff) | |
| download | xdg-app-570ba8b55fd06793f6f36d33faad84a2477a3a77.tar.gz | |
Add --enable-libxdgapp configure flag and disable lib by default
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/Makefile.am.inc | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 08ceaab..83e5774 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,3 +83,9 @@ xdg-app.env: env.d/xdg-app.env.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xdg-app.pc EXTRA_DIST += xdg-app.pc.in + +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-documentation \ + --enable-libxdgapp \ + --disable-maintainer-mode \ + --enable-introspection diff --git a/configure.ac b/configure.ac index d026965..1cdeab6 100644 --- a/configure.ac +++ b/configure.ac @@ -117,6 +117,12 @@ if test "x$enable_seccomp" = "xyes"; then fi +AC_ARG_ENABLE(libxdgapp, + AS_HELP_STRING([--enable-libxdgapp], + [Install libxdg-app (default: no)]),, + [enable_libxdgapp=no]) +AM_CONDITIONAL(BUILDOPT_INSTALL_LIB, test x$enable_libxdgapp = xyes) + AC_ARG_ENABLE([userns], AC_HELP_STRING([--disable-userns], [Disable User namespaces (requires setuid/setcaps)]), diff --git a/doc/Makefile.am b/doc/Makefile.am index a2349fa..8af8f90 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,6 +1,9 @@ NULL = -SUBDIRS = reference +if BUILDOPT_INSTALL_LIB + LIB_DOCS = reference +endif +SUBDIRS = $(LIB_DOCS) XSLTPROC_FLAGS = \ --nonet \ diff --git a/lib/Makefile.am.inc b/lib/Makefile.am.inc index 90d7dc2..8185f57 100644 --- a/lib/Makefile.am.inc +++ b/lib/Makefile.am.inc @@ -1,5 +1,8 @@ +if BUILDOPT_INSTALL_LIB lib_LTLIBRARIES += libxdg-app.la - +else +noinst_LTLIBRARIES += libxdg-app.la +endif noinst_PROGRAMS += test-libxdg-app public_headers = \ @@ -39,7 +42,9 @@ lib/xdg-app-enum-types.c: $(public_headers) lib/xdg-app-enum-types.c.template EXTRA_DIST += lib/xdg-app-enum-types.c.template lib/xdg-app-enum-types.h.template xdgappincludedir = $(includedir)/xdg-app +if BUILDOPT_INSTALL_LIB xdgappinclude_HEADERS = $(public_headers) $(generated_public_headers) +endif sources = \ lib/xdg-app.c \ @@ -124,6 +129,8 @@ XdgApp_1_0_gir_SCANNERFLAGS = \ INTROSPECTION_GIRS += XdgApp-1.0.gir +if BUILDOPT_INSTALL_LIB + girdir = $(datadir)/gir-1.0 nodist_gir_DATA = $(INTROSPECTION_GIRS) CLEANFILES += $(nodist_gir_DATA) @@ -132,4 +139,6 @@ typelibdir = $(libdir)/girepository-1.0 nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(nodist_typelib_DATA) +endif + endif # HAVE_INTROSPECTION |