rpl/tools/Makefile.am - diff

Return to Makefile.am CVS log

Up to [local] / rpl / tools

Diff for /rpl/tools/Makefile.am between versions 1.12 and 1.15

version 1.12, 2010/04/17 18:57:45	version 1.15, 2010/05/19 09:22:42
Line 11 all:	Line 11 all:
\mv -f $$TMP @UNITS@/Makefile	\mv -f $$TMP @UNITS@/Makefile
@list='$(subdirs)'; for subdir in $$list; do \	@list='$(subdirs)'; for subdir in $$list; do \
echo "Making $@ in $$subdir"; \	echo "Making $@ in $$subdir"; \
$(MAKE) -C $$subdir $@ ; \	if [ $$subdir = @OPENSSL@ ]; then \
	$(MAKE) -C $$subdir -j1 $@; \
	else \
	$(MAKE) -C $$subdir $@; \
	fi; \
done;	done;
if [ ! -f @OPENSSL@/tests_success ]; then \	if [ ! -f @OPENSSL@/tests_success ]; then \
(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \	(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
Line 28 clean distclean:	Line 32 clean distclean:
$(MAKE) -C $$subdir -j1 $@; \	$(MAKE) -C $$subdir -j1 $@; \
else \	else \
$(MAKE) -C $$subdir $@; \	$(MAKE) -C $$subdir $@; \
fi;	fi; \
done;	done;
\rm @OPENSSL@/tests_success	if [ -f @OPENSSL@/tests_success ]; then \
	\rm -f @OPENSSL@/tests_success; \
	fi

install: all	install: all
$(mkinstalldirs) $(DESTDIR)$(bindir)	$(mkinstalldirs) $(DESTDIR)$(bindir)
Line 48 install: all	Line 54 install: all
$(INSTALL_DATA) $(FILE)/magic/magic.mgc \	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
$(DESTDIR)$(datadir)/rplfiles.mgc	$(DESTDIR)$(datadir)/rplfiles.mgc
$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
$(DESTDIR)$(bindir)/rplfile$(EXEEXT);	$(DESTDIR)$(bindir)/rplfile$(EXEEXT)

uninstall:	uninstall:
\rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \	\rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \

CVSweb interface <joel.bertrand@systella.fr>

Removed from v.1.12
changed lines
	Added in v.1.15