X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libio%2Fconfig.shared;h=0c319c118a041c735132e3aa95e1f1433ddba972;hb=e49df37d256b5b05a861689fb88ad7c7fd2e2820;hp=ef5a8a531c21c884b47b504ee7a65497f9d7d685;hpb=6555fecdc5c175b395bfdaa0eeef1bbd9e65a1e5;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libio/config.shared b/libio/config.shared
index ef5a8a531c2..0c319c118a0 100644
--- a/libio/config.shared
+++ b/libio/config.shared
@@ -13,7 +13,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU CC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# the Free Software Foundation, 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.  */
 
 # File descriptor usage:
 # 1: All macros which need to be re-definable by any target fragments
@@ -180,13 +181,14 @@ if [ -z "${ALL}" ] ; then
   fi
 fi
 
-ALL='$(PICDIR)'" ${ALL}"
-
 echo >&2 "all: ${ALL} multi-all"
 if [ "${SUBDIRS}" != "" ] ; then
   echo >&2 '	@rootme=`pwd`/; export rootme; \'
   echo >&2 '	$(MAKE) "DODIRS=$(SUBDIRS)" DO=all $(FLAGS_TO_PASS) subdir_do'
 fi
+if [ "${LIBDIR}" = "yes" ]; then
+  echo >&2 "${ALL} "'multi-all: $(PICDIR)'
+fi
 echo >&2 '.PHONY: all'
 echo >&2 ''
 
@@ -265,23 +267,26 @@ echo >&2 '.SUFFIXES: .o .C .cc .c'
 echo >&2 'COMPILE.c = $(CC) -c $(XCFLAGS) $(CINCLUDES) $(MT_CFLAGS)'
 echo >&2 '.c.o:'
 if [ "${LIBDIR}" = "yes" ]; then
-echo >&2 '	test x"$(enable_shared)" != xyes ||\'
-echo >&2 '	  $(COMPILE.c) $(PICFLAG) $< -o pic/$@'
+echo >&2 '	if [ x"$(PICFLAG)" != x ]; then \'
+echo >&2 '	  $(COMPILE.c) $(PICFLAG) $< -o pic/$@; \'
+echo >&2 '	else true; fi'
 fi
 echo >&2 '	$(COMPILE.c) $<'
 [ "${TOUCH_ON_COMPILE}" = "yes" ] && echo >&2 '	@touch stamp'
 echo >&2 'COMPILE.cc = $(CXX) -c $(XCXXFLAGS) $(CXXINCLUDES) $(MT_CFLAGS)'
 echo >&2 '.C.o:'
 if [ "${LIBDIR}" = "yes" ]; then
-echo >&2 '	test x"$(enable_shared)" != xyes ||\'
-echo >&2 '	  $(COMPILE.cc) $(PICFLAG) $< -o pic/$@'
+echo >&2 '	if [ x"$(PICFLAG)" != x ]; then \'
+echo >&2 '	  $(COMPILE.cc) $(PICFLAG) $< -o pic/$@; \'
+echo >&2 '	else true; fi'
 fi
 echo >&2 '	$(COMPILE.cc) $<'
 [ "${TOUCH_ON_COMPILE}" = "yes" ] && echo >&2 '	@touch stamp'
 echo >&2 '.cc.o:'
 if [ "${LIBDIR}" = "yes" ]; then
-echo >&2 '	test x"$(enable_shared)" != xyes || \'
-echo >&2 '	  $(COMPILE.cc) $(PICFLAG) $< -o pic/$@'
+echo >&2 '	if [ x"$(PICFLAG)" != x ]; then \'
+echo >&2 '	  $(COMPILE.cc) $(PICFLAG) $< -o pic/$@; \'
+echo >&2 '	else true; fi'
 fi
 echo >&2 '	$(COMPILE.cc) $<'
 [ "${TOUCH_ON_COMPILE}" = "yes" ] && echo >&2 '	@touch stamp'
@@ -297,7 +302,7 @@ fi
 if [ "${LIBDIR}" = "yes" ]; then
   echo >&2 ''
   echo >&2 'stamp-picdir:'
-  echo >&2 '	if [ x"$(enable_shared)" = xyes ] && [ ! -d pic ]; then \'
+  echo >&2 '	if [ x"$(PICFLAG)" != x ] && [ ! -d pic ]; then \'
   echo >&2 '	  mkdir pic; \'
   echo >&2 '	else true; fi'
   echo >&2 '	touch stamp-picdir'
@@ -474,8 +479,8 @@ depend.new:
 	  >depend.new
 	$(CXX) -M $(CXXINCLUDES) $(DEPEND_SOURCES) \
 	| sed -e 's|$(srcdir)/|$$(srcdir)/|g' \
-	      -e 's| [^ ]_G_config.h| $$(_G_CONFIG_H)|g \
-	      -e 's| /[^ ]*||g' \
+	      -e 's| [^ ]*_G_config.h| $$(_G_CONFIG_H)|g' \
+	      -e 's| /[^ ]*||g' -e 's| libc-lock\.h||' \
 	      -e '/^[ 	]*\\$$/d' -e 's/^[ 	]*$$//' \
 	| sed -e 's|$$(srcdir)/[.][.]|$$(srcdir)/$$(MULTISRCTOP)..|g' \
 	      -e 's|$$(srcdir)/\([^/]*[.]c\)|\1|' \