Amaya/Makefile.in - diff

Return to Makefile.in CVS log

Up to [Public] / Amaya

Diff for /Amaya/Makefile.in between versions 1.69 and 1.70

version 1.69, 2002/06/03 07:40:27	version 1.70, 2002/06/03 09:23:26
Line 16 LIBPNG = libpng	Line 16 LIBPNG = libpng
LIBZ = libz	LIBZ = libz

#MKP: adding davlib	#MKP: adding davlib
SUBDIRS = tools thotlib tablelib batch drawlib indexlib annotlib amaya thot davlib	SUBDIRS = tools thotlib tablelib batch drawlib indexlib annotlib amaya thot @DAVDIR@
EXTRA_SUBDIRS= misc pluginlib	EXTRA_SUBDIRS= misc pluginlib

prefix = @prefix@	prefix = @prefix@
Line 28 srcdir = $(THOTDIR)	Line 28 srcdir = $(THOTDIR)

@SET_MAKE@	@SET_MAKE@


ifeq ($(GL_INCLUDES), )
default : tools thotlib tablelib batch amaya_prog print_prog	default : tools thotlib tablelib batch amaya_prog print_prog
else
default : tools thotlib tablelib batch amaya_prog
endif

amaya : tools thotlib tablelib amaya_prog	amaya : tools thotlib tablelib amaya_prog

Line 174 AMAYA_LIBWWW_STANDARD_LIBS = \	Line 169 AMAYA_LIBWWW_STANDARD_LIBS = \
libwwwutils \	libwwwutils \
libwwwftp \	libwwwftp \
libwwwxml \	libwwwxml \
libwwwzip	libwwwzip \
	@LIBDAV@

libwww_config : force	libwww_config : force
@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \	@(if [ ! -d $(THOTDIR)/../$(LIBWWW) ] ; then \
Line 188 libwww_config : force	Line 184 libwww_config : force
cd $(LIBWWW) ; unset LANG; \	cd $(LIBWWW) ; unset LANG; \
if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \	if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
$$libwwwdir/configure \	$$libwwwdir/configure \
--with-dav \
--disable-shared \	--disable-shared \
	@WITHDAV@ \
--with-zlib="$$localdir/libz.a"; \	--with-zlib="$$localdir/libz.a"; \
$(ECHO) "libwww is configured" ; \	$(ECHO) "libwww is configured" ; \
fi)	fi)

Webmaster

Removed from v.1.69
changed lines
	Added in v.1.70