Added configure target to global Makefile and gitcompile to EXTRA_DIST

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/Makefile b/Makefile
index 9cd307923a7ea70013aa22bafc3ee1880ca2dd4a..95fc809a710ceb28df1a807bee511c2617ff7ac1 100644 (file)
--- 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 583447c0c9a8983dc71e819363a9db1aa4553bb2..bc1b2a518026874b3c6b33544d2528786a649cff 100644 (file)
--- 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 266fc8f111b000397bb768eadffb20d7fef3d92f..e90ece249309132847265f8ae7312a123d6666ba 100644 (file)
--- 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 96cbad4aec1254a3b14dfbd667893aceb3933661..72fe70712b9d55ec4909225229f773cef7cc710f 100644 (file)
--- 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 2e5782863f009f7a2b0b833ac0cf397eec97e66d..e4a4bd85f0333f01b643db08d4bad22e553e844b 100644 (file)
--- 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 987c77e3d57864b11dd536f9b9888dfddb726a97..17cedc7f17f565bae6e90482a5b14e212c59a35d 100644 (file)
--- 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 8546d717a76d065c9d7eba4cdd11573649490465..86a759c3da8c03e2692395a68866024c1b395db4 100644 (file)
--- 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 f126058e2b16f63a23e86a31271750e309081597..b79a55f6ea98e26f1079932d7c7c69a6f6a1ef3d 100644 (file)
--- 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 2a0d25f2a509d623e75d04a56cceaa1d528a6a35..1b488c4991b11575536577f9ebaf5dac68d0e302 100644 (file)
--- 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 1352f599631219412a7c5f59cf09364e051c37d5..e6a01079944cd338e3333fb7f638b2c9a0875385 100644 (file)
--- 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 9e35092bb3c861c9914f7e2f631febeace8af44e..ef522bfb415cd19b79dc8714d90d5e9e4837d4ae 100644 (file)
--- 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 293fe6adef4c0966ee8116c96d5f9022801dadc1..88e9a3fb0b88f0d02e4d910116035385b599ec1c 100644 (file)
--- 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 503b328df5581a683dd3d3745c7c1fe9f1555c51..be85d9b47976abf492a3be83404e66df42f4c659 100644 (file)
--- 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 f499e77a930e486a442e36281253e11cc403862d..f460ece55069edc261012f3ea4c6d4132dd8cd3d 100644 (file)
--- 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 ba214acb211cc3b9cdc51cd2304e11a53682df3e..a2377614e9d7ab1eb5c52df57bd9d12c521f1930 100644 (file)
--- 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 cd85e49a0bd22f44bd0857f0b4227f14ec6ced64..118edae8220b7f4409913186725cbd3a7023e7a9 100644 (file)
--- 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 e15f39a24b1fb26d604baf630bb119a251ed759f..d1aef7197e50a3130307191964de0ee198127cb5 100644 (file)
--- 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 89e87411428992e8feae2894c8b822631c99b4f0..4cc9a7005af6db30f26cdc13ed59c9029a809065 100644 (file)
--- 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 dcb4aebf9ccb39a96f84bbddf63761211d7ddd49..415d77608dc9d335c6644740c6b09301958678da 100644 (file)
--- 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)