From bce940640f26b58d5b2ba527d60b8a540b3bb872 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sun, 22 Jul 2012 14:49:18 +0200
Subject: [PATCH] Makefile: Move up the definition of various directories.

This way we have all of them at one place in the Makefile.
---
 Makefile.in  | 12 ++++++------
 configure.ac |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 92c9169d..511c0486 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,6 @@ MANDIR := @datarootdir@/man/man1
 PACKAGE_VERSION := @PACKAGE_VERSION@
 PACKAGE_STRING := @PACKAGE_STRING@
 install_sh := @install_sh@
-cmdline_dir := @cmdline_dir@
 executables := @executables@
 
 GENGETOPT := @gengetopt@
@@ -22,6 +21,12 @@ codename := volatile relativity
 
 GIT_VERSION := $(shell ./GIT-VERSION-GEN git-version.h)
 
+ggo_dir := ggo
+object_dir := objects
+man_dir := man/man1
+test_dir := t
+cmdline_dir := cmdline
+
 DEBUG_CPPFLAGS += -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 DEBUG_CPPFLAGS += -Wall -Wno-sign-compare -Wno-unknown-pragmas
@@ -68,11 +73,6 @@ CPPFLAGS += @osl_cppflags@
 
 man_pages := $(patsubst %, man/man1/%.1, @executables@)
 
-ggo_dir := ggo
-object_dir := objects
-man_dir := man/man1
-test_dir := t
-
 m4_ggos := afh audioc audiod client filter gui recv server write ao_write
 ggo_generated := $(addsuffix .ggo, $(addprefix $(ggo_dir)/,$(m4_ggos)))
 
diff --git a/configure.ac b/configure.ac
index 8acbf9e9..bf26d78b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
-cmdline_dir="cmdline"
-AC_SUBST(cmdline_dir)
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 
 
-- 
2.39.5