Fancier Makefile.

diff --git a/expat/Makefile b/expat/Makefile
index 670a63572e19ec1127ea8d81fc16da93a1c63e95..79f4c7ccc441e7753439ec28384f7174ccf23e0a 100755 (executable)
--- a/expat/Makefile
+++ b/expat/Makefile
@@ -5,26 +5,33 @@ CC=gcc
 # -DXML_NS adds support for checking of lexical aspects of XML namespaces spec
 # -DXML_MIN_SIZE makes a smaller but slower parser
 # -DXML_DTD adds full support for parsing DTDs
-CFLAGS=-O2 -Ixmltok -Ixmlparse -DXML_NS -DXML_DTD
+CFLAGS=-Wall -O2 -Ixmltok -Ixmlparse -DXML_NS -DXML_DTD
+AR=ar
 # Use one of the next two lines; unixfilemap is better if it works.
 FILEMAP_OBJ=xmlwf/unixfilemap.o
 #FILEMAP_OBJ=xmlwf/readfilemap.o
-OBJS=xmltok/xmltok.o \
+LIBOBJS=xmltok/xmltok.o \
   xmltok/xmlrole.o \
-  xmlwf/xmlwf.o \
+  xmlparse/xmlparse.o
+
+OBJS=xmlwf/xmlwf.o \
   xmlwf/xmlfile.o \
   xmlwf/codepage.o \
-  xmlparse/xmlparse.o \
   $(FILEMAP_OBJ)
+LIB=xmlparse/libexpat.a
 EXE=
+XMLWF=xmlwf/xmlwf$(EXE)
+
+all: $(XMLWF)
 
-all: xmlwf/xmlwf$(EXE)
+$(XMLWF): $(OBJS) $(LIB)
+       $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIB)
 
-xmlwf/xmlwf$(EXE): $(OBJS)
-       $(CC) $(CFLAGS) -o $@ $(OBJS)
+$(LIB): $(LIBOBJS)
+       $(AR) rc $(LIB) $(LIBOBJS)
 
 clean:
-       rm -f $(OBJS) xmlwf/xmlwf$(EXE)
+       rm -f $(OBJS) $(LIBOBJS) $(LIB) $(XMLWF)
 
 xmltok/nametab.h: gennmtab/gennmtab$(EXE)
        rm -f $@