X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.am;h=f2e77553afe829f7d81531c713caf8398c53b78e;hb=ecd76948cbe7a787761c9a71739256abb9b85d8c;hp=843b9d315e1e57186659807bd9879201e3bb6be9;hpb=eacdc2f6c638352494527e483cbee14639d69860;p=gnulib.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 843b9d315..f2e77553a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,46 +1,25 @@
 ## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = fu
+noinst_LIBRARIES = libfu.a
 
-EXTRA_DIST = alloca.c basename.c error.c euidaccess.c fnmatch.c fsusage.c \
-ftruncate.c getdate.y group-member.c memcmp.c memcpy.c memset.c \
-mkdir.c mktime.c mountlist.c obstack.c posixtm.y regex.c rx.c \
-rename.c rmdir.c rpmatch.c \
-stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
+## FIXME: Remove mvdir.c, and rmdir.c when
+## automake is fixed -- probably for 1.1g
+EXTRA_DIST = chown.c mkdir.c rmdir.c getline.c mktime.c strftime.c getgroups.c
 
-INCLUDES = -I.. -I$(srcdir)
 INCLUDES = -I.. -I$(srcdir) -I../intl
 
-fu_SOURCES = getdate.c getline.c getopt.c getopt1.c posixtm.c \
-argmatch.c backupfile.c \
-dirname.c fileblocks.c filemode.c \
-full-write.c getversion.c idcache.c \
-isdir.c long-options.c makepath.c modechange.c path-concat.c \
+libfu_a_SOURCES = getdate.y posixtm.y getopt.c getopt1.c \
+addext.c argmatch.c backupfile.c basename.c dirname.c filemode.c \
+full-write.c idcache.c \
+isdir.c long-options.c makepath.c modechange.c oa-hash.c path-concat.c \
 safe-read.c save-cwd.c savedir.c stripslash.c userspec.c xgetcwd.c \
 xmalloc.c xstrdup.c xstrtol.c xstrtoul.c yesno.c
 
-fu_LIBADD = @LIBOBJS@ @ALLOCA@
+libfu_a_LIBADD = @LIBOBJS@ @ALLOCA@
+libfu_a_DEPENDENCIES = $(libfu_a_LIBADD)
 
 noinst_HEADERS = argmatch.h backupfile.h error.h fnmatch.h fsusage.h \
-getline.h getopt.h group-member.h long-options.h makepath.h modechange.h \
-mountlist.h obstack.h path-concat.h pathmax.h regex.h rx.h \
-save-cwd.h xstrtol.h xstrtoul.h
+getdate.h getline.h getopt.h group-member.h long-options.h \
+makepath.h modechange.h mountlist.h oa-hash.h path-concat.h pathmax.h \
+save-cwd.h xstrtol.h xstrtoul.h strverscmp.h
 
 BUILT_SOURCES = getdate.c posixtm.c
-
-# Since this directory contains two parsers, we have to be careful to avoid
-# running two $(YACC)s during parallel makes.  See below.
-getdate.c: @MAINT@getdate.y
-	@echo expect 10 shift/reduce conflicts
-	$(YACC) $(srcdir)/getdate.y
-	mv y.tab.c getdate.c
-
-# Make the rename atomic, in case sed is interrupted and later rerun.
-# The artificial dependency on getdate.c keeps the two parsers from being
-# built in parallel.  Enforcing this little bit of sequentiality lets
-# everyone (even those without bison) still run mostly parallel builds.
-posixtm.c: @MAINT@posixtm.y getdate.c
-	$(YACC) $(srcdir)/posixtm.y
-	mv y.tab.c posixtm.tab.c
-	sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c
-	mv tposixtm.c posixtm.c
-	rm -f posixtm.tab.c