X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.in;h=94be6ceb4e0fe35465c2217607da3da27d0fbdc6;hb=5972f7a7a266fadbaa462755260767966724c72a;hp=7e0e1996bae9fc3955f7d8136b9de3a81c9fa116;hpb=0ee6bda859a68f00c7f4da97139cc9e9529e778b;p=gnulib.git diff --git a/lib/Makefile.in b/lib/Makefile.in index 7e0e1996b..94be6ceb4 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -31,8 +31,6 @@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -75,8 +73,8 @@ DEPDIR = @DEPDIR@ DF_PROG = @DF_PROG@ FESETROUND_LIBM = @FESETROUND_LIBM@ GENCAT = @GENCAT@ -GETCONF = @GETCONF@ GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ +GLIBC21 = @GLIBC21@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNU_PACKAGE = @GNU_PACKAGE@ @@ -90,7 +88,9 @@ INTLOBJS = @INTLOBJS@ KMEM_GROUP = @KMEM_GROUP@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ +LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_CRYPT = @LIB_CRYPT@ +LIB_NANOSLEEP = @LIB_NANOSLEEP@ MAKEINFO = @MAKEINFO@ MAN = @MAN@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -123,7 +123,7 @@ DEFS = -DLIBDIR=\"$(libdir)\" @DEFS@ libfetish_a_SOURCES = \ getdate.y posixtm.c addext.c argmatch.c backupfile.c basename.c \ - canon-host.c closeout.c dirname.c exclude.c filemode.c diacrit.c \ + canon-host.c closeout.c diacrit.c dirname.c exclude.c filemode.c \ full-write.c getopt.c getopt1.c getugroups.c hard-locale.c hash.c \ human.c idcache.c isdir.c linebuffer.c localcharset.c long-options.c \ makepath.c md5.c memcasecmp.c memcoll.c modechange.c path-concat.c \ @@ -172,7 +172,7 @@ ANSI2KNR = ../src/ansi2knr libfetish_a_AR = $(AR) cru am_libfetish_a_OBJECTS = getdate$U.o posixtm$U.o addext$U.o \ argmatch$U.o backupfile$U.o basename$U.o canon-host$U.o closeout$U.o \ -dirname$U.o exclude$U.o filemode$U.o diacrit$U.o full-write$U.o \ +diacrit$U.o dirname$U.o exclude$U.o filemode$U.o full-write$U.o \ getopt$U.o getopt1$U.o getugroups$U.o hard-locale$U.o hash$U.o \ human$U.o idcache$U.o isdir$U.o linebuffer$U.o localcharset$U.o \ long-options$U.o makepath$U.o md5$U.o memcasecmp$U.o memcoll$U.o \ @@ -192,7 +192,7 @@ HEADERS = $(noinst_HEADERS) depcomp = $(SHELL) $(top_srcdir)/depcomp DEP_FILES = @AMDEP@ $(DEPDIR)/addext$U.Po $(DEPDIR)/alloca.Po \ -$(DEPDIR)/argmatch$U.Po $(DEPDIR)/backupfile$U.Po \ +$(DEPDIR)/argmatch$U.Po $(DEPDIR)/atexit.Po $(DEPDIR)/backupfile$U.Po \ $(DEPDIR)/basename$U.Po $(DEPDIR)/canon-host$U.Po $(DEPDIR)/chown.Po \ $(DEPDIR)/closeout$U.Po $(DEPDIR)/diacrit$U.Po $(DEPDIR)/dirname$U.Po \ $(DEPDIR)/dup2.Po $(DEPDIR)/error.Po $(DEPDIR)/euidaccess.Po \ @@ -209,34 +209,34 @@ $(DEPDIR)/long-options$U.Po $(DEPDIR)/lstat.Po $(DEPDIR)/makepath$U.Po \ $(DEPDIR)/malloc.Po $(DEPDIR)/md5$U.Po $(DEPDIR)/memcasecmp$U.Po \ $(DEPDIR)/memchr.Po $(DEPDIR)/memcmp.Po $(DEPDIR)/memcoll$U.Po \ $(DEPDIR)/memcpy.Po $(DEPDIR)/memmove.Po $(DEPDIR)/memset.Po \ -$(DEPDIR)/mkdir.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po \ -$(DEPDIR)/mountlist.Po $(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po \ -$(DEPDIR)/path-concat$U.Po $(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po \ -$(DEPDIR)/quotearg$U.Po $(DEPDIR)/readtokens$U.Po \ -$(DEPDIR)/readutmp$U.Po $(DEPDIR)/realloc.Po $(DEPDIR)/regex.Po \ -$(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po $(DEPDIR)/safe-read$U.Po \ -$(DEPDIR)/same$U.Po $(DEPDIR)/save-cwd$U.Po $(DEPDIR)/savedir$U.Po \ -$(DEPDIR)/stat.Po $(DEPDIR)/stime.Po $(DEPDIR)/stpcpy.Po \ -$(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po $(DEPDIR)/strdup.Po \ -$(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \ -$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po $(DEPDIR)/strpbrk.Po \ -$(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po $(DEPDIR)/strtol.Po \ -$(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po $(DEPDIR)/strtoumax.Po \ -$(DEPDIR)/strverscmp.Po $(DEPDIR)/unicodeio$U.Po \ +$(DEPDIR)/mktime.Po $(DEPDIR)/modechange$U.Po $(DEPDIR)/mountlist.Po \ +$(DEPDIR)/nanosleep.Po $(DEPDIR)/obstack.Po $(DEPDIR)/path-concat$U.Po \ +$(DEPDIR)/posixtm$U.Po $(DEPDIR)/putenv.Po $(DEPDIR)/quotearg$U.Po \ +$(DEPDIR)/readtokens$U.Po $(DEPDIR)/readutmp$U.Po $(DEPDIR)/realloc.Po \ +$(DEPDIR)/regex.Po $(DEPDIR)/rmdir.Po $(DEPDIR)/rpmatch.Po \ +$(DEPDIR)/safe-read$U.Po $(DEPDIR)/same$U.Po $(DEPDIR)/save-cwd$U.Po \ +$(DEPDIR)/savedir$U.Po $(DEPDIR)/stat.Po $(DEPDIR)/stime.Po \ +$(DEPDIR)/stpcpy.Po $(DEPDIR)/strcasecmp.Po $(DEPDIR)/strcspn.Po \ +$(DEPDIR)/strdup.Po $(DEPDIR)/strftime.Po $(DEPDIR)/stripslash$U.Po \ +$(DEPDIR)/strncasecmp.Po $(DEPDIR)/strndup.Po $(DEPDIR)/strnlen.Po \ +$(DEPDIR)/strpbrk.Po $(DEPDIR)/strstr.Po $(DEPDIR)/strtod.Po \ +$(DEPDIR)/strtol.Po $(DEPDIR)/strtoul.Po $(DEPDIR)/strtoull.Po \ +$(DEPDIR)/strtoumax.Po $(DEPDIR)/strverscmp.Po $(DEPDIR)/unicodeio$U.Po \ $(DEPDIR)/userspec$U.Po $(DEPDIR)/utime.Po $(DEPDIR)/version-etc$U.Po \ $(DEPDIR)/xgetcwd$U.Po $(DEPDIR)/xgethostname$U.Po \ $(DEPDIR)/xmalloc$U.Po $(DEPDIR)/xstrdup$U.Po $(DEPDIR)/xstrtod$U.Po \ $(DEPDIR)/xstrtol$U.Po $(DEPDIR)/xstrtoul$U.Po \ $(DEPDIR)/xstrtoumax$U.Po $(DEPDIR)/yesno$U.Po -DIST_COMMON = $(noinst_HEADERS) ChangeLog Makefile.am Makefile.in TODO \ -alloca.c chown.c dup2.c error.c error.h euidaccess.c fileblocks.c \ -fnmatch.c fsusage.c ftruncate.c getdate.c getgroups.c gethostname.c \ -getline.c getloadavg.c getusershell.c group-member.c lchown.c malloc.c \ -memchr.c memcmp.c memcpy.c memmove.c memset.c mkdir.c mktime.c \ -mountlist.c nanosleep.c obstack.c obstack.h putenv.c realloc.c regex.c \ -rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c strcspn.c strdup.c \ -strftime.c strncasecmp.c strndup.c strpbrk.c strstr.c strtod.c strtol.c \ -strtoul.c strtoull.c strtoumax.c strverscmp.c utime.c +DIST_COMMON = README $(noinst_HEADERS) ChangeLog Makefile.am \ +Makefile.in TODO alloca.c atexit.c chown.c dup2.c error.c error.h \ +euidaccess.c fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c \ +getgroups.c gethostname.c getline.c getloadavg.c getusershell.c \ +group-member.c lchown.c malloc.c memchr.c memcmp.c memcpy.c memmove.c \ +memset.c mktime.c mountlist.c nanosleep.c obstack.c obstack.h putenv.c \ +realloc.c regex.c rmdir.c rpmatch.c stime.c stpcpy.c strcasecmp.c \ +strcspn.c strdup.c strftime.c strncasecmp.c strndup.c strnlen.c \ +strpbrk.c strstr.c strtod.c strtol.c strtoul.c strtoull.c strtoumax.c \ +strverscmp.c utime.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -300,6 +300,8 @@ alloca_.c: alloca.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/alloca.c; then echo $(srcdir)/alloca.c; else echo alloca.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > alloca_.c argmatch_.c: argmatch.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/argmatch.c; then echo $(srcdir)/argmatch.c; else echo argmatch.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > argmatch_.c +atexit_.c: atexit.c $(ANSI2KNR) + $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atexit.c; then echo $(srcdir)/atexit.c; else echo atexit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atexit_.c backupfile_.c: backupfile.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/backupfile.c; then echo $(srcdir)/backupfile.c; else echo backupfile.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > backupfile_.c basename_.c: basename.c $(ANSI2KNR) @@ -394,8 +396,6 @@ memmove_.c: memmove.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c memset_.c: memset.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memset.c; then echo $(srcdir)/memset.c; else echo memset.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memset_.c -mkdir_.c: mkdir.c $(ANSI2KNR) - $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mkdir.c; then echo $(srcdir)/mkdir.c; else echo mkdir.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mkdir_.c mktime_.c: mktime.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mktime.c; then echo $(srcdir)/mktime.c; else echo mktime.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mktime_.c modechange_.c: modechange.c $(ANSI2KNR) @@ -454,6 +454,8 @@ strncasecmp_.c: strncasecmp.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strncasecmp.c; then echo $(srcdir)/strncasecmp.c; else echo strncasecmp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strncasecmp_.c strndup_.c: strndup.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strndup.c; then echo $(srcdir)/strndup.c; else echo strndup.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strndup_.c +strnlen_.c: strnlen.c $(ANSI2KNR) + $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strnlen.c; then echo $(srcdir)/strnlen.c; else echo strnlen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strnlen_.c strpbrk_.c: strpbrk.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/strpbrk.c; then echo $(srcdir)/strpbrk.c; else echo strpbrk.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > strpbrk_.c strstr_.c: strstr.c $(ANSI2KNR) @@ -496,21 +498,21 @@ xstrtoumax_.c: xstrtoumax.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/xstrtoumax.c; then echo $(srcdir)/xstrtoumax.c; else echo xstrtoumax.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > xstrtoumax_.c yesno_.c: yesno.c $(ANSI2KNR) $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/yesno.c; then echo $(srcdir)/yesno.c; else echo yesno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > yesno_.c -addext_.o alloca_.o argmatch_.o backupfile_.o basename_.o canon-host_.o \ -chown_.o closeout_.o diacrit_.o dirname_.o dup2_.o error_.o \ -euidaccess_.o exclude_.o fileblocks_.o filemode_.o fnmatch_.o \ +addext_.o alloca_.o argmatch_.o atexit_.o backupfile_.o basename_.o \ +canon-host_.o chown_.o closeout_.o diacrit_.o dirname_.o dup2_.o \ +error_.o euidaccess_.o exclude_.o fileblocks_.o filemode_.o fnmatch_.o \ fsusage_.o ftruncate_.o full-write_.o getdate_.o getgroups_.o \ gethostname_.o getline_.o getloadavg_.o getopt_.o getopt1_.o \ getugroups_.o getusershell_.o group-member_.o hard-locale_.o hash_.o \ human_.o idcache_.o isdir_.o lchown_.o linebuffer_.o localcharset_.o \ long-options_.o lstat_.o makepath_.o malloc_.o md5_.o memcasecmp_.o \ -memchr_.o memcmp_.o memcoll_.o memcpy_.o memmove_.o memset_.o mkdir_.o \ -mktime_.o modechange_.o mountlist_.o nanosleep_.o obstack_.o \ -path-concat_.o posixtm_.o putenv_.o quotearg_.o readtokens_.o \ -readutmp_.o realloc_.o regex_.o rmdir_.o rpmatch_.o safe-read_.o \ -same_.o save-cwd_.o savedir_.o stat_.o stime_.o stpcpy_.o strcasecmp_.o \ -strcspn_.o strdup_.o strftime_.o stripslash_.o strncasecmp_.o \ -strndup_.o strpbrk_.o strstr_.o strtod_.o strtol_.o strtoul_.o \ +memchr_.o memcmp_.o memcoll_.o memcpy_.o memmove_.o memset_.o mktime_.o \ +modechange_.o mountlist_.o nanosleep_.o obstack_.o path-concat_.o \ +posixtm_.o putenv_.o quotearg_.o readtokens_.o readutmp_.o realloc_.o \ +regex_.o rmdir_.o rpmatch_.o safe-read_.o same_.o save-cwd_.o \ +savedir_.o stat_.o stime_.o stpcpy_.o strcasecmp_.o strcspn_.o \ +strdup_.o strftime_.o stripslash_.o strncasecmp_.o strndup_.o \ +strnlen_.o strpbrk_.o strstr_.o strtod_.o strtol_.o strtoul_.o \ strtoull_.o strtoumax_.o strverscmp_.o unicodeio_.o userspec_.o \ utime_.o version-etc_.o xgetcwd_.o xgethostname_.o xmalloc_.o \ xstrdup_.o xstrtod_.o xstrtol_.o xstrtoul_.o xstrtoumax_.o yesno_.o : \ @@ -558,6 +560,7 @@ maintainer-clean-tags: @AMDEP@include $(DEPDIR)/addext$U.Po @AMDEP@include $(DEPDIR)/alloca.Po @AMDEP@include $(DEPDIR)/argmatch$U.Po +@AMDEP@include $(DEPDIR)/atexit.Po @AMDEP@include $(DEPDIR)/backupfile$U.Po @AMDEP@include $(DEPDIR)/basename$U.Po @AMDEP@include $(DEPDIR)/canon-host$U.Po @@ -605,7 +608,6 @@ maintainer-clean-tags: @AMDEP@include $(DEPDIR)/memcpy.Po @AMDEP@include $(DEPDIR)/memmove.Po @AMDEP@include $(DEPDIR)/memset.Po -@AMDEP@include $(DEPDIR)/mkdir.Po @AMDEP@include $(DEPDIR)/mktime.Po @AMDEP@include $(DEPDIR)/modechange$U.Po @AMDEP@include $(DEPDIR)/mountlist.Po @@ -635,6 +637,7 @@ maintainer-clean-tags: @AMDEP@include $(DEPDIR)/stripslash$U.Po @AMDEP@include $(DEPDIR)/strncasecmp.Po @AMDEP@include $(DEPDIR)/strndup.Po +@AMDEP@include $(DEPDIR)/strnlen.Po @AMDEP@include $(DEPDIR)/strpbrk.Po @AMDEP@include $(DEPDIR)/strstr.Po @AMDEP@include $(DEPDIR)/strtod.Po @@ -790,16 +793,23 @@ stat.c: xstat.in # which is shared with other installed packages. We use a list of referencing # packages so that "make uninstall" will remove the file if and only if it # is not used by another installed package. +# On systems with glibc-2.1 or newer, the file is redundant, therefore we +# avoid installing it. -all-local: charset.alias ref-add.sed ref-del.sed +all-local: charset.alias ref-add.sed ref-del.sed lstat.c stat.c install-exec-local: all-local $(mkinstalldirs) $(DESTDIR)$(libdir) - test -f $(charset_alias) \ - && orig=$(charset_alias) \ - || orig=charset.alias; \ - sed -f ref-add.sed $$orig > $(charset_tmp) - $(INSTALL_DATA) $(charset_tmp) $(charset_alias) - rm -f $(charset_tmp) + if test -f $(charset_alias); then \ + sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + else \ + if test @GLIBC21@ = no; then \ + sed -f ref-add.sed charset.alias > $(charset_tmp) ; \ + $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \ + rm -f $(charset_tmp) ; \ + fi ; \ + fi uninstall-local: all-local if test -f $(charset_alias); then \ @@ -814,8 +824,8 @@ uninstall-local: all-local fi charset.alias: config.charset - $(SHELL) $(srcdir)/config.charset '@host@' > $@-t - mv $@-t $@ + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ + mv t-$@ $@ .sin.sed: sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > $@-t mv $@-t $@