diff options
35 files changed, 379 insertions, 39 deletions
diff --git a/configure.ac b/configure.ac index 9de6a814..c8586898 100644 --- a/configure.ac +++ b/configure.ac @@ -1478,6 +1478,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 fe99ee74..499a5bad 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 c110232d..00000000 --- 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 00000000..d04a4130 --- /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 c110232d..00000000 --- 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 00000000..e99451df --- /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 efe5a336..00000000 --- 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 00000000..3d8bb5a3 --- /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 b4955194..00000000 --- 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 00000000..ee2c6eff --- /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 dc23aaa2..00000000 --- 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 00000000..d04a4130 --- /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 dc23aaa2..00000000 --- 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 00000000..d04a4130 --- /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 efe5a336..00000000 --- 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 00000000..d04a4130 --- /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 efe5a336..00000000 --- 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 00000000..d04a4130 --- /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 00000000..d04a4130 --- /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 efe5a336..00000000 --- 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 00000000..d04a4130 --- /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 00000000..d04a4130 --- /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 efe5a336..00000000 --- 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 00000000..d04a4130 --- /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 00000000..d04a4130 --- /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 7c8875f3..00000000 --- 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 00000000..d04a4130 --- /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 c110232d..00000000 --- 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 00000000..55c6845c --- /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 316beb72..00000000 --- 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 00000000..d04a4130 --- /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 c110232d..00000000 --- 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 00000000..d04a4130 --- /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 c110232d..00000000 --- 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 00000000..d04a4130 --- /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. |