summaryrefslogtreecommitdiffstats
path: root/src/modules/gconf
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2010-12-03 17:20:16 +0000
committerColin Guthrie <cguthrie@mandriva.org>2010-12-05 15:58:59 +0000
commit3e28f60592656e14cd18fb708a57b4d8a81422ea (patch)
tree6eb8cd5020fcaa3c614c850575bac57db9cf9fc8 /src/modules/gconf
parentba2e5f4442b8f933f37411cc625598cc72938d33 (diff)
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.
Diffstat (limited to 'src/modules/gconf')
l---------src/modules/gconf/Makefile1
-rw-r--r--src/modules/gconf/Makefile.am20
2 files changed, 20 insertions, 1 deletions
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.