-noinst_HEADERS = arith.h common.h rmt.h system.h tar.h
-rmt_SOURCES = rmt.c
-tar_SOURCES = buffer.c compare.c create.c delete.c extract.c \
- xheader.c incremen.c list.c mangle.c misc.c names.c rtapelib.c tar.c update.c
-
-localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir)/lib -I../lib
-
-DISTCLEANFILES = localedir.h
-localedir.h : Makefile
- echo '#define LOCALEDIR "$(localedir)"' >$@
-rmt.o tar.o : localedir.h
-
-LDADD = ../lib/libtar.a $(LIBINTL)
-
-rmt_LDADD = $(LDADD) $(LIB_SETSOCKOPT)
-tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
+noinst_HEADERS = arith.h common.h tar.h
+tar_SOURCES = \
+ buffer.c\
+ checkpoint.c\
+ compare.c\
+ create.c\
+ delete.c\
+ exit.c\
+ extract.c\
+ xheader.c\
+ incremen.c\
+ list.c\
+ misc.c\
+ names.c\
+ sparse.c\
+ suffix.c\
+ system.c\
+ tar.c\
+ transform.c\
+ unlink.c\
+ update.c\
+ utf8.c\
+ warning.c
+
+INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib
+
+LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV)
+
+tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)