[MAKEFILE/misc] Add option to disable inclusion of default webinterface

This commit is contained in:
chme 2018-05-26 08:52:45 +02:00 committed by ejurgensen
parent cbee169729
commit f4422e9cf4
3 changed files with 47 additions and 18 deletions

View File

@ -377,6 +377,13 @@ FORK_ARG_DISABLE([Apple TV device verification], [verification], [RAOP_VERIFICAT
]) ])
AM_CONDITIONAL([COND_RAOP_VERIFICATION], [[test "x$enable_verification" = "xyes"]]) AM_CONDITIONAL([COND_RAOP_VERIFICATION], [[test "x$enable_verification" = "xyes"]])
dnl Include default webinterface
FORK_ARG_DISABLE([Include default web interface], [webinterface], [WEBINTERFACE],
[AS_IF([[test "x$with_libwebsockets" = "xno"]],
[AC_MSG_ERROR([[Default web interface requires libwebsockets]])])
])
AM_CONDITIONAL([COND_WEBINTERFACE], [[test "x$enable_webinterface" = "xyes"]])
dnl Defining users and groups dnl Defining users and groups
AC_ARG_WITH([daapd_user], AC_ARG_WITH([daapd_user],
[AS_HELP_STRING([--with-daapd-user=USER], [AS_HELP_STRING([--with-daapd-user=USER],

View File

@ -1,7 +1,6 @@
htdocsdir = $(datadir)/forked-daapd/htdocs
dist_htdocs_DATA = \ if COND_WEBINTERFACE
admin.html \ WEBINTERFACE_SRC = \
index.html \ index.html \
favicon.ico \ favicon.ico \
android-chrome-96x96.png \ android-chrome-96x96.png \
@ -13,11 +12,39 @@ dist_htdocs_DATA = \
safari-pinned-tab.svg \ safari-pinned-tab.svg \
site.webmanifest site.webmanifest
WEBINTERFACE_CSS_SRC = \
css/app.css \
css/app.css.map
WEBINTERFACE_FONTS_SRC = \
fonts/materialdesignicons-webfont.13621ea.ttf \
fonts/materialdesignicons-webfont.5cdddea.woff2 \
fonts/materialdesignicons-webfont.1bd36f0.woff \
fonts/materialdesignicons-webfont.dbcb3fe.eot
WEBINTERFACE_JS_SRC = \
js/app.js \
js/app.js.map \
js/manifest.js \
js/manifest.js.map \
js/vendor.js \
js/vendor.js.map
WEBINTERFACE_IMG_SRC = \
img/materialdesignicons-webfont.55a80a2.svg
endif
htdocsdir = $(datadir)/forked-daapd/htdocs
dist_htdocs_DATA = \
$(WEBINTERFACE_SRC) \
admin.html
htdocscssdir = $(datadir)/forked-daapd/htdocs/css htdocscssdir = $(datadir)/forked-daapd/htdocs/css
dist_htdocscss_DATA = \ dist_htdocscss_DATA = \
css/app.css \ $(WEBINTERFACE_CSS_SRC) \
css/app.css.map \
css/bulma.min.css \ css/bulma.min.css \
css/font-awesome.min.css \ css/font-awesome.min.css \
css/forked-daapd.css css/forked-daapd.css
@ -25,10 +52,7 @@ dist_htdocscss_DATA = \
htdocsfontsdir = $(datadir)/forked-daapd/htdocs/fonts htdocsfontsdir = $(datadir)/forked-daapd/htdocs/fonts
dist_htdocsfonts_DATA = \ dist_htdocsfonts_DATA = \
fonts/materialdesignicons-webfont.13621ea.ttf \ $(WEBINTERFACE_FONTS_SRC) \
fonts/materialdesignicons-webfont.5cdddea.woff2 \
fonts/materialdesignicons-webfont.1bd36f0.woff \
fonts/materialdesignicons-webfont.dbcb3fe.eot \
fonts/FontAwesome.otf\ fonts/FontAwesome.otf\
fonts/fontawesome-webfont.eot \ fonts/fontawesome-webfont.eot \
fonts/fontawesome-webfont.svg \ fonts/fontawesome-webfont.svg \
@ -36,20 +60,15 @@ dist_htdocsfonts_DATA = \
fonts/fontawesome-webfont.woff \ fonts/fontawesome-webfont.woff \
fonts/fontawesome-webfont.woff2 fonts/fontawesome-webfont.woff2
htdocsimgdir = $(datadir)/forked-daapd/htdocs//img htdocsimgdir = $(datadir)/forked-daapd/htdocs/img
dist_htdocsimg_DATA = \ dist_htdocsimg_DATA = \
img/materialdesignicons-webfont.55a80a2.svg $(WEBINTERFACE_IMG_SRC)
htdocsjsdir = $(datadir)/forked-daapd/htdocs//js htdocsjsdir = $(datadir)/forked-daapd/htdocs/js
dist_htdocsjs_DATA = \ dist_htdocsjs_DATA = \
js/app.js \ $(WEBINTERFACE_JS_SRC) \
js/app.js.map \
js/manifest.js \
js/manifest.js.map \
js/vendor.js \
js/vendor.js.map \
js/axios.js \ js/axios.js \
js/axios.map \ js/axios.map \
js/axios.min.js \ js/axios.min.js \

View File

@ -80,6 +80,9 @@ static char *buildopts[] =
#endif #endif
#ifdef HAVE_LIBPULSE #ifdef HAVE_LIBPULSE
"Pulseaudio", "Pulseaudio",
#endif
#ifdef WEBINTERFACE
"Webinterface",
#endif #endif
NULL NULL
}; };