mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Replace dummy Makefiles with proper Makefile.am's

Browse source 
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.
This commit is contained in:
Colin Guthrie 2010-12-03 17:20:16 +00:00
parent ba2e5f4442
commit 3e28f60592
35 changed files with 379 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

18
configure.ac
View file

@ -1478,6 +1478,24 @@ doxygen/Makefile
doxygen/doxygen.conf doxygen/doxygen.conf
src/pulse/version.h src/pulse/version.h
po/Makefile.in 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 AC_OUTPUT

1
src/Makefile.am
View file

@ -19,6 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
# USA. # USA.
SUBDIRS = pulsecore pulse daemon modules utils tests
################################### ###################################
# Extra directories # # Extra directories #

1
src/daemon/Makefile
View file

@ -1 +0,0 @@
../pulse/Makefile

20
src/daemon/Makefile.am Normal file
View file

@ -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
src/modules/Makefile
View file

@ -1 +0,0 @@
../pulse/Makefile

20
src/modules/Makefile.am Normal file
View file

@ -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

1
src/modules/alsa/Makefile
View file

@ -1 +0,0 @@
../../pulse/Makefile

20
src/modules/alsa/Makefile.am Normal file
View file

@ -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

1
src/modules/alsa/mixer/Makefile
View file

@ -1 +0,0 @@
../../../pulse/Makefile

20
src/modules/alsa/mixer/Makefile.am Normal file
View file

@ -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

1
src/modules/alsa/mixer/paths/Makefile
View file

@ -1 +0,0 @@
../../../../pulse/Makefile

20
src/modules/alsa/mixer/paths/Makefile.am Normal file
View file

@ -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
src/modules/alsa/mixer/profile-sets/Makefile
View file

@ -1 +0,0 @@
../../../../pulse/Makefile

20
src/modules/alsa/mixer/profile-sets/Makefile.am Normal file
View file

@ -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
src/modules/bluetooth/Makefile
View file

@ -1 +0,0 @@
../../pulse/Makefile

20
src/modules/bluetooth/Makefile.am Normal file
View file

@ -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
src/modules/gconf/Makefile
View file

@ -1 +0,0 @@
../../pulse/Makefile

20
src/modules/gconf/Makefile.am Normal file
View file

@ -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.

20
src/modules/jack/Makefile.am Normal file
View file

@ -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
src/modules/oss/Makefile
View file

@ -1 +0,0 @@
../../pulse/Makefile

20
src/modules/oss/Makefile.am Normal file
View file

@ -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.

20
src/modules/raop/Makefile.am Normal file
View file

@ -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
src/modules/rtp/Makefile
View file

@ -1 +0,0 @@
../../pulse/Makefile

20
src/modules/rtp/Makefile.am Normal file
View file

@ -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.

20
src/modules/x11/Makefile.am Normal file
View file

@ -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.

13
src/pulse/Makefile
View file

@ -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

20
src/pulse/Makefile.am Normal file
View file

@ -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
src/pulsecore/Makefile
View file

@ -1 +0,0 @@
../pulse/Makefile

20
src/pulsecore/Makefile.am Normal file
View file

@ -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

13
src/pulsecore/ffmpeg/Makefile
View file

@ -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

20
src/pulsecore/ffmpeg/Makefile.am Normal file
View file

@ -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
src/tests/Makefile
View file

@ -1 +0,0 @@
../pulse/Makefile

20
src/tests/Makefile.am Normal file
View file

@ -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
src/utils/Makefile
View file

@ -1 +0,0 @@
../pulse/Makefile

20
src/utils/Makefile.am Normal file
View file

@ -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.