The branch, master has been updated via 2498dec90f5284a9fdcabb3eea44d569a8802975 (commit) from 78a5cfaaee5c6f95736667e265d5defe1e60ede2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 2498dec90f5284a9fdcabb3eea44d569a8802975 Author: Andrew Cagney <cagney@toil.yyz.redhat.com> Date: Mon Apr 14 16:44:17 2008 -0400 Avoid .deps in arch32 compiles. frysk-common/ChangeLog 2008-04-14 Andrew Cagney <cagney@redhat.com> * Makefile.gen.sh (echo_arch32_PROGRAMS): Run the compiler directly; to avoid .deps stuff. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 3 +++ frysk-common/Makefile.gen.sh | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 36bdc4c..ad517af 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,8 @@ 2008-04-14 Andrew Cagney <cagney@redhat.com> + * Makefile.gen.sh (echo_arch32_PROGRAMS): Run the compiler + directly; to avoid .deps stuff. + * Makefile.rules (SUBST): For .c and .cxx, add a #line directive pointing to the original file. diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh index 20a1ea8..f05302c 100755 --- a/frysk-common/Makefile.gen.sh +++ b/frysk-common/Makefile.gen.sh @@ -262,10 +262,13 @@ am_${name_}_OBJECTS = ${dir_name}/arch32/${base_name}.\$(OBJEXT) ${name_}_LINK = \$(ARCH32_${linker}) ${dir}32_PROGRAMS += ${dir_name}/arch32/${base_name} MOSTLYCLEANFILES += ${dir_name}/arch32/${base_name}.\$(OBJEXT) -${dir_name}/arch32/${base_name}.\$(OBJEXT): \$(${name_}_SOURCES) frysk/pkglibdir/arch32/\$(am__dirstamp) - source='\$<' object='\$@' libtool=no \ - DEPDIR=\$(DEPDIR) \$(CCDEPMODE) \$(depcomp) \ +# XXX: Re-compile whenever the base .o file chages; avoids getting +# .deps working. +${dir_name}/arch32/${base_name}.\$(OBJEXT): ${file} \$(ARCH32_${compiler}) -c -o \$@ $< +${dir_name}/arch32/${base_name}.\$(OBJEXT): \\ +${dir_name}/${base_name}.\$(OBJEXT) \\ +frysk/pkglibdir/arch32/\$(am__dirstamp) EOF if grep pthread.h ${file} > /dev/null 2>&1 ; then hooks/post-receive -- frysk system monitor/debugger