commit: 5bb0ea55ac8581fe9e390ac68cd0d6c6481eeee0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 13 11:26:43 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 13 11:38:51 2019 +0000
URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=5bb0ea55
Flatten data, etc & scripts Makefiles
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Makefile.am | 22 ++++++++++++++++++----
configure.ac | 4 ----
data/Makefile.am | 7 -------
etc/Makefile.am | 4 ----
etc/sandbox.d/Makefile.am | 3 ---
scripts/Makefile.am | 4 ----
6 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c730dba..309a41e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,21 +3,35 @@ MAKEFLAGS = --no-print-directory
AM_CPPFLAGS = $(SANDBOX_DEFINES)
SUBDIRS = \
- scripts \
- etc \
- data \
libsbutil \
libsandbox \
src \
tests
+confdir = $(sysconfdir)
+confddir = $(sysconfdir)/sandbox.d
+pixmapdir = $(datadir)/pixmaps
+desktopdir = $(datadir)/applications
+
+dist_conf_DATA = etc/sandbox.conf
+confd_DATA = etc/sandbox.d/00default
+dist_pkgdata_DATA = data/sandbox.bashrc
+dist_pixmap_DATA = data/sandbox.svg
+dist_desktop_DATA = data/sandbox.desktop
noinst_LTLIBRARIES =
libsandbox: libsbutil
src: libsbutil
tests: src
-EXTRA_DIST = headers.h localdecls.h ChangeLog.0
+EXTRA_DIST = \
+ headers.h \
+ localdecls.h \
+ ChangeLog.0 \
+ etc/sandbox.d/00default.in \
+ scripts/gen_symbol_version_map.awk \
+ scripts/gen_symbol_header.awk \
+ scripts/gen_trace_header.awk
DISTCLEANFILES = $(CLEANFILES)
diff --git a/configure.ac b/configure.ac
index 191d096..8c1866c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,13 +456,9 @@ AC_CONFIG_TESTDIR([tests])
AC_CONFIG_FILES([src/sandbox.sh], [chmod +x src/sandbox.sh])
AC_CONFIG_FILES([
Makefile
- data/Makefile
- etc/Makefile
etc/sandbox.d/00default
- etc/sandbox.d/Makefile
libsandbox/Makefile
libsbutil/Makefile
- scripts/Makefile
src/Makefile
tests/atlocal
tests/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index fcb71b4..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-dist_pkgdata_DATA = sandbox.bashrc
-
-pixmapdir = $(datadir)/pixmaps
-dist_pixmap_DATA = sandbox.svg
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = sandbox.desktop
diff --git a/etc/Makefile.am b/etc/Makefile.am
deleted file mode 100644
index 1640a57..0000000
--- a/etc/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS = sandbox.d
-
-confdir = $(sysconfdir)
-dist_conf_DATA = sandbox.conf
diff --git a/etc/sandbox.d/Makefile.am b/etc/sandbox.d/Makefile.am
deleted file mode 100644
index f3fdf96..0000000
--- a/etc/sandbox.d/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-confddir = $(sysconfdir)/sandbox.d
-confd_DATA = 00default
-EXTRA_DIST = 00default.in
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 41ee99e..0000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_DIST = \
- gen_symbol_version_map.awk \
- gen_symbol_header.awk \
- gen_trace_header.awk
