From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 30 Apr 2013 16:19:36 +0000 (+0200)
Subject: automake: fix some older mis-merge fallout
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4e48d558c4e7a4488b0a773a60df2665356972a;p=thirdparty%2Fautomake.git

automake: fix some older mis-merge fallout

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/automake.in b/automake.in
index b01803f5c..17e833ef1 100644
--- a/automake.in
+++ b/automake.in
@@ -576,7 +576,7 @@ register_language ('name' => 'c',
 		   'flags' => ['CFLAGS', 'CPPFLAGS'],
 		   'ccer' => 'CC',
 		   'compiler' => 'COMPILE',
-		   'compile' => '$(CC) $(DEFS) $(AM_DEFAULT_INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)',
+		   'compile' => "\$(CC) @cpplike_flags \$(AM_CFLAGS) \$(CFLAGS)",
 		   'lder' => 'CCLD',
 		   'ld' => '$(CC)',
 		   'linker' => 'LINK',