r15578: Move some cpp-specific things from CFLAGS to CPPFLAGS

Proper dependencies for POPT_SAMBA (fixes build when popt is in /usr/local)

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 3423b2ec7503c6e297e9a70ac6a0b4a6b4e853fc..aa2376b33593b514c5022c90841f27e9413064cc 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/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}
 

diff --git a/source/lib/cmdline/config.mk b/source/lib/cmdline/config.mk
index b97bd75d8237118a5a7648f87b0cc0401475308a..b8771282a9eb8fed94916633241c9d1905cc4fa5 100644 (file)
--- a/source/lib/cmdline/config.mk
+++ b/source/lib/cmdline/config.mk
@@ -6,8 +6,9 @@ PUBLIC_DEPENDENCIES = CREDENTIALS
 [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