From 166b9d411e6705c603debaf855c01cacfc90ce9e Mon Sep 17 00:00:00 2001 From: bnnm Date: Thu, 4 Jan 2018 22:59:07 +0100 Subject: [PATCH] Rename makefile.audacious to makefile.autotools, as now can build more Not sure about the naming convention but hopefully clear enough --- ...file.audacious.am => Makefile.autotools.am | 4 ++-- ...ile.audacious.am => Makefile.autotools.am} | 4 ++-- bootstrap | 24 +++++++++---------- configure.ac | 14 +++++------ ...ile.audacious.am => Makefile.autotools.am} | 4 ++-- ...ile.audacious.am => Makefile.autotools.am} | 4 ++-- ...ile.audacious.am => Makefile.autotools.am} | 4 ++-- ...ile.audacious.am => Makefile.autotools.am} | 4 ++-- ...ile.audacious.am => Makefile.autotools.am} | 4 ++-- unbootstrap | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) rename Makefile.audacious.am => Makefile.autotools.am (63%) rename audacious/{Makefile.audacious.am => Makefile.autotools.am} (89%) rename src/{Makefile.audacious.am => Makefile.autotools.am} (88%) rename src/coding/{Makefile.audacious.am => Makefile.autotools.am} (80%) rename src/layout/{Makefile.audacious.am => Makefile.autotools.am} (80%) rename src/meta/{Makefile.audacious.am => Makefile.autotools.am} (80%) rename test/{Makefile.audacious.am => Makefile.autotools.am} (81%) diff --git a/Makefile.audacious.am b/Makefile.autotools.am similarity index 63% rename from Makefile.audacious.am rename to Makefile.autotools.am index d42d6215..dd659b8c 100644 --- a/Makefile.audacious.am +++ b/Makefile.autotools.am @@ -1,7 +1,7 @@ -## audacious-vgmstream script +## vgmstream autotools script ## Process this file with automake to produce Makefile.in -AM_MAKEFLAGS=-f Makefile.audacious +AM_MAKEFLAGS=-f Makefile.autotools SUBDIRS = src audacious test diff --git a/audacious/Makefile.audacious.am b/audacious/Makefile.autotools.am similarity index 89% rename from audacious/Makefile.audacious.am rename to audacious/Makefile.autotools.am index bb9cf4c0..6ed3bbc2 100644 --- a/audacious/Makefile.audacious.am +++ b/audacious/Makefile.autotools.am @@ -1,11 +1,11 @@ -## audacious-vgmstream automake script +## vgmstream autotools script #inputplugindir = $(libdir)/audacious/$(INPUT_PLUGIN_DIR) inputplugindir = $(plugindir)/$(INPUT_PLUGIN_DIR) inputplugin_LTLIBRARIES = libvgmstream.la -AM_MAKEFLAGS=-f Makefile.audacious +AM_MAKEFLAGS=-f Makefile.autotools AM_CXXFLAGS = -DVERSION=\"VGMSTREAM_VERSION\" -Wall -std=c++11 -fpermissive -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/ $(AUDACIOUS_CFLAGS) $(GTK_CFLAGS) AM_LIBS = diff --git a/bootstrap b/bootstrap index 9bb6eab3..49468eb6 100755 --- a/bootstrap +++ b/bootstrap @@ -1,5 +1,5 @@ #!/bin/sh -# audacious-vgmstream script - automake/autoconf init +# vgmstream autotools script - automake/autoconf init # gets all files and updates .am scripts to avoid having to do manually (frowned upon by automake, whatevs) @@ -14,21 +14,21 @@ META_SRCS=`(cd ./src/meta/ && ls *.c) | tr '\n' ' '` META_HDRS=`(cd ./src/meta/ && ls *.h) | tr '\n' ' '` AUDACIOUS_SRCS=`(cd ./audacious/ && ls *.cc) | tr '\n' ' '` AUDACIOUS_HDRS=`(cd ./audacious/ && ls *.h) | tr '\n' ' '` -sed -i -e "s/libvgmstream_la_SOURCES =.*/libvgmstream_la_SOURCES = $VGMSTREAM_SRCS/g" ./src/Makefile.audacious.am -sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $VGMSTREAM_HDRS/g" ./src/Makefile.audacious.am -sed -i -e "s/libcoding_la_SOURCES =.*/libcoding_la_SOURCES = $CODING_SRCS/g" ./src/coding/Makefile.audacious.am -sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $CODING_HDRS/g" ./src/coding/Makefile.audacious.am -sed -i -e "s/liblayout_la_SOURCES =.*/liblayout_la_SOURCES = $LAYOUT_SRCS/g" ./src/layout/Makefile.audacious.am -sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $LAYOUT_HDRS/g" ./src/layout/Makefile.audacious.am -sed -i -e "s/libmeta_la_SOURCES =.*/libmeta_la_SOURCES = $META_SRCS/g" ./src/meta/Makefile.audacious.am -sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $META_HDRS/g" ./src/meta/Makefile.audacious.am -sed -i -e "s/libvgmstream_la_SOURCES =.*/libvgmstream_la_SOURCES = $AUDACIOUS_SRCS/g" ./audacious/Makefile.audacious.am -sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $AUDACIOUS_HDRS/g" ./audacious/Makefile.audacious.am +sed -i -e "s/libvgmstream_la_SOURCES =.*/libvgmstream_la_SOURCES = $VGMSTREAM_SRCS/g" ./src/Makefile.autotools.am +sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $VGMSTREAM_HDRS/g" ./src/Makefile.autotools.am +sed -i -e "s/libcoding_la_SOURCES =.*/libcoding_la_SOURCES = $CODING_SRCS/g" ./src/coding/Makefile.autotools.am +sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $CODING_HDRS/g" ./src/coding/Makefile.autotools.am +sed -i -e "s/liblayout_la_SOURCES =.*/liblayout_la_SOURCES = $LAYOUT_SRCS/g" ./src/layout/Makefile.autotools.am +sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $LAYOUT_HDRS/g" ./src/layout/Makefile.autotools.am +sed -i -e "s/libmeta_la_SOURCES =.*/libmeta_la_SOURCES = $META_SRCS/g" ./src/meta/Makefile.autotools.am +sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $META_HDRS/g" ./src/meta/Makefile.autotools.am +sed -i -e "s/libvgmstream_la_SOURCES =.*/libvgmstream_la_SOURCES = $AUDACIOUS_SRCS/g" ./audacious/Makefile.autotools.am +sed -i -e "s/EXTRA_DIST =.*/EXTRA_DIST = $AUDACIOUS_HDRS/g" ./audacious/Makefile.autotools.am # get version to show in about dialogs # again, not very pretty VGMSTREAM_VERSION=`./version.sh` -sed -i -e "s/VGMSTREAM_VERSION/$VGMSTREAM_VERSION/g" ./audacious/Makefile.audacious.am +sed -i -e "s/VGMSTREAM_VERSION/$VGMSTREAM_VERSION/g" ./audacious/Makefile.autotools.am # create fake files expected by automake and process diff --git a/configure.ac b/configure.ac index d97e818a..4dea9f98 100644 --- a/configure.ac +++ b/configure.ac @@ -60,11 +60,11 @@ AC_PATH_X AC_PATH_XTRA AC_OUTPUT([ - Makefile.audacious - src/Makefile.audacious - src/coding/Makefile.audacious - src/layout/Makefile.audacious - src/meta/Makefile.audacious - audacious/Makefile.audacious - test/Makefile.audacious + Makefile.autotools + src/Makefile.autotools + src/coding/Makefile.autotools + src/layout/Makefile.autotools + src/meta/Makefile.autotools + audacious/Makefile.autotools + test/Makefile.autotools ]) diff --git a/src/Makefile.audacious.am b/src/Makefile.autotools.am similarity index 88% rename from src/Makefile.audacious.am rename to src/Makefile.autotools.am index 94000b04..a15eb51f 100644 --- a/src/Makefile.audacious.am +++ b/src/Makefile.autotools.am @@ -1,9 +1,9 @@ -## audacious-vgmstream automake script +## vgmstream autotools script lib_LTLIBRARIES = libvgmstream.la AM_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/ -AM_MAKEFLAGS=-f Makefile.audacious +AM_MAKEFLAGS=-f Makefile.autotools SUBDIRS = coding layout meta diff --git a/src/coding/Makefile.audacious.am b/src/coding/Makefile.autotools.am similarity index 80% rename from src/coding/Makefile.audacious.am rename to src/coding/Makefile.autotools.am index 11bbf4d9..b49ce855 100644 --- a/src/coding/Makefile.audacious.am +++ b/src/coding/Makefile.autotools.am @@ -1,9 +1,9 @@ -## audacious-vgmstream automake script +## vgmstream autotools script noinst_LTLIBRARIES = libcoding.la AM_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/ -AM_MAKEFLAGS=-f Makefile.audacious +AM_MAKEFLAGS=-f Makefile.autotools # sources/headers are updated automatically by ./bootstrap script (not all headers are needed though) libcoding_la_LDFLAGS = diff --git a/src/layout/Makefile.audacious.am b/src/layout/Makefile.autotools.am similarity index 80% rename from src/layout/Makefile.audacious.am rename to src/layout/Makefile.autotools.am index 85cc2677..9d0ea898 100644 --- a/src/layout/Makefile.audacious.am +++ b/src/layout/Makefile.autotools.am @@ -1,9 +1,9 @@ -## audacious-vgmstream automake script +## vgmstream autotools script noinst_LTLIBRARIES = liblayout.la AM_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/ -AM_MAKEFLAGS=-f Makefile.audacious +AM_MAKEFLAGS=-f Makefile.autotools # sources/headers are updated automatically by ./bootstrap script (not all headers are needed though) liblayout_la_LDFLAGS = diff --git a/src/meta/Makefile.audacious.am b/src/meta/Makefile.autotools.am similarity index 80% rename from src/meta/Makefile.audacious.am rename to src/meta/Makefile.autotools.am index 11ee0a7b..03a89813 100644 --- a/src/meta/Makefile.audacious.am +++ b/src/meta/Makefile.autotools.am @@ -1,9 +1,9 @@ -## audacious-vgmstream automake script +## vgmstream autotools script noinst_LTLIBRARIES = libmeta.la AM_CFLAGS = -DVAR_ARRAYS -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/ -AM_MAKEFLAGS=-f Makefile.audacious +AM_MAKEFLAGS=-f Makefile.autotools # sources/headers are updated automatically by ./bootstrap script (not all headers are needed though) libmeta_la_LDFLAGS = diff --git a/test/Makefile.audacious.am b/test/Makefile.autotools.am similarity index 81% rename from test/Makefile.audacious.am rename to test/Makefile.autotools.am index 4bb20b40..c5498964 100644 --- a/test/Makefile.audacious.am +++ b/test/Makefile.autotools.am @@ -1,4 +1,4 @@ -## audacious-vgmstream automake script +## vgmstream autotools script bin_PROGRAMS = vgmstream-cli @@ -7,7 +7,7 @@ bin_PROGRAMS += vgmstream123 endif AM_CFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/ext_includes/ $(AO_CFLAGS) -AM_MAKEFLAGS = -f Makefile.audacious +AM_MAKEFLAGS = -f Makefile.autotools vgmstream_cli_SOURCES = test.c vgmstream_cli_LDADD = ../src/libvgmstream.la diff --git a/unbootstrap b/unbootstrap index 4a652aa8..2f033e69 100755 --- a/unbootstrap +++ b/unbootstrap @@ -1,4 +1,4 @@ #!/bin/sh -# audacious-vgmstream script - reverses the actions of bootstrap +# vgmstream autotools script - reverses the actions of bootstrap -rm -rf configure AUTHORS compile depcomp ChangeLog config.guess ltmain.sh README config.sub autom4te.cache Makefile.audacious.in INSTALL missing NEWS aclocal.m4 install-sh audacious/config.h.in audacious/main.loT audacious/Makefile.audacious.in src/Makefile.audacious.in src/coding/Makefile.audacious.in src/meta/Makefile.audacious.in src/layout/Makefile.audacious.in test/Makefile.audacious.in +rm -rf configure AUTHORS compile depcomp ChangeLog config.guess ltmain.sh README config.sub autom4te.cache Makefile.autotools.in INSTALL missing NEWS aclocal.m4 install-sh audacious/config.h.in audacious/main.loT audacious/Makefile.autotools.in src/Makefile.autotools.in src/coding/Makefile.autotools.in src/meta/Makefile.autotools.in src/layout/Makefile.autotools.in test/Makefile.autotools.in