diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 5 | ||||
| -rw-r--r-- | lib/Makefile.am.inc | 10 |
3 files changed, 1 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index b055c20..3aac50f 100644 --- a/configure.ac +++ b/configure.ac @@ -117,12 +117,6 @@ 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 8954f03..9d7dd37 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,9 +1,6 @@ NULL = -if BUILDOPT_INSTALL_LIB - LIB_DOCS = reference -endif -SUBDIRS = $(LIB_DOCS) +SUBDIRS = reference XSLTPROC_FLAGS = \ --nonet \ diff --git a/lib/Makefile.am.inc b/lib/Makefile.am.inc index 8185f57..0d0cb35 100644 --- a/lib/Makefile.am.inc +++ b/lib/Makefile.am.inc @@ -1,8 +1,4 @@ -if BUILDOPT_INSTALL_LIB lib_LTLIBRARIES += libxdg-app.la -else -noinst_LTLIBRARIES += libxdg-app.la -endif noinst_PROGRAMS += test-libxdg-app public_headers = \ @@ -42,9 +38,7 @@ 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 \ @@ -129,8 +123,6 @@ 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) @@ -139,6 +131,4 @@ typelibdir = $(libdir)/girepository-1.0 nodist_typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(nodist_typelib_DATA) -endif - endif # HAVE_INTROSPECTION |