From c89eec920ff24cf1017b4dd19ed24a584dd99e5a Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Mon, 28 May 2018 20:14:09 +0200 Subject: [PATCH] Simplify admin Makefiles --- admin/Makefile.am | 7 +++---- admin/includes/Makefile.am | 7 ------- configure.ac | 1 - 3 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 admin/includes/Makefile.am diff --git a/admin/Makefile.am b/admin/Makefile.am index 665ab5f4..7073b01f 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = includes - admindir = $(pkgdatadir)/admin -dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \ - stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl vclt.xsl +nobase_dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \ + stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl vclt.xsl includes/footer.xsl \ + includes/head.xsl includes/header.xsl includes/page.xsl includes/mountnav.xsl diff --git a/admin/includes/Makefile.am b/admin/includes/Makefile.am deleted file mode 100644 index c50c78de..00000000 --- a/admin/includes/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -## Process this file with automake to produce Makefile.in - -admindir = $(pkgdatadir)/admin -otheradmindir = $(admindir)/includes -otheradmin_DATA = footer.xsl head.xsl header.xsl page.xsl mountnav.xsl - -EXTRA_DIST = $(otheradmin_DATA) diff --git a/configure.ac b/configure.ac index 95965a34..1e6eed38 100644 --- a/configure.ac +++ b/configure.ac @@ -221,7 +221,6 @@ AC_CONFIG_FILES([ doc/Makefile web/Makefile admin/Makefile - admin/includes/Makefile win32/Makefile examples/Makefile tests/Makefile