Update.

[platform/upstream/glibc.git] / sysdeps / generic / Makefile

diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile
index f4d001b..4d6c604 100644 (file)
--- a/sysdeps/generic/Makefile
+++ b/sysdeps/generic/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
+# Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -16,23 +16,24 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-ifeq (,$(filter-out $(sysdep_dir)/stub/ $(common-objpfx),\
-       $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bytesex.h))))))
+ifeq (,$(filter-out $(sysdep_dir)/generic/bits $(common-objpfx)/bits,\
+       $(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/bits/endian.h))))))
 
 $(common-objpfx)bytesex.h: $(common-objpfx)det_endian
        $(dir $<)$(notdir $<) > $@-tmp
        mv $@-tmp $@
 
 $(common-objpfx)det_endian: $(sysdep_dir)/generic/det_endian.c
-       $(native-compile)
+       $(common-objdir-compile)
 
-before-compile := $(before-compile) $(common-objpfx)bytesex.h
-common-generated := $(common-generated) bytesex.h det_endian
+before-compile := $(before-compile) $(common-objpfx)bits/endian.h
+common-generated := $(common-generated) bits/endian.h det_endian
 
 endif
 \f
 ifeq ($(subdir),stdio-common)
 ifneq ($(inhibit-siglist),yes)
+ifneq ($(cross-compiling),yes)
 ifeq   "$(filter %siglist.c,$(before-compile))" ""
 before-compile := $(before-compile) $(objpfx)siglist.c
 $(objpfx)siglist.c: $(objpfx)make_siglist
@@ -40,17 +41,16 @@ $(objpfx)siglist.c: $(objpfx)make_siglist
        $(dir $<)$(notdir $<) > $@-tmp
        mv $@-tmp $@
 
+make_siglist-CFLAGS = -DSIGNUM_H=\"$(shell pwd)/$(firstword $(wildcard \
+                                  $(+sysdep_dirs:%=%/bits/signum.h)))\"
 $(objpfx)make_siglist: $(sysdep_dir)/generic/make_siglist.c
-       $(make-target-directory)
-       signum_h=`cd $(dir $(firstword $(wildcard \
-                          $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h; \
-       $(native-compile) \
-       -DSIGNUM_H=\"$${signum_h}\"
+       $(native-compile)
 
 generated := $(generated) make_siglist siglist.c
 endif
 endif
 endif
+endif
 
 ifeq ($(subdir),string)
 CFLAGS-wordcopy.c += -Wno-uninitialized