summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-05-13 22:11:28 +0000
committerRoland McGrath <roland@gnu.org>1996-05-13 22:11:28 +0000
commita13dab1c0fc22afd6065e35619883e95f9241c6d (patch)
tree77bd3fd5ea6d7d94da835931f0458845118c8629
parenta5b7bf0e62e88494d82f7ca6474b6b8b669c1e98 (diff)
* extra-lib.mk: Skip the hair if $(object-suffixes-$(lib)) is empty.
* posix/glob.h [_AMIGA]: Remove `struct stat;' forward decl.
-rw-r--r--ChangeLog4
-rw-r--r--extra-lib.mk4
-rw-r--r--posix/glob.h4
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61a1bbdb89..876173ef40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
Mon May 13 12:03:03 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
+ * extra-lib.mk: Skip the hair if $(object-suffixes-$(lib)) is empty.
+
+ * posix/glob.h [_AMIGA]: Remove `struct stat;' forward decl.
+
* configure.in (--with-fp): Note in help string that it's the default.
* locale/programs/ld-ctype.c (struct locale_ctype_t): Use u_int32_t
diff --git a/extra-lib.mk b/extra-lib.mk
index f6a1c83e37..214ffcfe02 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -10,6 +10,8 @@ extra-libs-left := $(filter-out $(lib),$(extra-libs-left))
object-suffixes-$(lib) := $(filter-out $($(lib)-inhibit-o),$(object-suffixes))
+ifneq (,$(object-suffixes-$(lib)))
+
# Make sure these are simply-expanded variables before we append to them,
# since we want the expressions we append to be expanded right now.
install-lib := $(install-lib)
@@ -38,3 +40,5 @@ $(common-objpfx)$(patsubst %,$(libtype$o),$(lib:lib%=%)): \
endef
object-suffixes-left = $(object-suffixes-$(lib))
include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes-$(lib)))
+
+endif
diff --git a/posix/glob.h b/posix/glob.h
index 6eea06298c..73fd018066 100644
--- a/posix/glob.h
+++ b/posix/glob.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1996 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -65,7 +65,9 @@ extern "C"
#define GLOB_NOMATCH 3 /* No matches found. */
/* Structure describing a globbing run. */
+#ifndef _AMIGA /* Buggy compiler. */
struct stat;
+#endif
typedef struct
{
int gl_pathc; /* Count of paths matched by the pattern. */