summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/build/smb_build/output.pm5
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a58ed8cf76..74d87fad31 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -513,7 +513,7 @@ proto_test:
@[ -f $(builddir)/include/proto.h ] || $(MAKE) proto
clean: delheaders
- -rm -f *.o */*.o */*/*.o */*/*/*.o bin/* bin/.SUBSYSTEM_* bin/.MODULE_*
+ -rm -f *.o */*.o */*/*.o */*/*/*.o bin/* bin/.*_*
-rm -rf librpc/gen_*
distclean: clean
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 49b066f228..f156f7945b 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -70,6 +70,10 @@ sub create_output($)
$depend->{PROTO}{TYPE} = "PROTO";
$depend->{PROTO}{NAME} = "PROTO";
+ $depend->{ALL_OBJS}{OUTPUT_TYPE} = "OBJLIST";
+ $depend->{ALL_OBJS}{TYPE} = "";
+ $depend->{ALL_OBJS}{NAME} = "ALL_OBJS";
+
foreach $part (values %{$depend}) {
next if not defined($part->{OUTPUT_TYPE});
@@ -83,6 +87,7 @@ sub create_output($)
push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES});
push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES});
+ push(@{$depend->{ALL_OBJS}{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
push(@{$depend->{PROTO}{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if ((not defined ($part->{NOPROTO}) or $part->{NOPROTO} eq "NO") and defined(@{$part->{OBJ_LIST}}));
}