[patch] davlib-Makefile.diff

davlib-Makefile.diff (text/plain), 1.86 KB, created by Jimmy.Jazz on 2008-09-10 13:36:13 UTC

--- davlib/Makefile.in.4729	2008-08-30 11:40:31.000000000 +0200
+++ davlib/Makefile.in	2008-08-30 11:47:56.000000000 +0200
@@ -13,37 +13,16 @@
 
 INCLUDES =-DHAVE_CONFIG_H -I.. \
 	  -I../amaya -I@srcdir@/f -I@top_srcdir@/amaya \
-	  -I@top_srcdir@/amaya/f -I../libwww \
+	  -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)
+	  $(GUI_INCLUDES) @AMAYA_LIBWWW_INCLUDES@
 
 OPTIONS	= @AMAYA_OPTIONS@ $(AMAYA_DAV_OPTIONS)
 
 LIBWWW_LIBS= \
-		-L../$(LIBWWW)/Library/src/.libs \
-			-lwwwapp \
-			-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
+		-lwwwdav \
+		@AMAYA_LIBWWW_LIBS@
 
 
 prefix = @prefix@
@@ -52,15 +31,12 @@
 
 ############################################
 
-all : tree awparser.o AHTLockBase.o HTHome dav_obj davlib.a
+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 
@@ -108,8 +84,7 @@
 	awnode.o \
 	awstring.o \
 	awpair.o \
-	list.o \
-	../$(LIBWWW)/Library/src/HTHome.o
+	list.o 
 
 #
 # dependencies
--- davlib/Makefile.dav.4729	2008-08-30 11:45:43.000000000 +0200
+++ davlib/Makefile.dav	2008-08-30 11:46:08.000000000 +0200
@@ -8,7 +8,7 @@
 
 AMAYA_DAV_INCLUDES=-I$(THOTDIR)/davlib/h -I$(THOTDIR)/davlib/tree/h -I$(THOTDIR)/davlib/f
 
-AMAYA_DAV_OBJ= ../libwww/Library/src/HTHome.o 
+AMAYA_DAV_OBJ=
 
 AMAYA_DAV_SRC= ../davlib/davlib.a