diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-13 20:04:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:59 -0500 |
| commit | b8b01cd970de6718271bea25262c77352bf77d4b (patch) | |
| tree | fdb5fc4bc1fe4e5f6a109e043ef9ada05e1b9c93 | |
| parent | b7d574cf86d61e72c7804443ed6f57e8e090349b (diff) | |
| download | samba-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)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 4 | ||||
| -rw-r--r-- | source4/lib/cmdline/config.mk | 3 |
2 files changed, 4 insertions, 3 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} diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk index b97bd75d82..b8771282a9 100644 --- a/source4/lib/cmdline/config.mk +++ b/source4/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 |