summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-08-09 09:58:30 +0000
committerJim Meyering <jim@meyering.net>2003-08-09 09:58:30 +0000
commit5a2082acb61ed7a9ed4b337d087a5ee8cd76072e (patch)
tree29e1547a526ed33e27b81514a5f0b142dbf903e6 /lib
parent4bbd70a251e5775032140ebe8a7e12ce19cfc200 (diff)
downloadcoreutils-5a2082acb61ed7a9ed4b337d087a5ee8cd76072e.tar.xz
(libfetish_a_SOURCES): Remove fnmatch_.h.
(lib_OBJECTS): New macro, for convenience when cutting and pasting Makefile.am templates from gnulib. (EXTRA_DIST): Remove fnmatch_loop.c. (BUILT_SOURCES): Append $(FNMATCH_H). Import the following changes from gnulib templates for alloca and fnmatch): (all-local $(lib_OBJECTS)): New dependencies. (alloca.h): Use alloca.h-t for temporary. (EXTRA_DIST): Append fnmatch_.h, fnmatch_loop.c. (fnmatch.h): New rule. (MOSTLYCLEANFILES): Add fnmatch.h, fnmatch.h-t. (DISTCLEANFILES): Remove fnmatch.h
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am28
1 files changed, 21 insertions, 7 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c1cfec2bd..c700f7c46 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -56,7 +56,6 @@ libfetish_a_SOURCES = \
exitfail.c exitfail.h \
filemode.c filemode.h \
file-type.c file-type.h \
- fnmatch_.h \
fopen-safer.c \
fsusage.h \
ftw_.h \
@@ -138,13 +137,15 @@ libfetish_a_SOURCES += \
libfetish_a_LIBADD = $(LIBOBJS) $(ALLOCA)
libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD)
+lib_OBJECTS = $(libfetish_a_OBJECTS)
+
BUILT_SOURCES = getdate.c
MAINTAINERCLEANFILES = $(BUILT_SOURCES)
MOSTLYCLEANFILES =
EXTRA_DIST = config.charset ref-add.sin ref-del.sin \
- fnmatch_loop.c inttostr.c inttostr.h
+ inttostr.c inttostr.h
# The following is needed in order to install a simple file in $(libdir)
# which is shared with other installed packages. We use a list of referencing
@@ -197,12 +198,25 @@ stdbool.h: stdbool_.h
BUILT_SOURCES += $(ALLOCA_H)
EXTRA_DIST += alloca_.h
-MOSTLYCLEANFILES += alloca.h alloca.ht
-# Create an <alloca.h> when the system
+
+# We need the following in order to create an <alloca.h> when the system
# doesn't have one that works with the given compiler.
+all-local $(lib_OBJECTS): @ALLOCA_H@
alloca.h: alloca_.h
- cp $(srcdir)/alloca_.h $@t
- mv $@t $@
+ cp $(srcdir)/alloca_.h alloca.h-t
+ mv alloca.h-t alloca.h
+MOSTLYCLEANFILES += alloca.h alloca.h-t
+
+BUILT_SOURCES += $(FNMATCH_H)
+EXTRA_DIST += fnmatch_.h fnmatch_loop.c
+
+# We need the following in order to create an <fnmatch.h> when the system
+# doesn't have one that supports the required API.
+all-local $(lib_OBJECTS): @FNMATCH_H@
+fnmatch.h: fnmatch_.h
+ cp $(srcdir)/fnmatch_.h fnmatch.h-t
+ mv fnmatch.h-t fnmatch.h
+MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
SUFFIXES = .sed .sin
.sin.sed:
@@ -210,4 +224,4 @@ SUFFIXES = .sed .sin
mv t-$@ $@
CLEANFILES = charset.alias ref-add.sed ref-del.sed
-DISTCLEANFILES = ftw.h search.h fnmatch.h
+DISTCLEANFILES = ftw.h search.h