From e7599f6fe511ccab2163a1c3bcb723a61f33308b Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Mon, 28 May 2018 18:28:03 +0200 Subject: [PATCH] Simplify web makefiles --- configure.ac | 3 --- web/Makefile.am | 38 ++++++++++++++++++++++++++----------- web/assets/Makefile.am | 5 ----- web/assets/css/Makefile.am | 10 ---------- web/assets/font/Makefile.am | 15 --------------- 5 files changed, 27 insertions(+), 44 deletions(-) delete mode 100644 web/assets/Makefile.am delete mode 100644 web/assets/css/Makefile.am delete mode 100644 web/assets/font/Makefile.am diff --git a/configure.ac b/configure.ac index a08f8640..7a537c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -228,9 +228,6 @@ AC_CONFIG_FILES([ src/common/timing/Makefile doc/Makefile web/Makefile - web/assets/Makefile - web/assets/css/Makefile - web/assets/font/Makefile admin/Makefile admin/includes/Makefile win32/Makefile diff --git a/web/Makefile.am b/web/Makefile.am index 09edf3f5..52696e04 100644 --- a/web/Makefile.am +++ b/web/Makefile.am @@ -1,15 +1,31 @@ ## Process this file with automake to produce Makefile.in webdir = $(pkgdatadir)/web -web_DATA = status.xsl \ - favicon.ico \ - icecast.png \ - style.css \ - auth.xsl \ - server_version.xsl \ - tunein.png \ - key.png \ - status-json.xsl \ - xml2json.xslt -EXTRA_DIST = $(web_DATA) +nobase_web_DATA = \ + status.xsl \ + favicon.ico \ + icecast.png \ + style.css \ + auth.xsl \ + server_version.xsl \ + tunein.png \ + key.png \ + status-json.xsl \ + xml2json.xslt \ + assets/css/style.css \ + assets/font/FiraMono-Bold.eot \ + assets/font/FiraMono-Regular.eot \ + assets/font/FiraSans-Bold.eot \ + assets/font/FiraSans-BoldItalic.woff \ + assets/font/FiraSans-Italic.eot \ + assets/font/FiraSans-Regular.eot \ + assets/font/FiraMono-Bold.woff \ + assets/font/FiraMono-Regular.woff \ + assets/font/FiraSans-BoldItalic.eot \ + assets/font/FiraSans-Bold.woff \ + assets/font/FiraSans-Italic.woff \ + assets/font/FiraSans-Regular.woff + + +EXTRA_DIST = $(nobase_web_DATA) diff --git a/web/assets/Makefile.am b/web/assets/Makefile.am deleted file mode 100644 index a8fcb346..00000000 --- a/web/assets/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = foreign - -SUBDIRS = css font diff --git a/web/assets/css/Makefile.am b/web/assets/css/Makefile.am deleted file mode 100644 index 7a27aaa8..00000000 --- a/web/assets/css/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = foreign - -webdir = $(pkgdatadir)/web -otherwebdir = $(webdir)/assets/css - -otherweb_DATA = style.css - -EXTRA_DIST = $(otherweb_DATA) diff --git a/web/assets/font/Makefile.am b/web/assets/font/Makefile.am deleted file mode 100644 index 57bda1ee..00000000 --- a/web/assets/font/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = foreign - -webdir = $(pkgdatadir)/web -otherwebdir = $(webdir)/assets/font - -otherweb_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \ - FiraSans-Bold.eot FiraSans-BoldItalic.woff \ - FiraSans-Italic.eot FiraSans-Regular.eot \ - FiraMono-Bold.woff FiraMono-Regular.woff \ - FiraSans-BoldItalic.eot FiraSans-Bold.woff \ - FiraSans-Italic.woff FiraSans-Regular.woff - -EXTRA_DIST = $(otherweb_DATA)