From: adam <adam>
Date: Tue, 7 Jun 2005 14:07:06 +0000 (+0000)
Subject: replace "  ./" by "  " at line begininig for
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bcaf1aab647a1e5b6eb07da378a5bd0b5872a717;p=modules%2Fkernel.git

replace "  ./" by "  " at line begininig for
the dependance computation 'cause when a line
begin with
"  ./toto.hxx" (it's now the case with gcc3.4)
and $(top_builddir) is "..", the command

sed 's% $(top_builddir)/% $$(top_builddir)/%g'
becomes
sed 's% ../% $$(top_builddir)/%g'

and the "  ./" before toto.hxx is replaced by " ../"
by mystery of sed.
---

diff --git a/salome_adm/unix/depend.in b/salome_adm/unix/depend.in
index 09a46645a..92454ed10 100644
--- a/salome_adm/unix/depend.in
+++ b/salome_adm/unix/depend.in
@@ -44,6 +44,7 @@ depend:.depend
 	            obj=`basename $$dep .c`.lo;				      \
 	            sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@;   \
 	            $(CC) $(C_DEPEND_FLAG) $(CPPFLAGS) $$dep 2>/dev/null |    \
+                        sed 's%^  ./%  %g' |				      \
                         sed 's% $(srcdir)/% $$(srcdir)/%g' |		      \
                         sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' |	      \
                         sed 's% $(top_builddir)/% $$(top_builddir)/%g' |      \
@@ -54,6 +55,7 @@ depend:.depend
 	            obj=`basename $$dep .cc`.lo;			      \
 	            sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@;   \
 	            $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \
+                        sed 's%^  ./%  %g' |				      \
                         sed 's% $(srcdir)/% $$(srcdir)/%g' |		      \
                         sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' |	      \
                         sed 's% $(top_builddir)/% $$(top_builddir)/%g' |      \
@@ -64,6 +66,7 @@ depend:.depend
 	            obj=`basename $$dep .cxx`.lo;			      \
 	            sed '\%^'"$$obj"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@;   \
 	            $(CXX) $(CXX_DEPEND_FLAG) $(CXXFLAGS) $(CPPFLAGS) $$dep 2>/dev/null | \
+                        sed 's%^  ./%  %g' |				      \
                         sed 's% $(srcdir)/% $$(srcdir)/%g' |		      \
                         sed 's% $(top_srcdir)/% $$(top_srcdir)/%g' |	      \
                         sed 's% $(top_builddir)/% $$(top_builddir)/%g' |      \