Set AUTOMAKE_OPTIONS=subdir-objects where necessary.

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 62fa58ed866b6864c67fd3bcd200e78b370dc7aa..bfb7ec2af0fe476ecf175effd66e2e39f10aecab 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -20,6 +20,7 @@ bin_PROGRAMS=disorder disorderfm disorder-playrtp
 noinst_PROGRAMS=filename-bytes rtpmon resample
 noinst_SCRIPTS=dump2wav
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorder_SOURCES=disorder.c authorize.c authorize.h \

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 4f7961477bed095d7ccb81b24b5c58555c85bf58..2328bca9552b5e8f3ecb4b71eed67fde3d5e9d14 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2006-2010 Richard Kettlewell
+# Copyright (C) 2006-2013 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 bin_PROGRAMS=disobedience
 SUBDIRS=manual
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 AM_CFLAGS=$(GLIB_CFLAGS) $(GTK_CFLAGS)
 

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 16e06c63f5efc6da65d4fc62ad89ccc9df7aa384..c8883b5b9a37a3b1687091f4cd543c9c5314ff6b 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder
-# Copyright (C) 2004-2008, 2010 Richard Kettlewell
+# Copyright (C) 2004-2008, 2010, 2013 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 pkglib_LTLIBRARIES=disorder-tracklength.la fs.la notify.la exec.la shell.la \
                   execraw.la
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib
 
 notify_la_SOURCES=notify.c

diff --git a/server/Makefile.am b/server/Makefile.am
index 400b0ab06e48ca45172cde6987707b59b657700a..01e769a0b44ee922dc39fd5226cca4da73a04b6b 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004-2011 Richard Kettlewell
+# Copyright (C) 2004-2011, 2013 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@ sbin_PROGRAMS=disorderd disorder-deadlock disorder-rescan disorder-dump \
              disorder-stats disorder-dbupgrade disorder-choose
 noinst_PROGRAMS=trackname endian
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorderd_SOURCES=disorderd.c api.c api-server.c daemonize.c play.c    \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9fd1a6bd826917d18f00fbd08c5571701f93fc61..89afb3e5f834434e7bf15ecc5bc4b6b0d2ab2106 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004, 2005, 2007-2009, 2011 Richard Kettlewell
+# Copyright (C) 2004, 2005, 2007-2009, 2011, 2013 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 
 noinst_PROGRAMS=disorder-udplog
 
+AUTOMAKE_OPTIONS=subdir-objects
 AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 
 disorder_udplog_SOURCES=udplog.c ../lib/memgc.c