From 736f7ab1a5376f6def2dae874623a041d0eb24d9 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 26 May 2011 00:30:41 +0000
Subject: [PATCH] Partially solved variable duplication in some cases

---
 src/makefile.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/makefile.c b/src/makefile.c
index 3f5ac98..b30aa77 100644
--- a/src/makefile.c
+++ b/src/makefile.c
@@ -359,12 +359,20 @@ static void _executables_variables(Configure * configure, FILE * fp,
 	switch(tt)
 	{
 		case TT_BINARY:
+			_variables_binary(configure, fp, done);
+			done[TT_OBJECT] = 1;
+			break;
 		case TT_OBJECT:
 			_variables_binary(configure, fp, done);
+			done[TT_BINARY] = 1;
 			break;
 		case TT_LIBRARY:
+			_variables_library(configure, fp, done);
+			done[TT_PLUGIN] = 1;
+			break;
 		case TT_PLUGIN:
 			_variables_library(configure, fp, done);
+			done[TT_LIBRARY] = 1;
 			break;
 		case TT_LIBTOOL:
 			_variables_libtool(configure, fp, done);