--- rpl/tools/Attic/Makefile.in	2010/03/27 13:42:35	1.9
+++ rpl/tools/Attic/Makefile.in	2010/04/07 07:23:03	1.10
@@ -421,11 +421,19 @@ all:
 	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \
 			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
 	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+<<<<<<< Makefile.in
+	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			$(top_builddir)/tools/@FILE@/src/file.o \
+			$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \
+			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
+			cut -d= -f2) $(LDFLAGS)
+=======
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 			$(top_builddir)/tools/@FILE@/src/file.o \
 			$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2)
+>>>>>>> 1.9
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \