45 lines
1.3 KiB
Plaintext
45 lines
1.3 KiB
Plaintext
|
$OpenBSD: patch-Amaya_amaya_Makefile_libwww,v 1.1 2001/10/02 20:18:59 heko Exp $
|
||
|
|
--- Amaya/amaya/Makefile.libwww.orig Tue Aug 29 19:18:03 2000
|
||
|
|
+++ Amaya/amaya/Makefile.libwww Tue Oct 2 02:02:01 2001
|
||
|
|
@@ -34,23 +34,30 @@ AMAYA_LIBWWW_LIBS= \
|
||
|
|
-lwwwutils \
|
||
|
|
-lwwwzip \
|
||
|
|
-lwwwftp \
|
||
|
|
- -L../$(LIBWWW)/modules/md5/.libs \
|
||
|
|
- -lmd5 \
|
||
|
|
- -L../$(LIBWWW)/modules/expat/xmlparse/.libs \
|
||
|
|
- -lxmlparse \
|
||
|
|
- -L../$(LIBWWW)/modules/expat/xmltok/.libs \
|
||
|
|
- -lxmltok
|
||
|
|
+ -lexpat
|
||
|
|
+
|
||
|
|
+# OpenBSD has md5 in -lc
|
||
|
|
+# -L../$(LIBWWW)/modules/md5/.libs \
|
||
|
|
+# -lmd5 \
|
||
|
|
+# Use expat-1.95.1 port
|
||
|
|
+# -L../$(LIBWWW)/modules/expat/xmlparse/.libs \
|
||
|
|
+# -lxmlparse \
|
||
|
|
+# -L../$(LIBWWW)/modules/expat/xmltok/.libs \
|
||
|
|
+# -lxmltok
|
||
|
|
|
||
|
|
AMAYA_LIBWWW_EXTRA_LIBS=
|
||
|
|
|
||
|
|
AMAYA_LIBWWW_INCLUDES= -I../libwww \
|
||
|
|
-I$(THOTDIR)/../libwww/Library/src \
|
||
|
|
- -I$(THOTDIR)../libwww/modules/md5 \
|
||
|
|
- -I$(THOTDIR)../libwww/modules/expat/xmlparse \
|
||
|
|
- -I$(THOTDIR)../libwww/modules/expat/xmltok
|
||
|
|
|
||
|
|
+# Use installed expat && md5
|
||
|
|
+# -I$(THOTDIR)../libwww/modules/md5 \
|
||
|
|
+# -I$(THOTDIR)../libwww/modules/expat/xmlparse \
|
||
|
|
+# -I$(THOTDIR)../libwww/modules/expat/xmltok
|
||
|
|
+
|
||
|
|
+
|
||
|
|
# this dependency calls the ../Makefile rule that compiles libwww
|
||
|
|
-AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww
|
||
|
|
+AMAYA_LIBWWW_SRC= amaya_comp_libwww
|
||
|
|
|
||
|
|
amaya_comp_libwww : force
|
||
|
|
@(cd .. ; $(MAKE) libwww)
|