--- src/Makefile.in.orig	Wed Apr 25 02:10:45 2001
+++ src/Makefile.in	Mon Dec 16 21:47:11 2002
@@ -72,17 +72,16 @@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-INCLUDES = -I$(top_builddir)/include -Iexpat/lib -Iexpat
-SUBDIRS = expat
+INCLUDES = -I$(top_builddir)/include
 
 lib_LTLIBRARIES = libxode.la
 
 libxode_la_SOURCES =  	snprintf.c 	pool.c 	xode.c 	str.c 	xstream.c 	xode_from.c
 
 
-libxode_la_LIBADD = expat/xmlparse.lo  expat/xmlrole.lo  expat/xmltok.lo
+libxode_la_LIBADD = -lexpat
 
-CFLAGS = -Wall -g
+CFLAGS = @CFLAGS@
 
 libxode_la_LDFLAGS = -version-info 2:0:1
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -95,8 +94,7 @@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-libxode_la_DEPENDENCIES =  expat/xmlparse.lo expat/xmlrole.lo \
-expat/xmltok.lo
+libxode_la_DEPENDENCIES =
 libxode_la_OBJECTS =  snprintf.lo pool.lo xode.lo str.lo xstream.lo \
 xode_from.lo
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)