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

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6e90e481cabf841283d3064287020ed67c4630cd..642466fa21c93dce6d47a34a2ea7c8150eebc55e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,36 +1,30 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+# SPDX-License-Identifier: MIT
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =                      \
-       include                 \
-       common                  \
-       compat
+SUBDIRS = \
+       include \
+       src \
+       doc \
+       tests
 
-if WITH_PYTHON_PLUGINS
-SUBDIRS += python-plugin-provider
-endif
-
-SUBDIRS +=                     \
-       lib                     \
-       plugins                 \
-       cli                     \
-       bindings                \
-       tests                   \
-       doc                     \
-       extras
-
-dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-               std-ext-lib.txt README
+dist_doc_DATA = \
+       ChangeLog \
+       CONTRIBUTING.adoc \
+       LICENSE \
+       README.adoc
 
 dist_noinst_DATA = CodingStyle
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
-
-# Create a symlink from libbabeltrace-ctf to libbabeltrace.
-# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this
-# file must still exist. As of Babeltrace 2, CTF writer is implemented
-# in libbabeltrace, hence the symlink.
-install-exec-hook:
-       $(LN_S) -f libbabeltrace.so $(DESTDIR)$(libdir)/libbabeltrace-ctf.so
+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