From f2bddc665676733da0fcdde28e34fe09f33031fb Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 14 Jul 2008 10:57:54 +0200 Subject: [PATCH 01/10] Release v1.0.17 Signed-off-by: Jaroslav Kysela --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a5eb44a..d6cde79 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 1.0.17rc1 +VERSION = 1.0.17 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ From 880926b3cd50f160e282d95e5fb71de3f7a6f4c0 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 18:51:25 +0200 Subject: [PATCH 02/10] gitcompile: return error return code and add GITCOMPILE_NO_MAKE condition Signed-off-by: Jaroslav Kysela --- ac3dec/gitcompile | 16 +++++++++------- as10k1/gitcompile | 16 +++++++++------- echomixer/gitcompile | 16 +++++++++------- envy24control/gitcompile | 16 +++++++++------- hdspconf/gitcompile | 16 +++++++++------- hdsploader/gitcompile | 12 +++++++----- hdspmixer/gitcompile | 16 +++++++++------- ld10k1/gitcompile | 8 +++++--- mixartloader/gitcompile | 12 +++++++----- pcxhrloader/gitcompile | 12 +++++++----- qlo10k1/gitcompile | 8 +++++--- rmedigicontrol/gitcompile | 16 +++++++++------- sb16_csp/gitcompile | 16 +++++++++------- seq/sbiload/gitcompile | 16 +++++++++------- sscape_ctl/gitcompile | 14 ++++++++------ us428control/gitcompile | 12 +++++++----- usx2yloader/gitcompile | 12 +++++++----- vxloader/gitcompile | 12 +++++++----- 18 files changed, 141 insertions(+), 105 deletions(-) diff --git a/ac3dec/gitcompile b/ac3dec/gitcompile index 6c3452b..694d5c2 100755 --- a/ac3dec/gitcompile +++ b/ac3dec/gitcompile @@ -1,9 +1,11 @@ #!/bin/sh -aclocal $ACLOCAL_FLAGS -autoheader -automake --add-missing --copy --foreign -touch depcomp -autoconf -./configure $* -make +aclocal $ACLOCAL_FLAGS || exit 1 +autoheader || exit 1 +automake --add-missing --copy --foreign || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 +./configure $* || exit 1 +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/as10k1/gitcompile b/as10k1/gitcompile index e8a1c45..2089bd4 100755 --- a/as10k1/gitcompile +++ b/as10k1/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/echomixer/gitcompile b/echomixer/gitcompile index 3a5537d..0182277 100755 --- a/echomixer/gitcompile +++ b/echomixer/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi \ No newline at end of file diff --git a/envy24control/gitcompile b/envy24control/gitcompile index e8a1c45..2089bd4 100755 --- a/envy24control/gitcompile +++ b/envy24control/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/hdspconf/gitcompile b/hdspconf/gitcompile index e8a1c45..2089bd4 100755 --- a/hdspconf/gitcompile +++ b/hdspconf/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/hdsploader/gitcompile b/hdsploader/gitcompile index 5daa701..58328bd 100755 --- a/hdsploader/gitcompile +++ b/hdsploader/gitcompile @@ -1,11 +1,13 @@ #!/bin/bash -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/hdspmixer/gitcompile b/hdspmixer/gitcompile index 3a5537d..3a788f6 100755 --- a/hdspmixer/gitcompile +++ b/hdspmixer/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/ld10k1/gitcompile b/ld10k1/gitcompile index 5ddd1ec..99429ac 100755 --- a/ld10k1/gitcompile +++ b/ld10k1/gitcompile @@ -1,9 +1,11 @@ #!/bin/bash -autoreconf -fi +autoreconf -fi || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/mixartloader/gitcompile b/mixartloader/gitcompile index 5daa701..58328bd 100755 --- a/mixartloader/gitcompile +++ b/mixartloader/gitcompile @@ -1,11 +1,13 @@ #!/bin/bash -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/pcxhrloader/gitcompile b/pcxhrloader/gitcompile index 5daa701..58328bd 100755 --- a/pcxhrloader/gitcompile +++ b/pcxhrloader/gitcompile @@ -1,11 +1,13 @@ #!/bin/bash -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/qlo10k1/gitcompile b/qlo10k1/gitcompile index 5ddd1ec..99429ac 100755 --- a/qlo10k1/gitcompile +++ b/qlo10k1/gitcompile @@ -1,9 +1,11 @@ #!/bin/bash -autoreconf -fi +autoreconf -fi || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/rmedigicontrol/gitcompile b/rmedigicontrol/gitcompile index e8a1c45..2089bd4 100755 --- a/rmedigicontrol/gitcompile +++ b/rmedigicontrol/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/sb16_csp/gitcompile b/sb16_csp/gitcompile index e8a1c45..2089bd4 100755 --- a/sb16_csp/gitcompile +++ b/sb16_csp/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/seq/sbiload/gitcompile b/seq/sbiload/gitcompile index e8a1c45..2089bd4 100755 --- a/seq/sbiload/gitcompile +++ b/seq/sbiload/gitcompile @@ -10,16 +10,18 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing --copy -touch depcomp -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing --copy || exit 1 +touch depcomp || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/sscape_ctl/gitcompile b/sscape_ctl/gitcompile index 01e8151..738d436 100755 --- a/sscape_ctl/gitcompile +++ b/sscape_ctl/gitcompile @@ -10,15 +10,17 @@ if test "x$AUTOMAKE_DIR" = "x"; then fi for f in install-sh mkinstalldirs missing; do - cp -av $AUTOMAKE_DIR/$f . + cp -av $AUTOMAKE_DIR/$f . || exit 1 done -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/us428control/gitcompile b/us428control/gitcompile index 5daa701..58328bd 100755 --- a/us428control/gitcompile +++ b/us428control/gitcompile @@ -1,11 +1,13 @@ #!/bin/bash -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi diff --git a/usx2yloader/gitcompile b/usx2yloader/gitcompile index 5daa701..7126750 100755 --- a/usx2yloader/gitcompile +++ b/usx2yloader/gitcompile @@ -1,11 +1,13 @@ #!/bin/bash -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi \ No newline at end of file diff --git a/vxloader/gitcompile b/vxloader/gitcompile index 5daa701..58328bd 100755 --- a/vxloader/gitcompile +++ b/vxloader/gitcompile @@ -1,11 +1,13 @@ #!/bin/bash -aclocal $ACLOCAL_FLAGS -automake --foreign --add-missing -autoconf +aclocal $ACLOCAL_FLAGS || exit 1 +automake --foreign --add-missing || exit 1 +autoconf || exit 1 export CFLAGS='-O2 -Wall -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $@" -./configure $@ +./configure $@ || exit 1 unset CFLAGS -make +if [ -z "$GITCOMPILE_NO_MAKE" ]; then + make || exit 1 +fi From f0bb8866ce2cdf4b78839d2b8bba2cf165c0ed3d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 19:22:20 +0200 Subject: [PATCH 03/10] more gitcompile cleanups Signed-off-by: Jaroslav Kysela --- Makefile | 4 ++-- as10k1/gitcompile | 7 +++++-- envy24control/gitcompile | 7 +++++-- hdspconf/gitcompile | 5 ++++- hdsploader/gitcompile | 2 +- hdspmixer/gitcompile | 7 +++++-- rmedigicontrol/gitcompile | 7 +++++-- sscape_ctl/gitcompile | 7 +++++-- 8 files changed, 32 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index d6cde79..13646bb 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ usx2yloader vxloader echomixer ld10k1 qlo10k1 all: - @for i in $(SUBDIRS); do cd $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS); cd ..; make -C $$i; done + @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i || exit 1; done install: @for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install; done @@ -13,7 +13,7 @@ install: alsa-dist: @echo $(VERSION) >> $(TOP)/version @mkdir -p $(TOP)/distdir - @for i in $(SUBDIRS); do cd $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS); cd ..; make -C $$i alsa-dist; done + @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i alsa-dist || exit 1; done @mv distdir alsa-tools-$(VERSION) @tar --create --verbose --file=- alsa-tools-$(VERSION) | bzip2 -c -9 > alsa-tools-$(VERSION).tar.bz2 @mv alsa-tools-$(VERSION) distdir diff --git a/as10k1/gitcompile b/as10k1/gitcompile index 2089bd4..4725646 100755 --- a/as10k1/gitcompile +++ b/as10k1/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR" ; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR" ; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if test -z "$GITCOMPILE_NO_MAKE" ; then make || exit 1 fi diff --git a/envy24control/gitcompile b/envy24control/gitcompile index 2089bd4..14eb27b 100755 --- a/envy24control/gitcompile +++ b/envy24control/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if test -z "$GITCOMPILE_NO_MAKE" ; then make || exit 1 fi diff --git a/hdspconf/gitcompile b/hdspconf/gitcompile index 2089bd4..8eeab92 100755 --- a/hdspconf/gitcompile +++ b/hdspconf/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do diff --git a/hdsploader/gitcompile b/hdsploader/gitcompile index 58328bd..ae2be26 100755 --- a/hdsploader/gitcompile +++ b/hdsploader/gitcompile @@ -8,6 +8,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if test -z "$GITCOMPILE_NO_MAKE"; then make || exit 1 fi diff --git a/hdspmixer/gitcompile b/hdspmixer/gitcompile index 3a788f6..65196dd 100755 --- a/hdspmixer/gitcompile +++ b/hdspmixer/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if test -z "$GITCOMPILE_NO_MAKE"; then make || exit 1 fi diff --git a/rmedigicontrol/gitcompile b/rmedigicontrol/gitcompile index 2089bd4..c23547e 100755 --- a/rmedigicontrol/gitcompile +++ b/rmedigicontrol/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if test -z "$GITCOMPILE_NO_MAKE"; then make || exit 1 fi diff --git a/sscape_ctl/gitcompile b/sscape_ctl/gitcompile index 738d436..7495afe 100755 --- a/sscape_ctl/gitcompile +++ b/sscape_ctl/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -21,6 +24,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if test -z "$GITCOMPILE_NO_MAKE"; then make || exit 1 fi From d2492966a97816cf3ac3bdc4c695d5e234d8aafd Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 19:24:35 +0200 Subject: [PATCH 04/10] rmedigicontrol/gitcompile fixed typo Signed-off-by: Jaroslav Kysela --- rmedigicontrol/gitcompile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rmedigicontrol/gitcompile b/rmedigicontrol/gitcompile index c23547e..0a2ea6b 100755 --- a/rmedigicontrol/gitcompile +++ b/rmedigicontrol/gitcompile @@ -7,7 +7,7 @@ if test -z "$AUTOMAKE_DIR"; then if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi - if -z "$AUTOMAKE_DIR"; then + if test -z "$AUTOMAKE_DIR"; then AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` fi fi From 2a8feeba76bbafa47dd46aea6de3aca40e2b8804 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 19:27:24 +0200 Subject: [PATCH 05/10] sb16_csp/gitcompile improve automake directory detection Signed-off-by: Jaroslav Kysela --- sb16_csp/gitcompile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sb16_csp/gitcompile b/sb16_csp/gitcompile index 2089bd4..0f42e99 100755 --- a/sb16_csp/gitcompile +++ b/sb16_csp/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do @@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS" echo "./configure $@" ./configure $@ || exit 1 unset CFLAGS -if [ -z "$GITCOMPILE_NO_MAKE" ]; then +if -z "$GITCOMPILE_NO_MAKE"; then make || exit 1 fi From 07da82973156406eec1d36eb3166e6aa56ebdb8c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 19:33:36 +0200 Subject: [PATCH 06/10] improve Makefile error paths, improve automake directory detection for sbiload Signed-off-by: Jaroslav Kysela --- Makefile | 4 ++-- seq/Makefile | 8 ++++---- seq/sbiload/gitcompile | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 13646bb..9cd3079 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i || exit 1; done install: - @for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install; done + @for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install || exit 1; done alsa-dist: @echo $(VERSION) >> $(TOP)/version @@ -20,4 +20,4 @@ alsa-dist: clean: rm -rf *~ distdir - @for i in $(SUBDIRS); do make -C $$i clean; done + @for i in $(SUBDIRS); do make -C $$i clean || exit 1; done diff --git a/seq/Makefile b/seq/Makefile index de033bf..f499e77 100644 --- a/seq/Makefile +++ b/seq/Makefile @@ -1,13 +1,13 @@ SUBDIRS = sbiload all: - @for i in $(SUBDIRS); do cd $$i; ./gitcompile $(GITCOMPILE_ARGS); cd ..; $(MAKE) -C $$i; done + @for i in $(SUBDIRS); do cd $$i; echo $$1; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; $(MAKE) -C $$i; done install: - @for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) install; done + @for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) install || exit 1; done alsa-dist: - @for i in $(SUBDIRS); do $(MAKE) -C $$i alsa-dist; done + @for i in $(SUBDIRS); do $(MAKE) -C $$i alsa-dist || exit 1; done clean: - @for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done + @for i in $(SUBDIRS); do $(MAKE) -C $$i clean || exit 1; done diff --git a/seq/sbiload/gitcompile b/seq/sbiload/gitcompile index 2089bd4..8eeab92 100755 --- a/seq/sbiload/gitcompile +++ b/seq/sbiload/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do From a3102522e2428d874ea50db7d6cec19be4e62b5e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 19 Aug 2008 19:36:49 +0200 Subject: [PATCH 07/10] improved automake directory detection for echomixer tree Signed-off-by: Jaroslav Kysela --- echomixer/gitcompile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/echomixer/gitcompile b/echomixer/gitcompile index 0182277..39e35de 100755 --- a/echomixer/gitcompile +++ b/echomixer/gitcompile @@ -1,12 +1,15 @@ #!/bin/bash -if test "x$AUTOMAKE_DIR" = "x"; then +if test -z "$AUTOMAKE_DIR"; then if test -d /usr/local/share/automake; then AUTOMAKE_DIR=/usr/local/share/automake fi if test -d /usr/share/automake; then AUTOMAKE_DIR="/usr/share/automake" fi + if test -z "$AUTOMAKE_DIR"; then + AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1` + fi fi for f in install-sh mkinstalldirs missing; do From a726e5df68cc8ace667774792eb38d5c173f4ba5 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 9 Sep 2008 14:17:10 +0200 Subject: [PATCH 08/10] Added configure target to global Makefile and gitcompile to EXTRA_DIST Signed-off-by: Jaroslav Kysela --- Makefile | 35 +++++++++++++++++++++++++++++------ ac3dec/Makefile.am | 3 ++- echomixer/Makefile.am | 2 +- envy24control/Makefile.am | 5 +++-- hdspconf/Makefile.am | 2 +- hdsploader/Makefile.am | 2 +- hdspmixer/Makefile.am | 2 +- ld10k1/Makefile.am | 4 ++-- mixartloader/Makefile.am | 2 +- pcxhrloader/Makefile.am | 2 +- qlo10k1/Makefile.am | 3 ++- rmedigicontrol/Makefile.am | 2 +- sb16_csp/Makefile.am | 2 +- seq/Makefile | 5 ++++- seq/sbiload/Makefile.am | 2 +- sscape_ctl/Makefile.am | 2 +- us428control/Makefile.am | 2 +- usx2yloader/Makefile.am | 2 +- vxloader/Makefile.am | 2 +- 19 files changed, 55 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index 9cd3079..95fc809 100644 --- a/Makefile +++ b/Makefile @@ -1,21 +1,44 @@ VERSION = 1.0.17 TOP = . SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \ - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl us428control \ - usx2yloader vxloader echomixer ld10k1 qlo10k1 + mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ + us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 all: - @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i || exit 1; done + @for i in $(SUBDIRS); do \ + cd $(TOP)/$$i; echo $(TOP)/$$i; \ + ./gitcompile $(GITCOMPILE_ARGS) || exit 1; \ + cd ..; make -C $$i || exit 1; \ + done + +configure: + @for i in $(SUBDIRS); do \ + cd $(TOP)/$$i; echo $(TOP)/$$i; \ + if [ -x ./configure ]; then \ + ./configure $(CONFIGURE_ARGS) || exit 1; \ + else \ + make CONFIGURE_ARGS="$CONFIGURE_ARGS" configure || exit 1; \ + fi; \ + cd ..; make -C $$i || exit 1; \ + done install: - @for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install || exit 1; done + @for i in $(SUBDIRS); do \ + make -C $$i DESTDIR=$(DESTDIR) install || exit 1; \ + done alsa-dist: @echo $(VERSION) >> $(TOP)/version @mkdir -p $(TOP)/distdir - @for i in $(SUBDIRS); do cd $(TOP)/$$i; echo $(TOP)/$$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; make -C $$i alsa-dist || exit 1; done + @for i in $(SUBDIRS); do \ + cd $(TOP)/$$i; echo $(TOP)/$$i; \ + ./gitcompile $(GITCOMPILE_ARGS) || exit 1; \ + cd ..; make -C $$i alsa-dist || exit 1; \ + done + @cp Makefile gitcompile distdir @mv distdir alsa-tools-$(VERSION) - @tar --create --verbose --file=- alsa-tools-$(VERSION) | bzip2 -c -9 > alsa-tools-$(VERSION).tar.bz2 + @tar --create --verbose --file=- alsa-tools-$(VERSION) \ + | bzip2 -c -9 > alsa-tools-$(VERSION).tar.bz2 @mv alsa-tools-$(VERSION) distdir clean: diff --git a/ac3dec/Makefile.am b/ac3dec/Makefile.am index 583447c..bc1b2a5 100644 --- a/ac3dec/Makefile.am +++ b/ac3dec/Makefile.am @@ -10,7 +10,8 @@ ac3dec_SOURCES = ac3dec.c output.c ac3spdif.c ac3dec_DEPENDENCIES = libac3/libac3.a -EXTRA_DIST = README Changelog TODO plot_spectrum.m autogen.sh depcomp +EXTRA_DIST = gitcompile README Changelog TODO plot_spectrum.m autogen.sh \ + depcomp SUBDIRS = libac3 tools test . diff --git a/echomixer/Makefile.am b/echomixer/Makefile.am index 266fc8f..e90ece2 100644 --- a/echomixer/Makefile.am +++ b/echomixer/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = echomixer man_MANS = echomixer_SOURCES = echomixer.c echomixer_LDFLAGS = @ECHOMIXER_LIBS@ -EXTRA_DIST = configure.in-gtk1 configure.in-gtk2 +EXTRA_DIST = git-compile configure.in-gtk1 configure.in-gtk2 AUTOMAKE_OPTIONS = foreign alsa-dist: distdir diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am index 96cbad4..72fe707 100644 --- a/envy24control/Makefile.am +++ b/envy24control/Makefile.am @@ -5,8 +5,9 @@ envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \ mixer.c patchbay.c hardware.c driverevents.c volume.c \ profiles.c profiles.h midi.h config.c config.h envy24control_LDFLAGS = @ENVY24CONTROL_LIBS@ -EXTRA_DIST = envy24control.1 depcomp configure.in-gtk1 configure.in-gtk2 \ - strstr_icase_blank.c new_process.c README.profiles +EXTRA_DIST = gitcompile envy24control.1 depcomp configure.in-gtk1 \ + configure.in-gtk2 strstr_icase_blank.c new_process.c \ + README.profiles AUTOMAKE_OPTIONS = foreign alsa-dist: distdir diff --git a/hdspconf/Makefile.am b/hdspconf/Makefile.am index 2e57828..e4a4bd8 100644 --- a/hdspconf/Makefile.am +++ b/hdspconf/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = hdspconf.desktop depcomp +EXTRA_DIST = gitcompile hdspconf.desktop depcomp SUBDIRS = src pixmaps desktopdir = $(DESKTOP_DIR) diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am index 987c77e..17cedc7 100644 --- a/hdsploader/Makefile.am +++ b/hdsploader/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\" hdsploader_SOURCES = hdsploader.c -EXTRA_DIST = depcomp +EXTRA_DIST = gitcompile depcomp alsa-dist: distdir @rm -rf ../distdir/$(MYNAME) diff --git a/hdspmixer/Makefile.am b/hdspmixer/Makefile.am index 8546d71..86a759c 100644 --- a/hdspmixer/Makefile.am +++ b/hdspmixer/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = hdspmixer.desktop depcomp +EXTRA_DIST = gitcompile hdspmixer.desktop depcomp SUBDIRS = src pixmaps desktopdir = $(DESKTOP_DIR) diff --git a/ld10k1/Makefile.am b/ld10k1/Makefile.am index f126058..b79a55f 100644 --- a/ld10k1/Makefile.am +++ b/ld10k1/Makefile.am @@ -16,8 +16,8 @@ CLEANFILES = ld10k1d noinst_HEADERS = -EXTRA_DIST = ld10k1.m4 AUTHORS COPYING COPYING.LIB ChangeLog INSTALL \ - README TODO ld10k1d.in +EXTRA_DIST = gitcompile ld10k1.m4 AUTHORS COPYING COPYING.LIB ChangeLog \ + INSTALL README TODO ld10k1d.in alsa-dist: distdir @rm -rf ../distdir/ld10k1 diff --git a/mixartloader/Makefile.am b/mixartloader/Makefile.am index 2a0d25f..1b488c4 100644 --- a/mixartloader/Makefile.am +++ b/mixartloader/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = mixartloader mixartloader_SOURCES = mixartloader.c -EXTRA_DIST = depcomp +EXTRA_DIST = gitcompile depcomp alsa-dist: distdir @rm -rf ../distdir/$(MYNAME) diff --git a/pcxhrloader/Makefile.am b/pcxhrloader/Makefile.am index 1352f59..e6a0107 100644 --- a/pcxhrloader/Makefile.am +++ b/pcxhrloader/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = pcxhrloader pcxhrloader_SOURCES = pcxhrloader.c -EXTRA_DIST = depcomp +EXTRA_DIST = gitcompile depcomp alsa-dist: distdir @rm -rf ../distdir/$(MYNAME) diff --git a/qlo10k1/Makefile.am b/qlo10k1/Makefile.am index 9e35092..ef522bf 100644 --- a/qlo10k1/Makefile.am +++ b/qlo10k1/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = src -EXTRA_DIST = COPYING configure.in README NEWS AUTHORS TODO INSTALL ChangeLog +EXTRA_DIST = gitcompile COPYING configure.in README NEWS AUTHORS TODO \ + INSTALL ChangeLog alsa-dist: distdir @rm -rf ../distdir/qlo10k1 diff --git a/rmedigicontrol/Makefile.am b/rmedigicontrol/Makefile.am index 293fe6a..88e9a3f 100644 --- a/rmedigicontrol/Makefile.am +++ b/rmedigicontrol/Makefile.am @@ -4,7 +4,7 @@ rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c rmedigicontrol_LDFLAGS = @RMEDIGICONTROL_LIBS@ -EXTRA_DIST = depcomp configure.in-gtk1 configure.in-gtk2 +EXTRA_DIST = gitcompile depcomp configure.in-gtk1 configure.in-gtk2 AUTOMAKE_OPTIONS = foreign alsa-dist: distdir diff --git a/sb16_csp/Makefile.am b/sb16_csp/Makefile.am index 503b328..be85d9b 100644 --- a/sb16_csp/Makefile.am +++ b/sb16_csp/Makefile.am @@ -6,7 +6,7 @@ man_MANS = cspctl.1 cspctl_SOURCES = cspctl.c -EXTRA_DIST = README COPYING cspctl.1 depcomp +EXTRA_DIST = gitcompile README COPYING cspctl.1 depcomp alsa-dist: distdir @rm -rf ../distdir/sb16_csp diff --git a/seq/Makefile b/seq/Makefile index f499e77..f460ece 100644 --- a/seq/Makefile +++ b/seq/Makefile @@ -1,7 +1,10 @@ SUBDIRS = sbiload all: - @for i in $(SUBDIRS); do cd $$i; echo $$1; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; $(MAKE) -C $$i; done + @for i in $(SUBDIRS); do cd $$i; echo $$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; $(MAKE) -C $$i; done + +configure: + @for i in $(SUBDIRS); do cd $$i; echo $$i; ./configure $(CONFIGURE_ARGS) || exit 1; cd ..; $(MAKE) -C $$i; done install: @for i in $(SUBDIRS); do $(MAKE) -C $$i DESTDIR=$(DESTDIR) install || exit 1; done diff --git a/seq/sbiload/Makefile.am b/seq/sbiload/Makefile.am index ba214ac..a237761 100644 --- a/seq/sbiload/Makefile.am +++ b/seq/sbiload/Makefile.am @@ -11,7 +11,7 @@ sbiload_SOURCES = sbiload.c patchdir = $(datadir)/sounds/opl3 patch_DATA = std.o3 drums.o3 std.sb drums.sb -EXTRA_DIST = README COPYING depcomp std.o3 drums.o3 std.sb drums.sb +EXTRA_DIST = gitcompile README COPYING depcomp std.o3 drums.o3 std.sb drums.sb alsa-dist: distdir @rm -rf ../../distdir/seq/sbiload diff --git a/sscape_ctl/Makefile.am b/sscape_ctl/Makefile.am index cd85e49..118edae 100644 --- a/sscape_ctl/Makefile.am +++ b/sscape_ctl/Makefile.am @@ -5,7 +5,7 @@ bin_PROGRAMS = sscape_ctl sscape_ctl_SOURCES = sscape_ctl.c -EXTRA_DIST = depcomp +EXTRA_DIST = gitcompile depcomp alsa-dist: distdir @rm -rf ../distdir/sscape_ctl diff --git a/us428control/Makefile.am b/us428control/Makefile.am index e15f39a..d1aef71 100644 --- a/us428control/Makefile.am +++ b/us428control/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = us428control us428control_SOURCES = us428control.cc Cus428State.cc Cus428_ctls.cc Cus428Midi.cc noinst_HEADERS = usbus428ctldefs.h Cus428State.h Cus428_ctls.h Cus428Midi.h -EXTRA_DIST = depcomp +EXTRA_DIST = gitcompile depcomp alsa-dist: distdir @rm -rf ../distdir/us428control diff --git a/usx2yloader/Makefile.am b/usx2yloader/Makefile.am index 89e8741..4cc9a70 100644 --- a/usx2yloader/Makefile.am +++ b/usx2yloader/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = usx2yloader usx2yloader_SOURCES = usx2yloader.c -EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in +EXTRA_DIST = gitcompile depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga hotplugdir = /etc/hotplug/usb diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am index dcb4aeb..415d776 100644 --- a/vxloader/Makefile.am +++ b/vxloader/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = vxloader vxloader_SOURCES = vxloader.c -EXTRA_DIST = depcomp +EXTRA_DIST = gitcompile depcomp alsa-dist: distdir @rm -rf ../distdir/$(MYNAME) From 1cdcc3638aee2b24e16b85baa299682013e41c24 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 9 Sep 2008 14:30:00 +0200 Subject: [PATCH 09/10] Fix the gitcompile addition to EXTRA_DIST - echomixer Signed-off-by: Jaroslav Kysela --- echomixer/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/echomixer/Makefile.am b/echomixer/Makefile.am index e90ece2..a9dfaf0 100644 --- a/echomixer/Makefile.am +++ b/echomixer/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = echomixer man_MANS = echomixer_SOURCES = echomixer.c echomixer_LDFLAGS = @ECHOMIXER_LIBS@ -EXTRA_DIST = git-compile configure.in-gtk1 configure.in-gtk2 +EXTRA_DIST = gitcompile configure.in-gtk1 configure.in-gtk2 AUTOMAKE_OPTIONS = foreign alsa-dist: distdir From 8a3b9b29010669c085f1821ebc6b6a2672d8d93a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 9 Sep 2008 14:48:16 +0200 Subject: [PATCH 10/10] Added seq/gitcompile and seq/Makefile to tarball Signed-off-by: Jaroslav Kysela --- seq/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/seq/Makefile b/seq/Makefile index f460ece..e6db62e 100644 --- a/seq/Makefile +++ b/seq/Makefile @@ -1,4 +1,5 @@ SUBDIRS = sbiload +TOP = .. all: @for i in $(SUBDIRS); do cd $$i; echo $$i; ./gitcompile $(GITCOMPILE_ARGS) || exit 1; cd ..; $(MAKE) -C $$i; done @@ -11,6 +12,7 @@ install: alsa-dist: @for i in $(SUBDIRS); do $(MAKE) -C $$i alsa-dist || exit 1; done + @cp gitcompile Makefile $(TOP)/distdir/seq clean: @for i in $(SUBDIRS); do $(MAKE) -C $$i clean || exit 1; done