-tar_SOURCES = arith.c buffer.c compare.c create.c delete.c extract.c \
-incremen.c list.c mangle.c misc.c names.c open3.c rtapelib.c tar.c update.c
-
-INCLUDES = -I../intl -I$(top_srcdir)/lib
-LDADD = ../lib/libtar.a @INTLLIBS@
-localedir = $(prefix)/@DATADIRNAME@/locale
-
-tar.o: tar.c
- $(COMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(srcdir)/tar.c
-
-tar._o: tar._c
- @rm -f _tar.c
- @ln tar._c _tar.c
- $(COMPILE) -DLOCALEDIR=\"$(localedir)\" -c _tar.c
- @mv _tar.o $@
- @rm _tar.c
-
-rmt.o: rmt.c
- $(COMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(srcdir)/rmt.c
-
-rmt._o: rmt._c
- @rm -f _rmt.c
- @ln rmt._c _rmt.c
- $(COMPILE) -DLOCALEDIR=\"$(localedir)\" -c _rmt.c
- @mv _rmt.o $@
- @rm _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\
+ sparse.c\
+ system.c\
+ tar.c\
+ update.c\
+ utf8.c
+
+localedir = $(datadir)/locale
+INCLUDES = -I$(top_srcdir)/lib -I../lib
+
+DISTCLEANFILES = localedir.h
+localedir.h : Makefile
+ echo '#define LOCALEDIR "$(localedir)"' >$@
+ echo "#ifndef DEFAULT_RMT_COMMAND" >> $@
+ echo "# define DEFAULT_RMT_COMMAND \"$(libexecdir)/`echo \"rmt\" | sed 's,^.*/,,;$(transform)'`$(EXEEXT)\"" >> $@
+ echo "#endif" >> $@
+
+rmt.o tar.o : localedir.h
+
+LDADD = ../lib/libtar.a $(LIBINTL)
+
+rmt_LDADD = $(LDADD) $(LIB_SETSOCKOPT)
+tar_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)