From 566414c939aa51448bde730aec9bbd90c62161a6 Mon Sep 17 00:00:00 2001 From: Samantha Baldwin Date: Fri, 21 Oct 2016 05:33:05 -0400 Subject: [PATCH] nuke-autohell (#54) * remove m4 directory * remove leftover Makefile.am after confirming its uselessness * remove another useless autoconf Makefile.am --- m4/Makefile.am | 1 - m4/as-ac-expand.m4 | 49 ------------------------ m4/as-version.m4 | 71 ----------------------------------- m4/pychecker.mk | 51 ------------------------- morituri/extern/Makefile.am | 38 ------------------- morituri/test/Makefile.am | 75 ------------------------------------- 6 files changed, 285 deletions(-) delete mode 100644 m4/Makefile.am delete mode 100644 m4/as-ac-expand.m4 delete mode 100644 m4/as-version.m4 delete mode 100644 m4/pychecker.mk delete mode 100644 morituri/extern/Makefile.am delete mode 100644 morituri/test/Makefile.am diff --git a/m4/Makefile.am b/m4/Makefile.am deleted file mode 100644 index 4281cce..0000000 --- a/m4/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = as-version.m4 as-ac-expand.m4 diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4 deleted file mode 100644 index e5b6e37..0000000 --- a/m4/as-ac-expand.m4 +++ /dev/null @@ -1,49 +0,0 @@ -dnl as-ac-expand.m4 0.2.1 -dnl autostars m4 macro for expanding directories using configure's prefix -dnl thomas@apestaart.org - -dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR) -dnl example -dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) -dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local -dnl Note: when using $prefix or $exec_prefix, avoid it expanding to NONE -dnl by calling it like this: -dnl AS_AC_EXPAND(PYTHONLIBDIR, "\${exec_prefix}/lib/python$PYVER/site-packages") - -AC_DEFUN([AS_AC_EXPAND], -[ - EXP_VAR=[$1] - FROM_VAR=[$2] - - dnl echo DEBUG: expand FROM_VAR $FROM_VAR - - dnl first expand prefix and exec_prefix if necessary - prefix_save=$prefix - exec_prefix_save=$exec_prefix - - dnl if no prefix given, then use /usr/local, the default prefix - if test "x$prefix" = "xNONE"; then - prefix="$ac_default_prefix" - fi - dnl if no exec_prefix given, then use prefix - if test "x$exec_prefix" = "xNONE"; then - exec_prefix=$prefix - fi - - full_var="$FROM_VAR" - dnl loop until it doesn't change anymore - while true; do - dnl echo DEBUG: full_var: $full_var - new_full_var="`eval echo $full_var`" - if test "x$new_full_var" = "x$full_var"; then break; fi - full_var=$new_full_var - done - - dnl clean up - full_var=$new_full_var - AC_SUBST([$1], "$full_var") - - dnl restore prefix and exec_prefix - prefix=$prefix_save - exec_prefix=$exec_prefix_save -]) diff --git a/m4/as-version.m4 b/m4/as-version.m4 deleted file mode 100644 index a5b4399..0000000 --- a/m4/as-version.m4 +++ /dev/null @@ -1,71 +0,0 @@ -dnl as-version.m4 0.2.0 - -dnl autostars m4 macro for versioning - -dnl Thomas Vander Stichele - -dnl $Id: as-version.m4,v 1.4 2004/06/01 09:40:05 thomasvs Exp $ - -dnl AS_VERSION - -dnl example -dnl AS_VERSION - -dnl this macro -dnl - AC_SUBST's PACKAGE_VERSION_MAJOR, _MINOR, _MICRO -dnl - AC_SUBST's PACKAGE_VERSION_RELEASE, -dnl which can be used for rpm release fields -dnl - doesn't call AM_INIT_AUTOMAKE anymore because it prevents -dnl maintainer mode from running correctly -dnl -dnl don't forget to put #undef PACKAGE_VERSION_RELEASE in acconfig.h -dnl if you use acconfig.h - -AC_DEFUN([AS_VERSION], -[ - PACKAGE_VERSION_MAJOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo AC_PACKAGE_VERSION | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f3) - - AC_SUBST(PACKAGE_VERSION_MAJOR) - AC_SUBST(PACKAGE_VERSION_MINOR) - AC_SUBST(PACKAGE_VERSION_MICRO) -]) - -dnl AS_NANO(ACTION-IF-NO-NANO, [ACTION-IF-NANO]) - -dnl requires AC_INIT to be called before -dnl For projects using a fourth or nano number in your versioning to indicate -dnl development or prerelease snapshots, this macro allows the build to be -dnl set up differently accordingly. - -dnl this macro: -dnl - parses AC_PACKAGE_VERSION, set by AC_INIT, and extracts the nano number -dnl - sets the variable PACKAGE_VERSION_NANO -dnl - sets the variable PACKAGE_VERSION_RELEASE, which can be used -dnl for rpm release fields -dnl - executes ACTION-IF-NO-NANO or ACTION-IF-NANO - -dnl example: -dnl AS_NANO(RELEASE="yes", RELEASE="no") - -AC_DEFUN([AS_NANO], -[ - AC_MSG_CHECKING(nano version) - - NANO=$(echo AC_PACKAGE_VERSION | cut -d'.' -f4) - - if test x"$NANO" = x || test "x$NANO" = "x0" ; then - AC_MSG_RESULT([0 (release)]) - NANO=0 - PACKAGE_VERSION_RELEASE=1 - ifelse([$1], , :, [$1]) - else - AC_MSG_RESULT($NANO) - PACKAGE_VERSION_RELEASE=0.`date +%Y%m%d.%H%M%S` - ifelse([$2], , :, [$2]) - fi - PACKAGE_VERSION_NANO=$NANO - AC_SUBST(PACKAGE_VERSION_NANO) - AC_SUBST(PACKAGE_VERSION_RELEASE) -]) diff --git a/m4/pychecker.mk b/m4/pychecker.mk deleted file mode 100644 index 9151cf2..0000000 --- a/m4/pychecker.mk +++ /dev/null @@ -1,51 +0,0 @@ -# configure.ac needs to AM_CONDITIONAL HAVE_PYCHECKER - -if HAVE_PYCHECKER -check-local-pychecker: pychecker -else -check-local-pychecker: - echo "Pychecker not found, passing" -endif - -# include this snippet for the pychecker stuff -# Makefile.am needs to define -# PYCHECKER_WHITELIST -# and -# PYCHECKER_BLACKLIST - -pychecker_setup = `ls $(top_srcdir)/misc/setup.py 2> /dev/null` -pychecker_help = `ls $(top_srcdir)/misc/pycheckerhelp.py 2> /dev/null` -pychecker = \ - pychecker -Q -F misc/pycheckerrc \ - $(pychecker_setup) \ - $(pychecker_help) - -# during distcheck, we get executed from $(NAME)-$(VERSION)/_build, while -# our python sources are one level up. Figure this out and set a OUR_PATH -# this uses Makefile syntax, so we need to protect it from automake -thisdir = $(shell basename `pwd`) -OUR_PATH = $(if $(subst _build,,$(thisdir)),$(shell pwd),$(shell pwd)/..) - -pychecker_files = $(filter-out $(PYCHECKER_BLACKLIST),$(wildcard $(PYCHECKER_WHITELIST))) - -# we redirect stderr so we don't get messages like -# warning: couldn't find real module for class SSL.Error (module name: SSL) -# which can't be turned off in pychecker -pycheckersplit: - @echo running pychecker on each file ... - @for file in $(pychecker_all_files) - do \ - $(pychecker) $$file > /dev/null 2>&1 \ - if test $$? -ne 0; then \ - echo "Error on $$file"; \ - $(pychecker) $$file; break \ - fi \ - done - -pychecker: - @echo running pychecker ... - @$(pychecker) $(pychecker_files) 2>/dev/null || make pycheckerverbose - -pycheckerverbose: - @echo "running pychecker (verbose) ..." - $(pychecker) --limit 1000 $(pychecker_files) diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am deleted file mode 100644 index fa56d60..0000000 --- a/morituri/extern/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -CLEANFILES = *.py{c,o} command/*.py{c,o} log/*.py{c,o} - -morituridir = $(PYTHONLIBDIR)/morituri/extern - -morituri_PYTHON = \ - __init__.py \ - asyncsub.py - -logdir = $(PYTHONLIBDIR)/morituri/extern/log - -log_PYTHON = \ - log/__init__.py \ - log/log.py - -commanddir = $(PYTHONLIBDIR)/morituri/extern/command - -command_PYTHON = \ - command/__init__.py \ - command/command.py - -taskdir = $(PYTHONLIBDIR)/morituri/extern/task - -task_PYTHON = \ - task/__init__.py \ - task/task.py \ - task/gstreamer.py - -EXTRA_DIST = python-command/scripts/help2man - -log: - make git-submodule - -git-submodule: - cd $(top_srcdir) && git submodule init && git submodule sync && git submodule update - -.PHONY: git-submodule - - diff --git a/morituri/test/Makefile.am b/morituri/test/Makefile.am deleted file mode 100644 index dc0691a..0000000 --- a/morituri/test/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -CLEANFILES = *.py{c,o} - -EXTRA_DIST = \ - __init__.py \ - common.py \ - test_common_accurip.py \ - test_common_cache.py \ - test_common_checksum.py \ - test_common_common.py \ - test_common_config.py \ - test_common_directory.py \ - test_common_drive.py \ - test_common_encode.py \ - test_common_gstreamer.py \ - test_common_mbngs.py \ - test_common_path.py \ - test_common_program.py \ - test_common_renamer.py \ - test_image_cue.py \ - test_image_image.py \ - test_image_table.py \ - test_image_toc.py \ - test_program_cdparanoia.py \ - test_program_cdrdao.py \ - bloc.cue \ - bloc.toc \ - breeders.cue \ - breeders.toc \ - capital.fast.toc \ - capital.1.toc \ - capital.2.toc \ - cure.cue \ - cure.toc \ - jose.toc \ - dBAR-011-0010e284-009228a3-9809ff0b.bin \ - dBAR-020-002e5023-029d8e49-040eaa14.bin \ - release.08397059-86c1-463b-8ed0-cd596dbd174f.xml \ - release.93a6268c-ddf1-4898-bf93-fb862b1c5c5e.xml \ - release.c7d919f4-3ea0-4c4b-a230-b3605f069440.xml \ - morituri.release.3451f29c-9bb8-4cc5-bfcc-bd50104b94f8.json \ - morituri.release.a76714e0-32b1-4ed4-b28e-f86d99642193.json \ - morituri.release.61c6fd9b-18f8-4a45-963a-ba3c5d990cae.json \ - morituri.release.e32ae79a-336e-4d33-945c-8c5e8206dbd3.json \ - kanye.cue \ - kings-separate.cue \ - kings-single.cue \ - ladyhawke.toc \ - track-separate.cue \ - track-single.cue \ - cdparanoia.progress \ - cdparanoia.progress.error \ - cdparanoia.progress.strokes \ - cdrdao.readtoc.progress \ - silentalarm.result.pickle \ - strokes-someday.toc \ - strokes-someday.eac.cue \ - surferrosa.toc \ - totbl.fast.toc \ - track.flac \ - cache/result/fe105a11.pickle \ - cdparanoia/MATSHITA.cdparanoia-A.log \ - cdparanoia/MATSHITA.cdparanoia-A.stderr \ - cdparanoia/PX-L890SA.cdparanoia-A.log \ - cdparanoia/PX-L890SA.cdparanoia-A.stderr - - -# re-generation of test files when needed -regenerate: track.flac - -%.regenerate: - rm $* - make $* - -track.flac: - gst-launch audiotestsrc num-buffers=10 samplesperbuffer=588 ! audioconvert ! audio/x-raw-int,channels=2,width=16,height=16,rate=44100 ! flacenc ! filesink location=track.flac