Hi, As we had some issues running make distcheck with the latest release can someone give some feedback on the following three patches (against stable queue for now but will also go into master).
The first patch basically just introduces some dummy Makefile.am's to ensure that the necessary directories are created in the build directory (for out of tree builds). This prevents the cc warnings about not being able to find an directory (a minor annoyance) but also allows the build to complete and do the necessary i18n stuff on the .desktop files which normally fail due to src/daemon not being a directory in the build tree (this is a bug in intl-tool as noted in the commit message). The second patch fixes a problem when running make distcheck related to the udev rules. It insists on using the system folder and does not seem to honour DESTDIR. I guess a distcheck doesn't actually use a DESTDIR but a custom prefix and thus it fails. I'm not sure this is the best approach to fixing this but it seems to work for me. Feel free to test without this patch to see if it "just works" for you without it. And thirdly this patch ensures the .version file is included in the tarball as stated in the docs of git-version-gen. Without this make distcheck fails as the source tree is read-only and thus the .version file cannot be created. By including it in the tarball, it does not get overwritten and the build works fine. Comments welcome as I'm no autofoo expert and am just blundering around until things generally work. Col -- Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/ Day Job: Tribalogic Limited [http://www.tribalogic.net/] Open Source: Mageia Contributor [http://www.mageia.org/] PulseAudio Hacker [http://www.pulseaudio.org/] Trac Hacker [http://trac.edgewall.org/]
>From 675cc0ae0bf3dc0a863dacfeeae0f6fde5222e96 Mon Sep 17 00:00:00 2001 From: Colin Guthrie <[email protected]> Date: Fri, 3 Dec 2010 17:20:16 +0000 Subject: [PATCH 1/3] build-sys: Replace dummy Makefiles with proper Makefile.am's This is needed to better support out of tree builds (including distcheck) and to ensure the necessary folders are created in the build tree on configure and also works around an intl-tools bug (https://bugs.launchpad.net/intltool/+bug/605826) The Makefile.am's used are minimal (and in some cases completely blank). At present they do not include anything interesting with the majority of the real work still done by the monolitic src/Makefile.am It may make sense to start splitting out src/Makefile.am into smaller chunks but this commit makes the minimum changes to address the issues that result from using make distcheck and other out of tree builds. Note: This 'breaks' the ability to type make in e.g. the src/modules folder and have all of PA rebuilt accordingly (this is because the static Makefiles previously present just did a "make -C ..") which was purportedly for use in emacs. But I'm sure there will be a better and more robust way to configure emacs to do your builds properly if this behaviour is still desirable. --- configure.ac | 18 ++++++++++++++++++ src/Makefile.am | 1 + src/daemon/Makefile | 1 - src/daemon/Makefile.am | 20 ++++++++++++++++++++ src/modules/Makefile | 1 - src/modules/Makefile.am | 20 ++++++++++++++++++++ src/modules/alsa/Makefile | 1 - src/modules/alsa/Makefile.am | 20 ++++++++++++++++++++ src/modules/alsa/mixer/Makefile | 1 - src/modules/alsa/mixer/Makefile.am | 20 ++++++++++++++++++++ src/modules/alsa/mixer/paths/Makefile | 1 - src/modules/alsa/mixer/paths/Makefile.am | 20 ++++++++++++++++++++ src/modules/alsa/mixer/profile-sets/Makefile | 1 - src/modules/alsa/mixer/profile-sets/Makefile.am | 20 ++++++++++++++++++++ src/modules/bluetooth/Makefile | 1 - src/modules/bluetooth/Makefile.am | 20 ++++++++++++++++++++ src/modules/gconf/Makefile | 1 - src/modules/gconf/Makefile.am | 20 ++++++++++++++++++++ src/modules/jack/Makefile.am | 20 ++++++++++++++++++++ src/modules/oss/Makefile | 1 - src/modules/oss/Makefile.am | 20 ++++++++++++++++++++ src/modules/raop/Makefile.am | 20 ++++++++++++++++++++ src/modules/rtp/Makefile | 1 - src/modules/rtp/Makefile.am | 20 ++++++++++++++++++++ src/modules/x11/Makefile.am | 20 ++++++++++++++++++++ src/pulse/Makefile | 13 ------------- src/pulse/Makefile.am | 20 ++++++++++++++++++++ src/pulsecore/Makefile | 1 - src/pulsecore/Makefile.am | 20 ++++++++++++++++++++ src/pulsecore/ffmpeg/Makefile | 13 ------------- src/pulsecore/ffmpeg/Makefile.am | 20 ++++++++++++++++++++ src/tests/Makefile | 1 - src/tests/Makefile.am | 20 ++++++++++++++++++++ src/utils/Makefile | 1 - src/utils/Makefile.am | 20 ++++++++++++++++++++ 35 files changed, 379 insertions(+), 39 deletions(-) delete mode 120000 src/daemon/Makefile create mode 100644 src/daemon/Makefile.am delete mode 120000 src/modules/Makefile create mode 100644 src/modules/Makefile.am delete mode 120000 src/modules/alsa/Makefile create mode 100644 src/modules/alsa/Makefile.am delete mode 120000 src/modules/alsa/mixer/Makefile create mode 100644 src/modules/alsa/mixer/Makefile.am delete mode 120000 src/modules/alsa/mixer/paths/Makefile create mode 100644 src/modules/alsa/mixer/paths/Makefile.am delete mode 120000 src/modules/alsa/mixer/profile-sets/Makefile create mode 100644 src/modules/alsa/mixer/profile-sets/Makefile.am delete mode 120000 src/modules/bluetooth/Makefile create mode 100644 src/modules/bluetooth/Makefile.am delete mode 120000 src/modules/gconf/Makefile create mode 100644 src/modules/gconf/Makefile.am create mode 100644 src/modules/jack/Makefile.am delete mode 120000 src/modules/oss/Makefile create mode 100644 src/modules/oss/Makefile.am create mode 100644 src/modules/raop/Makefile.am delete mode 120000 src/modules/rtp/Makefile create mode 100644 src/modules/rtp/Makefile.am create mode 100644 src/modules/x11/Makefile.am delete mode 100644 src/pulse/Makefile create mode 100644 src/pulse/Makefile.am delete mode 120000 src/pulsecore/Makefile create mode 100644 src/pulsecore/Makefile.am delete mode 100644 src/pulsecore/ffmpeg/Makefile create mode 100644 src/pulsecore/ffmpeg/Makefile.am delete mode 120000 src/tests/Makefile create mode 100644 src/tests/Makefile.am delete mode 120000 src/utils/Makefile create mode 100644 src/utils/Makefile.am diff --git a/configure.ac b/configure.ac index 2c233c8..7b109d2 100644 --- a/configure.ac +++ b/configure.ac @@ -1430,6 +1430,24 @@ doxygen/Makefile doxygen/doxygen.conf src/pulse/version.h po/Makefile.in +src/daemon/Makefile +src/modules/Makefile +src/modules/alsa/Makefile +src/modules/alsa/mixer/Makefile +src/modules/alsa/mixer/paths/Makefile +src/modules/alsa/mixer/profile-sets/Makefile +src/modules/bluetooth/Makefile +src/modules/gconf/Makefile +src/modules/jack/Makefile +src/modules/oss/Makefile +src/modules/raop/Makefile +src/modules/rtp/Makefile +src/modules/x11/Makefile +src/pulse/Makefile +src/pulsecore/Makefile +src/pulsecore/ffmpeg/Makefile +src/tests/Makefile +src/utils/Makefile ]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 164faa6..c96c05f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. +SUBDIRS = pulsecore pulse daemon modules utils tests ################################### # Extra directories # diff --git a/src/daemon/Makefile b/src/daemon/Makefile deleted file mode 120000 index c110232..0000000 --- a/src/daemon/Makefile +++ /dev/null @@ -1 +0,0 @@ -../pulse/Makefile \ No newline at end of file diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/daemon/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/Makefile b/src/modules/Makefile deleted file mode 120000 index c110232..0000000 --- a/src/modules/Makefile +++ /dev/null @@ -1 +0,0 @@ -../pulse/Makefile \ No newline at end of file diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am new file mode 100644 index 0000000..e99451d --- /dev/null +++ b/src/modules/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +SUBDIRS = alsa bluetooth gconf jack oss raop rtp x11 diff --git a/src/modules/alsa/Makefile b/src/modules/alsa/Makefile deleted file mode 120000 index efe5a33..0000000 --- a/src/modules/alsa/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/alsa/Makefile.am b/src/modules/alsa/Makefile.am new file mode 100644 index 0000000..3d8bb5a --- /dev/null +++ b/src/modules/alsa/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +SUBDIRS = mixer diff --git a/src/modules/alsa/mixer/Makefile b/src/modules/alsa/mixer/Makefile deleted file mode 120000 index b495519..0000000 --- a/src/modules/alsa/mixer/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/alsa/mixer/Makefile.am b/src/modules/alsa/mixer/Makefile.am new file mode 100644 index 0000000..ee2c6ef --- /dev/null +++ b/src/modules/alsa/mixer/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +SUBDIRS = paths profile-sets diff --git a/src/modules/alsa/mixer/paths/Makefile b/src/modules/alsa/mixer/paths/Makefile deleted file mode 120000 index dc23aaa..0000000 --- a/src/modules/alsa/mixer/paths/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/alsa/mixer/paths/Makefile.am b/src/modules/alsa/mixer/paths/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/alsa/mixer/paths/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/alsa/mixer/profile-sets/Makefile b/src/modules/alsa/mixer/profile-sets/Makefile deleted file mode 120000 index dc23aaa..0000000 --- a/src/modules/alsa/mixer/profile-sets/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/alsa/mixer/profile-sets/Makefile.am b/src/modules/alsa/mixer/profile-sets/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/alsa/mixer/profile-sets/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/bluetooth/Makefile b/src/modules/bluetooth/Makefile deleted file mode 120000 index efe5a33..0000000 --- a/src/modules/bluetooth/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/bluetooth/Makefile.am b/src/modules/bluetooth/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/bluetooth/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/gconf/Makefile b/src/modules/gconf/Makefile deleted file mode 120000 index efe5a33..0000000 --- a/src/modules/gconf/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/gconf/Makefile.am b/src/modules/gconf/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/gconf/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/jack/Makefile.am b/src/modules/jack/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/jack/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/oss/Makefile b/src/modules/oss/Makefile deleted file mode 120000 index efe5a33..0000000 --- a/src/modules/oss/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/oss/Makefile.am b/src/modules/oss/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/oss/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/raop/Makefile.am b/src/modules/raop/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/raop/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/rtp/Makefile b/src/modules/rtp/Makefile deleted file mode 120000 index efe5a33..0000000 --- a/src/modules/rtp/Makefile +++ /dev/null @@ -1 +0,0 @@ -../../pulse/Makefile \ No newline at end of file diff --git a/src/modules/rtp/Makefile.am b/src/modules/rtp/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/rtp/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/modules/x11/Makefile.am b/src/modules/x11/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/modules/x11/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/pulse/Makefile b/src/pulse/Makefile deleted file mode 100644 index 7c8875f..0000000 --- a/src/pulse/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a dirty trick just to ease compilation with emacs -# -# This file is not intended to be distributed or anything -# -# So: don't touch it, even better ignore it! - -all: - $(MAKE) -C .. - -clean: - $(MAKE) -C .. clean - -.PHONY: all clean diff --git a/src/pulse/Makefile.am b/src/pulse/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/pulse/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/pulsecore/Makefile b/src/pulsecore/Makefile deleted file mode 120000 index c110232..0000000 --- a/src/pulsecore/Makefile +++ /dev/null @@ -1 +0,0 @@ -../pulse/Makefile \ No newline at end of file diff --git a/src/pulsecore/Makefile.am b/src/pulsecore/Makefile.am new file mode 100644 index 0000000..55c6845 --- /dev/null +++ b/src/pulsecore/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +SUBDIRS = ffmpeg diff --git a/src/pulsecore/ffmpeg/Makefile b/src/pulsecore/ffmpeg/Makefile deleted file mode 100644 index 316beb7..0000000 --- a/src/pulsecore/ffmpeg/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# This is a dirty trick just to ease compilation with emacs -# -# This file is not intended to be distributed or anything -# -# So: don't touch it, even better ignore it! - -all: - $(MAKE) -C ../.. - -clean: - $(MAKE) -C ../.. clean - -.PHONY: all clean diff --git a/src/pulsecore/ffmpeg/Makefile.am b/src/pulsecore/ffmpeg/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/pulsecore/ffmpeg/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/tests/Makefile b/src/tests/Makefile deleted file mode 120000 index c110232..0000000 --- a/src/tests/Makefile +++ /dev/null @@ -1 +0,0 @@ -../pulse/Makefile \ No newline at end of file diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/tests/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. diff --git a/src/utils/Makefile b/src/utils/Makefile deleted file mode 120000 index c110232..0000000 --- a/src/utils/Makefile +++ /dev/null @@ -1 +0,0 @@ -../pulse/Makefile \ No newline at end of file diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am new file mode 100644 index 0000000..d04a413 --- /dev/null +++ b/src/utils/Makefile.am @@ -0,0 +1,20 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Colin Guthrie +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# This Automake file is intentionally blank. -- 1.7.3.2
>From a1f1255635ee013c027b981f47d186d83a70d6dd Mon Sep 17 00:00:00 2001 From: Colin Guthrie <[email protected]> Date: Sat, 4 Dec 2010 12:01:01 +0000 Subject: [PATCH 2/3] build-sys: Fix make distcheck failure due to udev rules fixed install path I don't know why this does not honour DESTDIR or similar during distcheck but this simple enough patch fixes it. --- Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5385bf3..b8e22ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -87,3 +87,5 @@ $(top_srcdir)/.version: DISTCLEANFILES = \ po/.intltool-merge-cache + +DISTCHECK_CONFIGURE_FLAGS = --with-udev-rules-dir="$$dc_install_base/lib/udev/rules.d" -- 1.7.3.2
>From e9deb97d94ca64b563adfef02dc45fb3ec6be2de Mon Sep 17 00:00:00 2001 From: Colin Guthrie <[email protected]> Date: Sat, 4 Dec 2010 13:47:43 +0000 Subject: [PATCH 3/3] build-sys: Include the .version file in the distribution tarball As per the comments in git-version-gen, the .version file that is typically generated automatically during build should be included in the tarball, so generate it in the dist-hook. This fixes a problem when running make distcheck which uses a read-only source folder and thus cannot generate the $top_srcdir/.version as part of it's build process (it uses a _build folder which is r/w) and thus cannot be built. --- Makefile.am | 1 + git-version-gen | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index b8e22ea..a8a9eaa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,6 +77,7 @@ dist-hook: ( git-changelog.perl || echo "git-changelog.perl failed." ) > ${distdir}/ChangeLog 2>&1 ; \ fi echo $(VERSION) > $(distdir)/.tarball-version + echo $(VERSION) > $(distdir)/.version .PHONY: homepage distcleancheck doxygen diff --git a/git-version-gen b/git-version-gen index ae3988e..d59a0fc 100755 --- a/git-version-gen +++ b/git-version-gen @@ -67,6 +67,7 @@ scriptversion=2008-04-08.07 # echo $(VERSION) > $...@-t && mv $...@-t $@ # dist-hook: # echo $(VERSION) > $(distdir)/.tarball-version +# echo $(VERSION) > $(distdir)/.version case $# in 1) ;; -- 1.7.3.2
_______________________________________________ pulseaudio-discuss mailing list [email protected] https://tango.0pointer.de/mailman/listinfo/pulseaudio-discuss
