rpl/tools/Makefile.in - diff

Return to Makefile.in CVS log

Up to [local] / rpl / tools

version 1.9, 2010/03/27 13:42:35	version 1.10, 2010/04/07 07:23:03
Line 421 all:	Line 421 all:
$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \
$(top_builddir)/tools/@ICONV@/lib/.libs/*.o	$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a	$(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) \	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
$(top_builddir)/tools/@FILE@/src/file.o \	$(top_builddir)/tools/@FILE@/src/file.o \
$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \	$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \
$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile \| \	$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile \| \
cut -d= -f2)	cut -d= -f2)
	>>>>>>> 1.9

clean distclean:	clean distclean:
@list='$(subdirs)'; for subdir in $$list; do \	@list='$(subdirs)'; for subdir in $$list; do \