Attachment #165120 for bug #237322





INCLUDES =-DHAVE_CONFIG_H -I.. \
	  -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
	  -I@top_srcdir@/amaya/f \
	  -I@top_srcdir@/thotlib/include \
	  -I@top_srcdir@/../libwww/Library/src \
	  -I@top_srcdir@/../libwww/modules/expat/lib \
	  -I$(DAVLIB)/tree/h -I$(DAVLIB)/h \
	  $(GUI_INCLUDES) @AMAYA_LIBWWW_INCLUDES@

OPTIONS	= @AMAYA_OPTIONS@ $(AMAYA_DAV_OPTIONS)

LIBWWW_LIBS= \
		-lwwwdav \
		@AMAYA_LIBWWW_LIBS@
			-lwwwhttp \
			-lwwwxml \
			-lwwwhtml \
			-lwwwmime \
			-lwwwcache \
			-lwwwstream \
			-lwwwfile \
			-lwwwdir \
			-lwwwtrans \
			-lwwwcore \
			-lwwwutils \
			-lwwwzip \
			-lwwwftp \
			-lwwwdav \
		-L../$(LIBWWW)/modules/md5/.libs \
			-lmd5 \
		-L../$(LIBWWW)/modules/expat/.libs \
			-lexpat \
		-ldl -L/usr/lib


prefix = @prefix@


############################################

all : tree awparser.o AHTLockBase.o dav_obj davlib.a

dav_obj : $(AMAYA_DAV_OBJ)

tree : list.o awstring.o awpair.o awnode.o awtree.o

HTHome :
	@(cd ../$(LIBWWW)/Library/src ; $(MAKE) HTHome.o)

clean :
	$(RM) *.a
	$(RM) *.o 

	awnode.o \
	awstring.o \
	awpair.o \
	list.o 
	../$(LIBWWW)/Library/src/HTHome.o

#
# dependencies

Lines 8-14 Link Here

(-)davlib/Makefile.dav.4729 (-1 / +1 lines)
8		8
9	AMAYA_DAV_INCLUDES=-I$(THOTDIR)/davlib/h -I$(THOTDIR)/davlib/tree/h -I$(THOTDIR)/davlib/f	9	AMAYA_DAV_INCLUDES=-I$(THOTDIR)/davlib/h -I$(THOTDIR)/davlib/tree/h -I$(THOTDIR)/davlib/f
10		10
11	AMAYA_DAV_OBJ= ../libwww/Library/src/HTHome.o	11	AMAYA_DAV_OBJ=
12		12
13	AMAYA_DAV_SRC= ../davlib/davlib.a	13	AMAYA_DAV_SRC= ../davlib/davlib.a
14		14

Return to bug 237322

Lines 13-49 Link Here

(-)davlib/Makefile.in.4729 (-31 / +6 lines)
13		13
14	INCLUDES =-DHAVE_CONFIG_H -I.. \	14	INCLUDES =-DHAVE_CONFIG_H -I.. \
15	-I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \	15	-I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
16	-I@top_srcdir@/amaya/f -I../libwww \	16	-I@top_srcdir@/amaya/f \
17	-I@top_srcdir@/thotlib/include \	17	-I@top_srcdir@/thotlib/include \
18	-I@top_srcdir@/../libwww/Library/src \
19	-I@top_srcdir@/../libwww/modules/expat/lib \
20	-I$(DAVLIB)/tree/h -I$(DAVLIB)/h \	18	-I$(DAVLIB)/tree/h -I$(DAVLIB)/h \
21	$(GUI_INCLUDES)	19	$(GUI_INCLUDES) @AMAYA_LIBWWW_INCLUDES@
22		20
23	OPTIONS = @AMAYA_OPTIONS@ $(AMAYA_DAV_OPTIONS)	21	OPTIONS = @AMAYA_OPTIONS@ $(AMAYA_DAV_OPTIONS)
24		22
25	LIBWWW_LIBS= \	23	LIBWWW_LIBS= \
26	-L../$(LIBWWW)/Library/src/.libs \	24	-lwwwdav \
27	-lwwwapp \	25	@AMAYA_LIBWWW_LIBS@
28	-lwwwhttp \
29	-lwwwxml \
30	-lwwwhtml \
31	-lwwwmime \
32	-lwwwcache \
33	-lwwwstream \
34	-lwwwfile \
35	-lwwwdir \
36	-lwwwtrans \
37	-lwwwcore \
38	-lwwwutils \
39	-lwwwzip \
40	-lwwwftp \
41	-lwwwdav \
42	-L../$(LIBWWW)/modules/md5/.libs \
43	-lmd5 \
44	-L../$(LIBWWW)/modules/expat/.libs \
45	-lexpat \
46	-ldl -L/usr/lib
47		26
48		27
49	prefix = @prefix@	28	prefix = @prefix@
Lines 52-66 Link Here
52		31
53	############################################	32	############################################
54		33
55	all : tree awparser.o AHTLockBase.o HTHome dav_obj davlib.a	34	all : tree awparser.o AHTLockBase.o dav_obj davlib.a
56		35
57	dav_obj : $(AMAYA_DAV_OBJ)	36	dav_obj : $(AMAYA_DAV_OBJ)
58		37
59	tree : list.o awstring.o awpair.o awnode.o awtree.o	38	tree : list.o awstring.o awpair.o awnode.o awtree.o
60		39
61	HTHome :
62	@(cd ../$(LIBWWW)/Library/src ; $(MAKE) HTHome.o)
63
64	clean :	40	clean :
65	$(RM) *.a	41	$(RM) *.a
66	$(RM) *.o	42	$(RM) *.o
Lines 108-115 Link Here
108	awnode.o \	84	awnode.o \
109	awstring.o \	85	awstring.o \
110	awpair.o \	86	awpair.o \
111	list.o \	87	list.o
112	../$(LIBWWW)/Library/src/HTHome.o
113		88
114	#	89	#
115	# dependencies	90	# dependencies