diff options
| -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 |