diff options
Diffstat (limited to 'src/pulsecore/ffmpeg')
| -rw-r--r-- | src/pulsecore/ffmpeg/Makefile | 13 | ||||
| -rw-r--r-- | src/pulsecore/ffmpeg/Makefile.am | 20 |
2 files changed, 20 insertions, 13 deletions
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. |