From 0499efe9a7ac5c3c5d823babeb65b88534a904e7 Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Mon, 28 May 2018 20:10:57 +0200 Subject: [PATCH] Remove more unnecessary AUTOMAKE_OPTIONS The foreign option is set in AM_INIT_AUTOMAKE already --- admin/Makefile.am | 2 -- admin/includes/Makefile.am | 2 -- examples/Makefile.am | 2 -- win32/Makefile.am | 2 -- 4 files changed, 8 deletions(-) diff --git a/admin/Makefile.am b/admin/Makefile.am index a14df5f8..665ab5f4 100644 --- a/admin/Makefile.am +++ b/admin/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - SUBDIRS = includes admindir = $(pkgdatadir)/admin diff --git a/admin/includes/Makefile.am b/admin/includes/Makefile.am index 0aacf273..c50c78de 100644 --- a/admin/includes/Makefile.am +++ b/admin/includes/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - admindir = $(pkgdatadir)/admin otheradmindir = $(admindir)/includes otheradmin_DATA = footer.xsl head.xsl header.xsl page.xsl mountnav.xsl diff --git a/examples/Makefile.am b/examples/Makefile.am index a312cc63..3d49cf90 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,5 +1,3 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - EXTRA_DIST = icecast_auth-1.0.tar.gz diff --git a/win32/Makefile.am b/win32/Makefile.am index 29af79c1..db1d5b2d 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -1,6 +1,4 @@ ## Process this file with automake to produce Makefile.in -AUTOMAKE_OPTIONS = foreign - EXTRA_DIST = dllbundler.sh icecast2logo2.bmp icecast2logo3.bmp \ icecast2title.bmp icecast.ico icecast.nsis