diff options
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index 7827315541..1475ee09ee 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -152,6 +152,7 @@ sub run_config_mk($$$) # global stuff is considered part of the makefile if ($section eq "GLOBAL") { + if (!$infragment) { $makefile.="\n"; } $makefile .= $line; $infragment = 1; next; diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 4bf2e11b6e..e8761bfb8c 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -505,12 +505,9 @@ sub write($$) if ($self->{developer}) { $self->output(<<__EOD__ + #-include \$(ALL_OBJS:.o=.d) -IDL_FILES = \$(wildcard librpc/idl/*.idl) -\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.c,\$(IDL_FILES)) \\ -\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_\%_c.c,\$(IDL_FILES)) \\ -\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_\%_ejs.c,\$(IDL_FILES)) \\ -\$(patsubst librpc/idl/%.idl,librpc/gen_ndr/ndr_%.h,\$(IDL_FILES)): idl + __EOD__ ); } |