ICE-6433: config/makedepend.py: replace with sed?

4 files changed, 15 insertions, 15 deletions

diff --git a/csharp/config/Make.rules.cs b/csharp/config/Make.rules.cs
index b4757dd8ef4..fc29a6a0a22 100644
--- a/csharp/config/Make.rules.cs
+++ b/csharp/config/Make.rules.cs
@@ -251,7 +251,7 @@ include $(wildcard .depend/*.d)
 $(GDIR)/%.cs: $(SDIR)/%.ice
 	$(SLICE2CS) --output-dir $(GDIR) $(SLICE2CSFLAGS) $<
 	@mkdir -p .depend
-	@$(SLICE2CS) --output-dir $(GDIR) $(SLICE2CSFLAGS) --depend $< | $(top_srcdir)/../config/makedepend.py "generated/" > .depend/$(*F).ice.d
+	@$(SLICE2CS) --output-dir $(GDIR) $(SLICE2CSFLAGS) --depend $< | sed 's/\(.*: \\\)/generated\/\1/' > .depend/$(*F).ice.d
 
 all:: $(TARGETS)
 
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules
index 01724d1681c..59688462371 100644
--- a/objective-c/config/Make.rules
+++ b/objective-c/config/Make.rules
@@ -146,7 +146,7 @@ $(HDIR)/%F.h: $(SDIR)/%F.ice $(SLICE2OBJC)
 	mv $(*F)F.h $(HDIR)
 	@touch $(*F)F.m
 	@mkdir -p .depend
-	@$(SLICE2OBJC) $(SLICE2OBJCFLAGS) --depend $< | $(ice_dir)/config/makedepend.py "\$$(HDIR)/" > .depend/$(*F)F.ice.d
+	@$(SLICE2OBJC) $(SLICE2OBJCFLAGS) --depend $< | sed 's/\(.*: \\\)/\$$(HDIR)\/\1/' > .depend/$(*F)F.ice.d
 
 $(HDIR)/%.h %.m: $(SDIR)/%.ice $(SLICE2OBJC)
 	rm -f $(HDIR)/$(*F).h $(*F).m
@@ -154,7 +154,7 @@ $(HDIR)/%.h %.m: $(SDIR)/%.ice $(SLICE2OBJC)
 	mv $(*F).h $(HDIR)
 	@touch $(*F).m
 	@mkdir -p .depend
-	@$(SLICE2OBJC) $(SLICE2OBJCFLAGS) --depend $< | $(ice_dir)/config/makedepend.py "\$$(HDIR)/" > .depend/$(*F).ice.d
+	@$(SLICE2OBJC) $(SLICE2OBJCFLAGS) --depend $< | sed 's/\(.*: \\\)/\$$(HDIR)\/\1/' > .depend/$(*F).ice.d
 
 %.h %.m: %.ice $(SLICE2OBJC)
 	rm -f $(*F).h $(*F).m
diff --git a/php/lib/Makefile b/php/lib/Makefile
index e46fbc6ec47..e672ab05f2f 100644
--- a/php/lib/Makefile
+++ b/php/lib/Makefile
@@ -122,42 +122,42 @@ Ice/%.php: $(slicedir)/Ice/%.ice $(SLICE2PHP) $(SLICEPARSERLIB)
 	$(SLICE2PHP) --output-dir Ice $(SLICE2PHPFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2PHP) --output-dir Ice $(SLICE2PHPFLAGS) --depend $< \
-		| $(top_srcdir)/../config/makedepend.py "Ice/" > .depend/Ice_$(*F).ice.d
+		| sed 's/\(.*: \\\)/Ice\/\1/' > .depend/Ice_$(*F).ice.d
 
 Glacier2/%.php: $(slicedir)/Glacier2/%.ice $(SLICE2PHP) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2PHP) --output-dir Glacier2 $(SLICE2PHPFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2PHP) --output-dir Glacier2 $(SLICE2PHPFLAGS) --depend $< \
-		| $(top_srcdir)/../config/makedepend.py "Glacier2/" > .depend/Glacier2_$(*F).ice.d
+		| sed 's/\(.*: \\\)/Glacier2\/\1/' > .depend/Glacier2_$(*F).ice.d
 
 IceBox/%.php: $(slicedir)/IceBox/%.ice $(SLICE2PHP) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2PHP) --output-dir IceBox $(SLICE2PHPFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2PHP) --output-dir IceBox $(SLICE2PHPFLAGS) --depend $< \
-		| $(top_srcdir)/../config/makedepend.py "IceBox/" > .depend/IceBox_$(*F).ice.d
+		| sed 's/\(.*: \\\)/IceBox\/\1/' > .depend/IceBox_$(*F).ice.d
 
 IceGrid/%.php: $(slicedir)/IceGrid/%.ice $(SLICE2PHP) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2PHP) --output-dir IceGrid $(SLICE2PHPFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2PHP) --output-dir IceGrid $(SLICE2PHPFLAGS) --depend $< \
-		| $(top_srcdir)/../config/makedepend.py "IceGrid/" > .depend/IceGrid_$(*F).ice.d
+		| sed 's/\(.*: \\\)/IceGrid\/\1/' > .depend/IceGrid_$(*F).ice.d
 
 IcePatch2/%.php: $(slicedir)/IcePatch2/%.ice $(SLICE2PHP) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2PHP) --output-dir IcePatch2 $(SLICE2PHPFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2PHP) --output-dir IcePatch2 $(SLICE2PHPFLAGS) --depend $< \
-		| $(top_srcdir)/../config/makedepend.py "IcePatch2/" > .depend/IcePatch2_$(*F).ice.d
+		| sed 's/\(.*: \\\)/IcePatch2\/\1/' > .depend/IcePatch2_$(*F).ice.d
 
 IceStorm/%.php: $(slicedir)/IceStorm/%.ice $(SLICE2PHP) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2PHP) --output-dir $(notdir $(<D)) $(SLICE2PHPFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2PHP) --output-dir IceStorm $(SLICE2PHPFLAGS) --depend $< \
-		| $(top_srcdir)/../config/makedepend.py "IceStorm/" > .depend/IceStorm_$(*F).ice.d
+		| sed 's/\(.*: \\\)/IceStorm\/\1/' > .depend/IceStorm_$(*F).ice.d
 
 install:: $(ALL_SRCS)
 	@echo "Installing generated code"
diff --git a/ruby/ruby/Makefile b/ruby/ruby/Makefile
index deebfa22b08..884486b85b0 100644
--- a/ruby/ruby/Makefile
+++ b/ruby/ruby/Makefile
@@ -123,42 +123,42 @@ Ice/%.rb: $(slicedir)/Ice/%.ice $(SLICE2RB) $(SLICEPARSERLIB)
 	$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) --depend $< | \
-		$(top_srcdir)/../config/makedepend.py "Ice/" > .depend/Ice_$(*F).ice.d
+		sed 's/\(.*: \\\)/Ice\/\1/' > .depend/Ice_$(*F).ice.d
 
 Glacier2/%.rb: $(slicedir)/Glacier2/%.ice $(SLICE2RB) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) --depend $< | \
-		$(top_srcdir)/../config/makedepend.py "Glacier2/" > .depend/Glacier2_$(*F).ice.d
+		sed 's/\(.*: \\\)/Glacier2\/\1/' > .depend/Glacier2_$(*F).ice.d
 
 IceBox/%.rb: $(slicedir)/IceBox/%.ice $(SLICE2RB) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) --depend $< | \
-		$(top_srcdir)/../config/makedepend.py "IceBox/" > .depend/IceBox_$(*F).ice.d
+		sed 's/\(.*: \\\)/IceBox\/\1/' > .depend/IceBox_$(*F).ice.d
 
 IceGrid/%.rb: $(slicedir)/IceGrid/%.ice $(SLICE2RB) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) --depend $< | \
-		$(top_srcdir)/../config/makedepend.py "IceGrid/" > .depend/IceGrid_$(*F).ice.d
+		sed 's/\(.*: \\\)/IceGrid\/\1/' > .depend/IceGrid_$(*F).ice.d
 
 IcePatch2/%.rb: $(slicedir)/IcePatch2/%.ice $(SLICE2RB) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) --depend $< | \
-		$(top_srcdir)/../config/makedepend.py "IcePatch2/" > .depend/IcePatch2_$(*F).ice.d
+		sed 's/\(.*: \\\)/IcePatch2\/\1/' > .depend/IcePatch2_$(*F).ice.d
 
 IceStorm/%.rb: $(slicedir)/IceStorm/%.ice $(SLICE2RB) $(SLICEPARSERLIB)
 	@mkdir -p $(notdir $(<D))
 	$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) $<
 	@mkdir -p .depend
 	@$(SLICE2RB) --output-dir $(notdir $(<D)) $(SLICE2RBFLAGS) --depend $< | \
-		$(top_srcdir)/../config/makedepend.py "IceStorm/" > .depend/IceStorm_$(*F).ice.d
+		sed 's/\(.*: \\\)/IceStorm\/\1/' > .depend/IceStorm_$(*F).ice.d
 
 install:: $(ALL_SRCS)
 	@echo "Installing generated code"