Add `std::optional` replacement (`nonstd::optional`)

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f73b6d475aba61a0930d1608523ff304e24257b5..642466fa21c93dce6d47a34a2ea7c8150eebc55e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,40 +1,30 @@
-ACLOCAL_AMFLAGS = -I m4
-
-SUBDIRS = include              \
-       common                  \
-       ctfser                  \
-       fd-cache                \
-       compat                  \
-       logging                 \
-       lib
+# SPDX-License-Identifier: MIT
 
-if ENABLE_PYTHON_PLUGINS
-# Only build the Python plugin provider shared object if the
-# configuration doesn't ask to make it built-in.
-SUBDIRS += python-plugin-provider
-endif
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS +=                     \
-       plugins                 \
-       cli                     \
-       bindings                \
-       doc                     \
+SUBDIRS = \
+       include \
+       src \
+       doc \
        tests
 
-# Directories added to EXTRA_DIST will be recursively copied to the distribution.
-EXTRA_DIST = \
-       extras
-
-dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-               std-ext-lib.txt README CONTRIBUTING.adoc
+dist_doc_DATA = \
+       ChangeLog \
+       CONTRIBUTING.adoc \
+       LICENSE \
+       README.adoc
 
 dist_noinst_DATA = CodingStyle
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf.pc
-
-# This is a convenience target, it's not part of the build process.
-CONTRIBUTING.html: CONTRIBUTING.adoc
-       $(ASCIIDOC) --verbose -a source-highlighter=pygments $<
-
-CLEANFILES = CONTRIBUTING.html
+EXTRA_DIST = \
+       LICENSES/BSD-2-Clause \
+       LICENSES/BSD-4-Clause \
+       LICENSES/BSL-1.0 \
+       LICENSES/CC-BY-SA-4.0 \
+       LICENSES/GPL-2.0 \
+       LICENSES/GPL-3.0 \
+       LICENSES/LGPL-2.1 \
+       LICENSES/MIT \
+       std-ext-lib.txt \
+       tools/format-cpp \
+       version