Skip to contentSkip to conversation

Building ALSA away from the source tree: some patches

PATCH Bernard Leak 2 participants 8 messages Aug 16, 2005 – Aug 23, 2005

lore
Share & tools
lore
#0 lore raw

Dear List,
this is a one-off contribution, so I'm not subscribing.
alsa (version 1.0.7) had trouble building in separate build
directories: so does version 1.0.9, but the problems are a bit different.

The following patches makes it possible (for me, anyway!) to
build. See, in particular, the comments before the second patch, for building alsa-utils-1.0.9.

For alsa-lib-1.0.9:
***********************************
#Output o f diff -ru alsa-lib-1.0.9/include/Makefile.am{-old,}

include/Makefile.am 2005-08-16 21:38:08.000000000 +0100 renamed from include/Makefile.am-old 2005-04-14 15:01:10.000000000 +0100 +1 -1
@@ -12,10 +12,13 @@
              pcm_ordinary.h mixer_ordinary.h \
              alisp.h pcm_external.h pcm_ioplug.h pcm_extplug.h
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
+noinst_HEADERS = alsa sys.h search.h list.h aserver.h local.h alsa-symbols.h
 

CLEANFILES = stamp-vh version.h alsa

+alsa:
+ ln -s $(top_srcdir)/include alsa
+
version.h: stamp-vh

    @:

@@ -45,4 +48,4 @@

install-data-hook:

    test -d $(DESTDIR)$(sysincludedir) || mkdir -p 

$(DESTDIR)$(sysincludedir)
- $(INSTALL_DATA) sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
+ $(INSTALL_DATA) $(srcdir)/sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h

#Output o f diff -ru alsa-lib-1.0.9/include/Makefile.in{-old,}

include/Makefile.in 2005-08-16 21:38:08.000000000 +0100 renamed from include/Makefile.in-old 2005-05-27 14:12:08.000000000 +0100 +1 -1
@@ -162,7 +162,7 @@
              alisp.h pcm_external.h pcm_ioplug.h pcm_extplug.h
 
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
+noinst_HEADERS = alsa sys.h search.h list.h aserver.h local.h alsa-symbols.h
 

CLEANFILES = stamp-vh version.h alsa

@@ -507,6 +507,9 @@
uninstall-info-am uninstall-info-recursive uninstall-recursive

+alsa:
+ $(LN_S) $(top_srcdir)/include alsa
+
version.h: stamp-vh

    @:

@@ -534,7 +537,7 @@

install-data-hook:

    test -d $(DESTDIR)$(sysincludedir) || mkdir -p 

$(DESTDIR)$(sysincludedir)
- $(INSTALL_DATA) sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
+ $(INSTALL_DATA) $(srcdir)/sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT:

#Output o f diff -ru alsa-lib-1.0.9/src/Makefile.am{-old,}

src/Makefile.am 2005-08-16 21:38:08.000000000 +0100 renamed from src/Makefile.am-old 2005-05-10 11:52:30.000000000 +0100 +0 -0
@@ -1,9 +1,9 @@

SUBDIRS=control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp -EXTRA_DIST=Versions
+EXTRA_DIST=$(srcdir)/Versions
COMPATNUM=@LIBTOOL_VERSION_INFO@

if VERSIONED_SYMBOLS
-VSYMS = -Wl,--version-script=Versions
+VSYMS = -Wl,--version-script=$(srcdir)/Versions
else
VSYMS =
endif

#Output o f diff -ru alsa-lib-1.0.9/src/Makefile.in{-old,}

src/Makefile.in 2005-08-16 21:42:16.000000000 +0100 renamed from src/Makefile.in-old 2005-05-27 14:12:09.000000000 +0100 +0 -0
@@ -148,10 +148,10 @@

target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp -EXTRA_DIST = Versions
+EXTRA_DIST = $(srcdir)/Versions
COMPATNUM = @LIBTOOL_VERSION_INFO@

-@VERSIONED_SYMBOLS_TRUE@VSYMS = -Wl,--version-script=Versions +@VERSIONED_SYMBOLS_TRUE@VSYMS = -Wl,--version-script=$(srcdir)/Versions @VERSIONED_SYMBOLS_FALSE@VSYMS =

lib_LTLIBRARIES = libasound.la

********************************************
[alsa-plugins-1.0.9: no patch needed]

For alsa-utils-1.0.9: the build machinery is unclean, and this does not make it much cleaner. Specifically, alsaconf/po/Makefile.in seems not to be generated from a Makefile.am: it lacks some important targets (clean, check...). I really ought to back-form a Makefile.am file, but I haven't bothered.

****************************************
#Output of diff -ru alsa-utils-1.0.9/alsaconf/po/Makefile.in{-old,}

alsaconf/po/Makefile.in 2005-08-16 22:56:04.000000000 +0100 renamed from alsaconf/po/Makefile.in-old 2005-01-13 15:32:56.000000000 +0000 +0 -0
@@ -7,6 +7,7 @@
 

top_builddir = ../..

+srcdir = @srcdir@
datadir = @datadir@
exec_prefix = @exec_prefix@
prefix = @prefix@
@@ -33,24 +34,26 @@

.SUFFIXES: .po .gmo .mo

-.po.mo:
+%.mo : $(srcdir)/%.po

    $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@

-.po.gmo:
- @lang=echo $* | sed -e 's,.*/,,'; \
- rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+%.gmo : $(srcdir)/%.po
+ @lang=echo $(srcdir)/$* | sed -e 's,.*/,,'; \
+ rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo

$(DOMAIN).pot: $(GETTEXT_SRC)

    $(XGETTEXT) -o$@ --default-domain=$(DOMAIN) \
      --add-comments=TRANSLATORS: --language=Shell \
      $(XGETTEXT_OPTIONS) $<

+check check_recursive:
+
clean:

    rm -f $(CATALOGS) $(POFILES:.po=.mo) $(DOMAIN).pot

update-po: $(DOMAIN).pot

    @for po in $(POFILES); do \

- $(MSGMERGE_UPDATE) $$po $(DOMAIN).pot; \
+ $(MSGMERGE_UPDATE) $(srcdir)/$$po $(DOMAIN).pot; \
done

install-data-no:

#Output of diff -ru alsa-utils-1.0.9/alsaconf/Makefile.am{-old,}

alsaconf/Makefile.am 2005-08-16 23:04:13.000000000 +0100 renamed from alsaconf/Makefile.am-old 2005-05-13 13:14:16.000000000 +0100 +0 -0
@@ -17,7 +17,7 @@
      esac; \
      $(mkinstalldirs) $(DESTDIR)$(mandir)$$loc/man$$ext; \
      echo " $(INSTALL_DATA) $$i 

$(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
done

uninstall-man8:
#Output of diff -ru alsa-utils-1.0.9/alsaconf/Makefile.in{-old,}

alsaconf/Makefile.in 2005-08-16 23:03:57.000000000 +0100 renamed from alsaconf/Makefile.in-old 2005-05-27 14:21:16.000000000 +0100 +0 -0
@@ -472,7 +472,7 @@
      esac; \
      $(mkinstalldirs) $(DESTDIR)$(mandir)$$loc/man$$ext; \
      echo " $(INSTALL_DATA) $$i 

$(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
+ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
done

uninstall-man8:

**********************************************************

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf

#1 lore raw

At Tue, 16 Aug 2005 23:55:55 +0100,

Quoted 10 lines · Bernard Leak

Dear List,
this is a one-off contribution, so I'm not subscribing.
alsa (version 1.0.7) had trouble building in separate build
directories: so does version 1.0.9, but the problems are a bit different.

The following patches makes it possible (for me, anyway!) to
build. See, in particular, the comments before the second patch, for building alsa-utils-1.0.9.

The patches look almost fine to me, but they are broken because of the bad behavior of your mailer, replacing tab with spaces.
In addition, some of targeted files look wrong: they should be Makefile.am instead of Makefile.in.

Could you prepare the patches with fixes above? You can attach the file.
Also, please attach one patch per post with description.

Thanks,

Takashi

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf

#2 lore raw

Dear List,

Quoted 3 lines · Takashi Iwai
Quoted 2 lines

The patches look almost fine to me, but they are broken because of the bad behavior of your mailer, replacing tab with spaces.

My MTA has been sent to bed with no supper, and will be allowed no GUI for a month.

Quoted 2 lines

In addition, some of targeted files look wrong: they should be Makefile.am instead of Makefile.in.

The patches deliberately cover Makefile.am and Makefile.in.
(a) All of these are part of the release I am patching.
(b) I wanted to show a minimalist set of changes to the Makefile.in files. The diffs after I run my copy of automake are mostly version-specific junk, and I wanted to produce a clean replacement which won't screw up anyone who doesn't share my autotools chain.
(c) alsa-utils-1.0.9/alsaconf/po/Makefile.in was released with no corresponding Makefile.am file.

Anyway, I'll try again.

Bernard Leak.
--
Before they made me, they broke the mould.

#Output o f diff -ru alsa-lib-1.0.9/include/Makefile.am{-old,}

include/Makefile.am renamed from include/Makefile.am-old +5 -2
@@ -12,10 +12,13 @@
 		      pcm_ordinary.h mixer_ordinary.h \
 		      alisp.h pcm_external.h pcm_ioplug.h pcm_extplug.h
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
+noinst_HEADERS = alsa sys.h search.h list.h aserver.h local.h alsa-symbols.h
 
 CLEANFILES = stamp-vh version.h alsa
 
+alsa:
+	ln -s $(top_srcdir)/include alsa
+
 version.h: stamp-vh
 	@:
 
@@ -45,4 +48,4 @@
 
 install-data-hook:
 	test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir)
-	$(INSTALL_DATA) sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
+	$(INSTALL_DATA) $(srcdir)/sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h

#Output o f diff -ru alsa-lib-1.0.9/include/Makefile.in{-old,}

include/Makefile.in renamed from include/Makefile.in-old +5 -2
@@ -162,7 +162,7 @@
 		      alisp.h pcm_external.h pcm_ioplug.h pcm_extplug.h
 
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
+noinst_HEADERS = alsa sys.h search.h list.h aserver.h local.h alsa-symbols.h
 
 CLEANFILES = stamp-vh version.h alsa
 
@@ -507,6 +507,9 @@
 	uninstall-info-am uninstall-info-recursive uninstall-recursive
 
 
+alsa:
+	$(LN_S) $(top_srcdir)/include alsa
+
 version.h: stamp-vh
 	@:
 
@@ -534,7 +537,7 @@
 
 install-data-hook:
 	test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir)
-	$(INSTALL_DATA) sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
+	$(INSTALL_DATA) $(srcdir)/sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

#Output o f diff -ru alsa-lib-1.0.9/src/Makefile.am{-old,}

src/Makefile.am renamed from src/Makefile.am-old +2 -2
@@ -1,9 +1,9 @@
 SUBDIRS=control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp
-EXTRA_DIST=Versions
+EXTRA_DIST=$(srcdir)/Versions
 COMPATNUM=@LIBTOOL_VERSION_INFO@
 
 if VERSIONED_SYMBOLS
-VSYMS = -Wl,--version-script=Versions
+VSYMS = -Wl,--version-script=$(srcdir)/Versions
 else
 VSYMS =
 endif

#Output o f diff -ru alsa-lib-1.0.9/src/Makefile.in{-old,}

src/Makefile.in renamed from src/Makefile.in-old +2 -2
@@ -148,10 +148,10 @@
 target_os = @target_os@
 target_vendor = @target_vendor@
 SUBDIRS = control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp
-EXTRA_DIST = Versions
+EXTRA_DIST = $(srcdir)/Versions
 COMPATNUM = @LIBTOOL_VERSION_INFO@
 
-@VERSIONED_SYMBOLS_TRUE@VSYMS = -Wl,--version-script=Versions
+@VERSIONED_SYMBOLS_TRUE@VSYMS = -Wl,--version-script=$(srcdir)/Versions
 @VERSIONED_SYMBOLS_FALSE@VSYMS = 
 
 lib_LTLIBRARIES = libasound.la

#Output of diff -ru alsa-utils-1.0.9/alsaconf/po/Makefile.in{-old,}

alsaconf/po/Makefile.in renamed from alsaconf/po/Makefile.in-old +8 -5
@@ -7,6 +7,7 @@
 
 top_builddir = ../..
 
+srcdir = @srcdir@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 prefix = @prefix@
@@ -33,24 +34,26 @@
 
 .SUFFIXES: .po .gmo .mo
 
-.po.mo:
+%.mo : $(srcdir)/%.po
 	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+%.gmo : $(srcdir)/%.po
+	@lang=`echo $(srcdir)/$* | sed -e 's,.*/,,'`; \
+	rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
 $(DOMAIN).pot: $(GETTEXT_SRC)
 	$(XGETTEXT) -o$@ --default-domain=$(DOMAIN) \
 	  --add-comments=TRANSLATORS: --language=Shell \
 	  $(XGETTEXT_OPTIONS) $<
 
+check check_recursive:
+
 clean:
 	rm -f $(CATALOGS) $(POFILES:.po=.mo) $(DOMAIN).pot
 
 update-po: $(DOMAIN).pot
 	@for po in $(POFILES); do \
-	$(MSGMERGE_UPDATE) $$po $(DOMAIN).pot; \
+	$(MSGMERGE_UPDATE) $(srcdir)/$$po $(DOMAIN).pot; \
 	done
 
 install-data-no:

#Output of diff -ru alsa-utils-1.0.9/alsaconf/Makefile.am{-old,}

alsaconf/Makefile.am renamed from alsaconf/Makefile.am-old +1 -1
@@ -17,7 +17,7 @@
 	  esac; \
 	  $(mkinstalldirs) $(DESTDIR)$(mandir)$$loc/man$$ext; \
 	  echo " $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext"; \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
 	done
 
 uninstall-man8:

#Output of diff -ru alsa-utils-1.0.9/alsaconf/Makefile.in{-old,}

alsaconf/Makefile.in renamed from alsaconf/Makefile.in-old +1 -1
@@ -472,7 +472,7 @@
 	  esac; \
 	  $(mkinstalldirs) $(DESTDIR)$(mandir)$$loc/man$$ext; \
 	  echo " $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext"; \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
 	done
 
 uninstall-man8:
#3 lore raw

At Mon, 22 Aug 2005 22:00:18 +0100,

Quoted 5 lines · Bernard Leak
Quoted 3 lines

In addition, some of targeted files look wrong: they should be Makefile.am instead of Makefile.in.

The patches deliberately cover Makefile.am and Makefile.in.

We don't need patches to Makefile.in if Makefile.am exists.

Quoted 9 lines

(a) All of these are part of the release I am patching.
(b) I wanted to show a minimalist set of changes to the Makefile.in files. The diffs after I run my copy of automake are mostly version-specific junk, and I wanted to produce a clean replacement which won't screw up anyone who doesn't share my autotools chain.
(c) alsa-utils-1.0.9/alsaconf/po/Makefile.in was released with no corresponding Makefile.am file.

Yep, this is intentional. The patch to Makefile.in is necessary only to this.

Quoted 1 line

Anyway, I'll try again.

Thanks. But please attach one patch per one file.
Also, don't forget to add the description of the patch (to commit as the changelog).

Takashi

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf

#4 lore raw

Dear List,

Takashi Iwai wrote

Quoted 5 lines

Thanks. But please attach one patch per one file.
Also, don't forget to add the description of the patch (to commit as the changelog).

Aargh! I shouldn't send patches so late at night:
I misunderstood/forgot/went blank on the instructions.

I am very likely being dense here, but it is not obvious *how* I specify a description to use as a CVS commitment comment... A quick scan of recent threads with patches attached seems not to help.

I suggest:
Allow separate build and source trees

... which will do for both alsa-lib and alsa-utils, though the patches for these two packages are independent.

Bernard Leak.
--
Before they made me, they broke the mould.

#Output of diff -ru alsa-lib-1.0.9/include/Makefile.am{-old,}

include/Makefile.am renamed from include/Makefile.am-old +5 -2
@@ -12,10 +12,13 @@
 		      pcm_ordinary.h mixer_ordinary.h \
 		      alisp.h pcm_external.h pcm_ioplug.h pcm_extplug.h
 
-noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
+noinst_HEADERS = alsa sys.h search.h list.h aserver.h local.h alsa-symbols.h
 
 CLEANFILES = stamp-vh version.h alsa
 
+alsa:
+	ln -s $(top_srcdir)/include alsa
+
 version.h: stamp-vh
 	@:
 
@@ -45,4 +48,4 @@
 
 install-data-hook:
 	test -d $(DESTDIR)$(sysincludedir) || mkdir -p $(DESTDIR)$(sysincludedir)
-	$(INSTALL_DATA) sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h
+	$(INSTALL_DATA) $(srcdir)/sys.h $(DESTDIR)$(sysincludedir)/asoundlib.h

#Output of diff -ru alsa-lib-1.0.9/src/Makefile.am{-old,}

src/Makefile.am renamed from src/Makefile.am-old +2 -2
@@ -1,9 +1,9 @@
 SUBDIRS=control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp
-EXTRA_DIST=Versions
+EXTRA_DIST=$(srcdir)/Versions
 COMPATNUM=@LIBTOOL_VERSION_INFO@
 
 if VERSIONED_SYMBOLS
-VSYMS = -Wl,--version-script=Versions
+VSYMS = -Wl,--version-script=$(srcdir)/Versions
 else
 VSYMS =
 endif

#Output o f diff -ru alsa-lib-1.0.9/src/Makefile.in{-old,}

#Output of diff -ru alsa-utils-1.0.9/alsaconf/Makefile.am{-old,}

alsaconf/Makefile.am renamed from alsaconf/Makefile.am-old +1 -1
@@ -17,7 +17,7 @@
 	  esac; \
 	  $(mkinstalldirs) $(DESTDIR)$(mandir)$$loc/man$$ext; \
 	  echo " $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext"; \
-	  $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
+	  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(mandir)$$loc/man$$ext/$$inst.$$ext; \
 	done
 
 uninstall-man8:

#Output of diff -ru alsa-utils-1.0.9/alsaconf/po/Makefile.in{-old,}

alsaconf/po/Makefile.in renamed from alsaconf/po/Makefile.in-old +8 -5
@@ -7,6 +7,7 @@
 
 top_builddir = ../..
 
+srcdir = @srcdir@
 datadir = @datadir@
 exec_prefix = @exec_prefix@
 prefix = @prefix@
@@ -33,24 +34,26 @@
 
 .SUFFIXES: .po .gmo .mo
 
-.po.mo:
+%.mo : $(srcdir)/%.po
 	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
 
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+%.gmo : $(srcdir)/%.po
+	@lang=`echo $(srcdir)/$* | sed -e 's,.*/,,'`; \
+	rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $(srcdir)/$${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
 
 $(DOMAIN).pot: $(GETTEXT_SRC)
 	$(XGETTEXT) -o$@ --default-domain=$(DOMAIN) \
 	  --add-comments=TRANSLATORS: --language=Shell \
 	  $(XGETTEXT_OPTIONS) $<
 
+check check_recursive:
+
 clean:
 	rm -f $(CATALOGS) $(POFILES:.po=.mo) $(DOMAIN).pot
 
 update-po: $(DOMAIN).pot
 	@for po in $(POFILES); do \
-	$(MSGMERGE_UPDATE) $$po $(DOMAIN).pot; \
+	$(MSGMERGE_UPDATE) $(srcdir)/$$po $(DOMAIN).pot; \
 	done
 
 install-data-no:
#5 lore raw

At Tue, 23 Aug 2005 11:28:37 +0100,

Quoted 5 lines · Bernard Leak

Dear List,

Takashi Iwai wrote

Quoted 8 lines
Quoted 5 lines

Thanks. But please attach one patch per one file.
Also, don't forget to add the description of the patch (to commit as the changelog).

Aargh! I shouldn't send patches so late at night:
I misunderstood/forgot/went blank on the instructions.

Ah, no, I meant to split the patches to alsa-lib and alsa-utils, since they are basically different trees. The changes to a single tree for a single purpose should be to a single patch (unless it becomes too big).

Quoted 11 lines

I am very likely being dense here, but it is not obvious *how* I specify a description to use as a CVS commitment comment... A quick scan of recent threads with patches attached seems not to help.

I suggest:
Allow separate build and source trees

... which will do for both alsa-lib and alsa-utils, though the patches for these two packages are independent.

It's enough, thanks.

One question:

src/Makefile.am line 2

Quoted 6 lines
src/Makefile.am renamed from src/Makefile.am-old +1 -1
@@ -1,9 +1,9 @@
 SUBDIRS=control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp
-EXTRA_DIST=Versions
+EXTRA_DIST=$(srcdir)/Versions

Do we need this really?

Others look fine. I'll apply to CVS tree, together with some fixes for the latest CVS version.

Takashi

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf

#6 lore raw

Dear List,

Quoted 6 lines · Takashi Iwai

Ah, no, I meant to split the patches to alsa-lib and alsa-utils, since they are basically different trees. The changes to a single tree for a single purpose should be to a single patch (unless it becomes too big).

I was a bit puzzled by that part of the requirements, but you did ask for it specifically. My patches were always grouped as one patch per tree (though this wasn't obvious when they were textually included in the original posting).

Quoted 4 lines

One question:

Quoted 12 lines

src/Makefile.am line 2

Quoted 8 lines
src/Makefile.am renamed from src/Makefile.am-old +0 -0
@@ -1,9 +1,9 @@

SUBDIRS=control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp

src/Makefile.am renamed from src/Makefile.am-old +1 -1
-EXTRA_DIST=Versions
+EXTRA_DIST=$(srcdir)/Versions

Do we need this really?

Ah, doubtless not! A change made on autopilot, which of course broke nothing and so was not brought to my attention again.

Thanks for your patience (you've needed it).

Bernard Leak.
--
Before they made me, they broke the mould.

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf

#7 lore raw

At Tue, 23 Aug 2005 12:01:20 +0100,

Quoted 11 lines · Bernard Leak

Dear List,

Quoted 6 lines · Takashi Iwai

Ah, no, I meant to split the patches to alsa-lib and alsa-utils, since they are basically different trees. The changes to a single tree for a single purpose should be to a single patch (unless it becomes too big).

Quoted 4 lines

I was a bit puzzled by that part of the requirements, but you did ask for it specifically. My patches were always grouped as one patch per tree (though this wasn't obvious when they were textually included in the original posting).

... and one thing forgot: post them in separate mails.

Quoted 16 lines
Quoted 4 lines

One question:

Quoted 12 lines

src/Makefile.am line 2

Quoted 8 lines
src/Makefile.am renamed from src/Makefile.am-old +0 -0
@@ -1,9 +1,9 @@

SUBDIRS=control mixer ordinary_mixer pcm ordinary_pcm rawmidi timer hwdep seq instr compat conf alisp

src/Makefile.am renamed from src/Makefile.am-old +1 -1
-EXTRA_DIST=Versions
+EXTRA_DIST=$(srcdir)/Versions

Do we need this really?

Quoted 2 lines

Ah, doubtless not! A change made on autopilot, which of course broke nothing and so was not brought to my attention again.

OK, now the patches on CVS.

Thanks!

Takashi

-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf