From c05b7babede52b00217cb514a5b1c6ba8c3d21f7 Mon Sep 17 00:00:00 2001
From: Thomas Zander <thomas.e.zander@googlemail.com>
Date: Thu, 29 Oct 2015 14:22:12 +0100
Subject: [PATCH] Makefile.lite: Include config.mk from top level build dir

Makefile.lite in libs/executables subdirs must include
top level's config.mk to allow variables defined there (OS, PROC)
to be used; otherwise e.g. EXPLICIT_LIBS is not set and link
fails on Darwin.

Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
---
 examples/c/decode/file/Makefile.lite    | 2 ++
 examples/c/encode/file/Makefile.lite    | 2 ++
 examples/cpp/decode/file/Makefile.lite  | 2 ++
 examples/cpp/encode/file/Makefile.lite  | 2 ++
 src/flac/Makefile.lite                  | 2 ++
 src/metaflac/Makefile.lite              | 2 ++
 src/test_grabbag/cuesheet/Makefile.lite | 2 ++
 src/test_grabbag/picture/Makefile.lite  | 2 ++
 src/test_libFLAC++/Makefile.lite        | 2 ++
 src/test_libFLAC/Makefile.lite          | 2 ++
 src/test_seeking/Makefile.lite          | 2 ++
 src/test_streams/Makefile.lite          | 2 ++
 12 files changed, 24 insertions(+)

diff --git a/examples/c/decode/file/Makefile.lite b/examples/c/decode/file/Makefile.lite
index 6371c604..c0b52e3e 100644
--- a/examples/c/decode/file/Makefile.lite
+++ b/examples/c/decode/file/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../../../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_c_decode_file
diff --git a/examples/c/encode/file/Makefile.lite b/examples/c/encode/file/Makefile.lite
index 1ed44e57..9bae4b9f 100644
--- a/examples/c/encode/file/Makefile.lite
+++ b/examples/c/encode/file/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../../../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_c_encode_file
diff --git a/examples/cpp/decode/file/Makefile.lite b/examples/cpp/decode/file/Makefile.lite
index d4821acb..fe9a31af 100644
--- a/examples/cpp/decode/file/Makefile.lite
+++ b/examples/cpp/decode/file/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../../../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_cpp_decode_file
diff --git a/examples/cpp/encode/file/Makefile.lite b/examples/cpp/encode/file/Makefile.lite
index 3333df7d..cc5583f8 100644
--- a/examples/cpp/encode/file/Makefile.lite
+++ b/examples/cpp/encode/file/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../../../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = example_cpp_encode_file
diff --git a/src/flac/Makefile.lite b/src/flac/Makefile.lite
index e13c8649..f143bd4a 100644
--- a/src/flac/Makefile.lite
+++ b/src/flac/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = flac
diff --git a/src/metaflac/Makefile.lite b/src/metaflac/Makefile.lite
index 7d4f1a58..2866c228 100644
--- a/src/metaflac/Makefile.lite
+++ b/src/metaflac/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = metaflac
diff --git a/src/test_grabbag/cuesheet/Makefile.lite b/src/test_grabbag/cuesheet/Makefile.lite
index 1808d274..9fe694da 100644
--- a/src/test_grabbag/cuesheet/Makefile.lite
+++ b/src/test_grabbag/cuesheet/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_cuesheet
diff --git a/src/test_grabbag/picture/Makefile.lite b/src/test_grabbag/picture/Makefile.lite
index 0ad17bce..10ebfe07 100644
--- a/src/test_grabbag/picture/Makefile.lite
+++ b/src/test_grabbag/picture/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_picture
diff --git a/src/test_libFLAC++/Makefile.lite b/src/test_libFLAC++/Makefile.lite
index c0b43dbf..69d1a84c 100644
--- a/src/test_libFLAC++/Makefile.lite
+++ b/src/test_libFLAC++/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_libFLAC++
diff --git a/src/test_libFLAC/Makefile.lite b/src/test_libFLAC/Makefile.lite
index be7c595c..e95beb3b 100644
--- a/src/test_libFLAC/Makefile.lite
+++ b/src/test_libFLAC/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_libFLAC
diff --git a/src/test_seeking/Makefile.lite b/src/test_seeking/Makefile.lite
index f18ca3ca..5ada17d6 100644
--- a/src/test_seeking/Makefile.lite
+++ b/src/test_seeking/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_seeking
diff --git a/src/test_streams/Makefile.lite b/src/test_streams/Makefile.lite
index 63685016..b144523a 100644
--- a/src/test_streams/Makefile.lite
+++ b/src/test_streams/Makefile.lite
@@ -21,6 +21,8 @@
 #
 
 topdir = ../..
+
+include $(topdir)/build/config.mk
 libdir = $(topdir)/objs/$(BUILD)/lib
 
 PROGRAM_NAME = test_streams