From 55788ea96b6f71300bccfee2e6a8645e83be9768 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 28 Dec 2012 11:06:38 +1100 Subject: [PATCH] Rename obj/ directory to objs/ to avoid BSD make issue. --- Makefile.am | 2 +- configure.ac | 14 +++++++------- {obj => objs}/Makefile.am | 0 {obj => objs}/debug/Makefile.am | 0 {obj => objs}/debug/bin/Makefile.am | 0 {obj => objs}/debug/lib/Makefile.am | 0 {obj => objs}/release/Makefile.am | 0 {obj => objs}/release/bin/Makefile.am | 0 {obj => objs}/release/lib/Makefile.am | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename {obj => objs}/Makefile.am (100%) rename {obj => objs}/debug/Makefile.am (100%) rename {obj => objs}/debug/bin/Makefile.am (100%) rename {obj => objs}/debug/lib/Makefile.am (100%) rename {obj => objs}/release/Makefile.am (100%) rename {obj => objs}/release/bin/Makefile.am (100%) rename {obj => objs}/release/lib/Makefile.am (100%) diff --git a/Makefile.am b/Makefile.am index 45a02603..603c0327 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = doc include m4 man src examples test build obj +SUBDIRS = doc include m4 man src examples test build objs DISTCLEANFILES = libtool-disable-static diff --git a/configure.ac b/configure.ac index 89256407..75561cda 100644 --- a/configure.ac +++ b/configure.ac @@ -444,13 +444,13 @@ AC_CONFIG_FILES([ \ test/metaflac-test-files/Makefile \ test/pictures/Makefile \ build/Makefile \ - obj/Makefile \ - obj/debug/Makefile \ - obj/debug/bin/Makefile \ - obj/debug/lib/Makefile \ - obj/release/Makefile \ - obj/release/bin/Makefile \ - obj/release/lib/Makefile \ + objs/Makefile \ + objs/debug/Makefile \ + objs/debug/bin/Makefile \ + objs/debug/lib/Makefile \ + objs/release/Makefile \ + objs/release/bin/Makefile \ + objs/release/lib/Makefile \ ]) AC_OUTPUT diff --git a/obj/Makefile.am b/objs/Makefile.am similarity index 100% rename from obj/Makefile.am rename to objs/Makefile.am diff --git a/obj/debug/Makefile.am b/objs/debug/Makefile.am similarity index 100% rename from obj/debug/Makefile.am rename to objs/debug/Makefile.am diff --git a/obj/debug/bin/Makefile.am b/objs/debug/bin/Makefile.am similarity index 100% rename from obj/debug/bin/Makefile.am rename to objs/debug/bin/Makefile.am diff --git a/obj/debug/lib/Makefile.am b/objs/debug/lib/Makefile.am similarity index 100% rename from obj/debug/lib/Makefile.am rename to objs/debug/lib/Makefile.am diff --git a/obj/release/Makefile.am b/objs/release/Makefile.am similarity index 100% rename from obj/release/Makefile.am rename to objs/release/Makefile.am diff --git a/obj/release/bin/Makefile.am b/objs/release/bin/Makefile.am similarity index 100% rename from obj/release/bin/Makefile.am rename to objs/release/bin/Makefile.am diff --git a/obj/release/lib/Makefile.am b/objs/release/lib/Makefile.am similarity index 100% rename from obj/release/lib/Makefile.am rename to objs/release/lib/Makefile.am