summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-05-13 20:04:44 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:59 -0500
commitb8b01cd970de6718271bea25262c77352bf77d4b (patch)
treefdb5fc4bc1fe4e5f6a109e043ef9ada05e1b9c93 /source4/build/smb_build
parentb7d574cf86d61e72c7804443ed6f57e8e090349b (diff)
downloadsamba-b8b01cd970de6718271bea25262c77352bf77d4b.tar.gz
samba-b8b01cd970de6718271bea25262c77352bf77d4b.tar.bz2
samba-b8b01cd970de6718271bea25262c77352bf77d4b.zip
r15578: Move some cpp-specific things from CFLAGS to CPPFLAGS
Proper dependencies for POPT_SAMBA (fixes build when popt is in /usr/local) (This used to be commit ed82490e5a074da56d0a96ee52f1d1832b824fe3)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/makefile.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 3423b2ec75..aa2376b335 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -125,10 +125,10 @@ SHELL=$self->{config}->{SHELL}
PERL=$self->{config}->{PERL}
CPP=$self->{config}->{CPP}
-CPPFLAGS=$self->{config}->{CPPFLAGS}
+CPPFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H $self->{config}->{CPPFLAGS}
CC=$self->{config}->{CC}
-CFLAGS=$builddir_headers-I\$(srcdir)/include -I\$(srcdir) -I\$(srcdir)/lib -D_SAMBA_BUILD_ -DHAVE_CONFIG_H $self->{config}->{CFLAGS} \$(CPPFLAGS)
+CFLAGS=$self->{config}->{CFLAGS} \$(CPPFLAGS)
PICFLAG=$self->{config}->{PICFLAG}
HOSTCC=$self->{config}->{HOSTCC}