summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-09-10 08:41:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:02 -0500
commit759e8162399a764cea40e4fffa5ba776f9af4807 (patch)
treebf4709fa9fa525fad9f8da03c3bf42dc598b7362
parent5fd875ae74b86d7ea532714d47aa74eb2f009ec9 (diff)
downloadsamba-759e8162399a764cea40e4fffa5ba776f9af4807.tar.gz
samba-759e8162399a764cea40e4fffa5ba776f9af4807.tar.bz2
samba-759e8162399a764cea40e4fffa5ba776f9af4807.zip
r10140: reorder some stuff, for nicer output
metze (This used to be commit 517d0ded6b4dc7aabe48581fee5878637bc2a674)
-rw-r--r--source4/build/smb_build/makefile.pm12
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 493cc1736a..2027c27cdc 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -72,19 +72,23 @@ sub _prepare_compiler_linker()
{
return << "__EOD__";
SHELL=$config{SHELL}
+
PERL=$config{PERL}
+
CC=$config{CC}
-CFLAGS=-I\$(srcdir)/include -I\$(srcdir) -D_SAMBA_BUILD_ -DHAVE_CONFIG_H -I\$(srcdir)/lib $config{CFLAGS} $config{CPPFLAGS}
+CFLAGS=-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H $config{CFLAGS} $config{CPPFLAGS}
+
+CPP=$config{CPP}
+CPPFLAGS=$config{CPPFLAGS}
LD=$config{LD}
-GCOV=$config{GCOV}
LD_FLAGS=$config{LDFLAGS}
STLD=$config{AR}
STLD_FLAGS=-rc
SHLD=$config{CC}
-SHLD_FLAGS=$config{LDSHFLAGS}
+SHLD_FLAGS=$config{LDSHFLAGS}
XSLTPROC=$config{XSLTPROC}
@@ -92,7 +96,7 @@ LEX=$config{LEX}
YACC=$config{YACC}
YAPP=$config{YAPP}
-CPP=$config{CPP}
+GCOV=$config{GCOV}
DEFAULT_TEST_TARGET=$config{DEFAULT_TEST_TARGET}