more gitcompile cleanups

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2008-08-19 19:22:20 +02:00
parent 880926b3cd
commit f0bb8866ce
8 changed files with 32 additions and 14 deletions

View file

@ -5,7 +5,7 @@ SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
usx2yloader vxloader echomixer ld10k1 qlo10k1 usx2yloader vxloader echomixer ld10k1 qlo10k1
all: 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: install:
@for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install; done @for i in $(SUBDIRS); do make -C $$i DESTDIR=$(DESTDIR) install; done
@ -13,7 +13,7 @@ install:
alsa-dist: alsa-dist:
@echo $(VERSION) >> $(TOP)/version @echo $(VERSION) >> $(TOP)/version
@mkdir -p $(TOP)/distdir @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) @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 @mv alsa-tools-$(VERSION) distdir

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR" ; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if test -z "$AUTOMAKE_DIR" ; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do
@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
echo "./configure $@" echo "./configure $@"
./configure $@ || exit 1 ./configure $@ || exit 1
unset CFLAGS unset CFLAGS
if [ -z "$GITCOMPILE_NO_MAKE" ]; then if test -z "$GITCOMPILE_NO_MAKE" ; then
make || exit 1 make || exit 1
fi fi

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR"; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if test -z "$AUTOMAKE_DIR"; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do
@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
echo "./configure $@" echo "./configure $@"
./configure $@ || exit 1 ./configure $@ || exit 1
unset CFLAGS unset CFLAGS
if [ -z "$GITCOMPILE_NO_MAKE" ]; then if test -z "$GITCOMPILE_NO_MAKE" ; then
make || exit 1 make || exit 1
fi fi

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR"; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if test -z "$AUTOMAKE_DIR"; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do

View file

@ -8,6 +8,6 @@ echo "CFLAGS=$CFLAGS"
echo "./configure $@" echo "./configure $@"
./configure $@ || exit 1 ./configure $@ || exit 1
unset CFLAGS unset CFLAGS
if [ -z "$GITCOMPILE_NO_MAKE" ]; then if test -z "$GITCOMPILE_NO_MAKE"; then
make || exit 1 make || exit 1
fi fi

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR"; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if test -z "$AUTOMAKE_DIR"; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do
@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
echo "./configure $@" echo "./configure $@"
./configure $@ || exit 1 ./configure $@ || exit 1
unset CFLAGS unset CFLAGS
if [ -z "$GITCOMPILE_NO_MAKE" ]; then if test -z "$GITCOMPILE_NO_MAKE"; then
make || exit 1 make || exit 1
fi fi

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR"; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if -z "$AUTOMAKE_DIR"; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do
@ -22,6 +25,6 @@ echo "CFLAGS=$CFLAGS"
echo "./configure $@" echo "./configure $@"
./configure $@ || exit 1 ./configure $@ || exit 1
unset CFLAGS unset CFLAGS
if [ -z "$GITCOMPILE_NO_MAKE" ]; then if test -z "$GITCOMPILE_NO_MAKE"; then
make || exit 1 make || exit 1
fi fi

View file

@ -1,12 +1,15 @@
#!/bin/bash #!/bin/bash
if test "x$AUTOMAKE_DIR" = "x"; then if test -z "$AUTOMAKE_DIR"; then
if test -d /usr/local/share/automake; then if test -d /usr/local/share/automake; then
AUTOMAKE_DIR=/usr/local/share/automake AUTOMAKE_DIR=/usr/local/share/automake
fi fi
if test -d /usr/share/automake; then if test -d /usr/share/automake; then
AUTOMAKE_DIR="/usr/share/automake" AUTOMAKE_DIR="/usr/share/automake"
fi fi
if test -z "$AUTOMAKE_DIR"; then
AUTOMAKE_DIR=/usr/share/`ls /usr/share | grep automake | tail -n 1`
fi
fi fi
for f in install-sh mkinstalldirs missing; do for f in install-sh mkinstalldirs missing; do
@ -21,6 +24,6 @@ echo "CFLAGS=$CFLAGS"
echo "./configure $@" echo "./configure $@"
./configure $@ || exit 1 ./configure $@ || exit 1
unset CFLAGS unset CFLAGS
if [ -z "$GITCOMPILE_NO_MAKE" ]; then if test -z "$GITCOMPILE_NO_MAKE"; then
make || exit 1 make || exit 1
fi fi