svn commit: samba r15578 - in branches/SAMBA_4_0/source: build/smb_build lib/cmdline

[jelmer at samba.org]

Author: jelmer
Date: 2006-05-13 20:04:44 +0000 (Sat, 13 May 2006)
New Revision: 15578

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15578

Log:
Move some cpp-specific things from CFLAGS to CPPFLAGS
Proper dependencies for POPT_SAMBA (fixes build when popt is in /usr/local)

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/lib/cmdline/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-05-13 19:57:09 UTC (rev 15577)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-05-13 20:04:44 UTC (rev 15578)
@@ -125,10 +125,10 @@
 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}
 

Modified: branches/SAMBA_4_0/source/lib/cmdline/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/config.mk	2006-05-13 19:57:09 UTC (rev 15577)
+++ branches/SAMBA_4_0/source/lib/cmdline/config.mk	2006-05-13 20:04:44 UTC (rev 15578)
@@ -6,8 +6,9 @@
 [SUBSYSTEM::POPT_SAMBA]
 PUBLIC_HEADERS = popt_common.h 
 OBJ_FILES = popt_common.o
+PUBLIC_DEPENDENCIES = LIBPOPT
 
 [SUBSYSTEM::POPT_CREDENTIALS]
 PRIVATE_PROTO_HEADER = popt_credentials.h
 OBJ_FILES = popt_credentials.o
-PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
+PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS