From 3f5b23510f628ed59c969d3d78552b956a43d32b Mon Sep 17 00:00:00 2001 Message-Id: <3f5b23510f628ed59c969d3d78552b956a43d32b.1715133447.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 23 Nov 2013 11:11:38 +0000 Subject: [PATCH] Set AUTOMAKE_OPTIONS=subdir-objects where necessary. Organization: Straylight/Edgeware From: Richard Kettlewell --- clients/Makefile.am | 1 + disobedience/Makefile.am | 3 ++- plugins/Makefile.am | 3 ++- server/Makefile.am | 3 ++- tests/Makefile.am | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/clients/Makefile.am b/clients/Makefile.am index 62fa58e..bfb7ec2 100644 --- 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 4f79614..2328bca 100644 --- 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 16e06c6..c8883b5 100644 --- 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 400b0ab..01e769a 100644 --- 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 9fd1a6b..89afb3e 100644 --- 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 -- [mdw]