From 53c2fe711ba9522eeb5f87900add71395cec26d6 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Wed, 19 Jan 2011 13:35:38 +0100 Subject: [PATCH 2/3] build: Don't include empty Makefile.am in subdirs --- configure.ac | 19 ------------------- src/Makefile.am | 2 -- src/daemon/Makefile.am | 20 -------------------- src/modules/Makefile.am | 20 -------------------- src/modules/alsa/Makefile.am | 20 -------------------- src/modules/alsa/mixer/Makefile.am | 20 -------------------- src/modules/alsa/mixer/paths/Makefile.am | 20 -------------------- src/modules/alsa/mixer/profile-sets/Makefile.am | 20 -------------------- src/modules/bluetooth/Makefile.am | 20 -------------------- src/modules/dbus/Makefile.am | 20 -------------------- src/modules/gconf/Makefile.am | 20 -------------------- src/modules/jack/Makefile.am | 20 -------------------- src/modules/oss/Makefile.am | 20 -------------------- src/modules/raop/Makefile.am | 20 -------------------- src/modules/rtp/Makefile.am | 20 -------------------- src/modules/x11/Makefile.am | 20 -------------------- src/pulse/Makefile.am | 20 -------------------- src/pulsecore/Makefile.am | 20 -------------------- src/pulsecore/ffmpeg/Makefile.am | 20 -------------------- src/tests/Makefile.am | 20 -------------------- src/utils/Makefile.am | 20 -------------------- 21 files changed, 0 insertions(+), 401 deletions(-) delete mode 100644 src/daemon/Makefile.am delete mode 100644 src/modules/Makefile.am delete mode 100644 src/modules/alsa/Makefile.am delete mode 100644 src/modules/alsa/mixer/Makefile.am delete mode 100644 src/modules/alsa/mixer/paths/Makefile.am delete mode 100644 src/modules/alsa/mixer/profile-sets/Makefile.am delete mode 100644 src/modules/bluetooth/Makefile.am delete mode 100644 src/modules/dbus/Makefile.am delete mode 100644 src/modules/gconf/Makefile.am delete mode 100644 src/modules/jack/Makefile.am delete mode 100644 src/modules/oss/Makefile.am delete mode 100644 src/modules/raop/Makefile.am delete mode 100644 src/modules/rtp/Makefile.am delete mode 100644 src/modules/x11/Makefile.am delete mode 100644 src/pulse/Makefile.am delete mode 100644 src/pulsecore/Makefile.am delete mode 100644 src/pulsecore/ffmpeg/Makefile.am delete mode 100644 src/tests/Makefile.am delete mode 100644 src/utils/Makefile.am diff --git a/configure.ac b/configure.ac index 0cffdc1..08c947a 100644 --- a/configure.ac +++ b/configure.ac @@ -1489,25 +1489,6 @@ 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/dbus/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 f67b2f6..a54c160 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,8 +19,6 @@ # 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.am b/src/daemon/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/daemon/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/Makefile.am deleted file mode 100644 index d8dc152..0000000 --- a/src/modules/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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 dbus gconf jack oss raop rtp x11 diff --git a/src/modules/alsa/Makefile.am b/src/modules/alsa/Makefile.am deleted file mode 100644 index 3d8bb5a..0000000 --- a/src/modules/alsa/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/alsa/mixer/Makefile.am deleted file mode 100644 index ee2c6ef..0000000 --- a/src/modules/alsa/mixer/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/alsa/mixer/paths/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/alsa/mixer/paths/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/alsa/mixer/profile-sets/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/alsa/mixer/profile-sets/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/bluetooth/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/bluetooth/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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/dbus/Makefile.am b/src/modules/dbus/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/dbus/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/gconf/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/gconf/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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 deleted file mode 100644 index d04a413..0000000 --- a/src/modules/jack/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/oss/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/oss/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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 deleted file mode 100644 index d04a413..0000000 --- a/src/modules/raop/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/modules/rtp/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/modules/rtp/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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 deleted file mode 100644 index d04a413..0000000 --- a/src/modules/x11/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/pulse/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/pulse/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/pulsecore/Makefile.am deleted file mode 100644 index 55c6845..0000000 --- a/src/pulsecore/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/pulsecore/ffmpeg/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/pulsecore/ffmpeg/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/tests/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/tests/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.am b/src/utils/Makefile.am deleted file mode 100644 index d04a413..0000000 --- a/src/utils/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# 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.1