Make sure all the makefiles have at least a dummy check target and

reasonable distclean and maintainer-clean targets.

This fixes the last part of SF bug #430942.

diff --git a/expat/Makefile.in b/expat/Makefile.in
index 35d1db8e12974326ce7b4558891395432f719e60..1ca86212b3fa9038bbc26f704b84daa131fc89a2 100644 (file)
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -136,6 +136,11 @@ distdir: MANIFEST
          cp -P $$file $(DISTDIR); \
        done
 
+check: $(SUBDIRS)
+       @echo
+       @echo This package does not yet have a regression test.
+       @echo
+
 $(DISTRIBUTION): distdir
        tar cf - $(DISTDIR) | gzip -9 >$(DISTRIBUTION)
 

diff --git a/expat/examples/Makefile.in b/expat/examples/Makefile.in
index f3736a45f55830f1304510892dfe9bdad945a255..06cf9c684e3d1c36d3d8afbe09af7dee3910116b 100644 (file)
--- a/expat/examples/Makefile.in
+++ b/expat/examples/Makefile.in
@@ -36,5 +36,15 @@ all: outline
 outline: outline.o
        $(CC) -o outline outline.o $(LDFLAGS) $(LIBS)
 
+check: $(SUBDIRS)
+       @echo
+       @echo This package does not yet have a regression test.
+       @echo
+
 clean:
        rm -f outline core *.o
+
+distclean: clean
+       rm -f Makefile
+
+maintainer-clean: distclean

diff --git a/expat/lib/Makefile.in b/expat/lib/Makefile.in
index 095f1ae4fec0ed63f4a8e61492232d281303b4ce..68800673a0475b461e37c1d9482c3eb862f601a1 100644 (file)
--- a/expat/lib/Makefile.in
+++ b/expat/lib/Makefile.in
@@ -131,6 +131,11 @@ distclean: clean
 
 maintainer-clean: distclean
 
+check: $(SUBDIRS)
+       @echo
+       @echo This package does not yet have a regression test.
+       @echo
+
 install: $(LIBRARY) $(APIHEADER)
        $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
        $(LIBTOOL)  --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)

diff --git a/expat/lib/expat.h.in b/expat/lib/expat.h.in
index 4ea64b2be51b2267ae3f6da0200aadfe7f79403e..b52c90c0644837408d3f00d6ad741b095e29d736 100644 (file)
--- a/expat/lib/expat.h.in
+++ b/expat/lib/expat.h.in
@@ -330,6 +330,11 @@ typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser,
                                            const XML_Char *systemId,
                                            const XML_Char *publicId);
 
+typedef int (*XML_InternalEntityRefHandler)(XML_Parser parser,
+                                           const XML_Char *context,
+                                           const XML_Char *name,
+                                           const XML_Char *text);
+
 /* This structure is filled in by the XML_UnknownEncodingHandler
 to provide information to the parser about encodings that are unknown
 to the parser.

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index ec9605a3e7032e60e0ce01de46db0379ddf9f711..256b8cf6e1c62816bb6ffef79aab4a5f51be9c58 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -4,7 +4,7 @@ See the file COPYING for copying permission.
 */
 
 static char RCSId[]
-  = "$Header: /cvsroot/expat/expat/lib/xmlparse.c,v 1.13 2000/12/27 19:37:37 coopercc Exp $";
+  = "$Header: /cvsroot/expat/expat/lib/xmlparse.c,v 1.14 2001/01/24 19:38:54 fdrake Exp $";
 
 #ifdef COMPILED_FROM_DSP
 #  include "winconfig.h"
@@ -371,6 +371,7 @@ typedef struct {
   XML_EndNamespaceDeclHandler m_endNamespaceDeclHandler;
   XML_NotStandaloneHandler m_notStandaloneHandler;
   XML_ExternalEntityRefHandler m_externalEntityRefHandler;
+  XML_InternalEntityRefHandler m_internalEntityRefHandler;
   void *m_externalEntityRefHandlerArg;
   XML_UnknownEncodingHandler m_unknownEncodingHandler;
   XML_ElementDeclHandler m_elementDeclHandler;
@@ -453,6 +454,7 @@ typedef struct {
 #define notStandaloneHandler (((Parser *)parser)->m_notStandaloneHandler)
 #define externalEntityRefHandler (((Parser *)parser)->m_externalEntityRefHandler)
 #define externalEntityRefHandlerArg (((Parser *)parser)->m_externalEntityRefHandlerArg)
+#define internalEntityRefHandler (((Parser *)parser)->m_internalEntityRefHandler)
 #define unknownEncodingHandler (((Parser *)parser)->m_unknownEncodingHandler)
 #define elementDeclHandler (((Parser *)parser)->m_elementDeclHandler)
 #define attlistDeclHandler (((Parser *)parser)->m_attlistDeclHandler)
@@ -607,6 +609,7 @@ XML_ParserCreate_MM(const XML_Char *encodingName,
   notStandaloneHandler = 0;
   externalEntityRefHandler = 0;
   externalEntityRefHandlerArg = parser;
+  internalEntityRefHandler = 0;
   unknownEncodingHandler = 0;
   elementDeclHandler = 0;
   attlistDeclHandler = 0;
@@ -718,6 +721,7 @@ XML_Parser XML_ExternalEntityParserCreate(XML_Parser oldParser,
   XML_EndNamespaceDeclHandler oldEndNamespaceDeclHandler = endNamespaceDeclHandler;
   XML_NotStandaloneHandler oldNotStandaloneHandler = notStandaloneHandler;
   XML_ExternalEntityRefHandler oldExternalEntityRefHandler = externalEntityRefHandler;
+  XML_InternalEntityRefHandler oldInternalEntityRefHandler = internalEntityRefHandler;
   XML_UnknownEncodingHandler oldUnknownEncodingHandler = unknownEncodingHandler;
   XML_ElementDeclHandler oldElementDeclHandler = elementDeclHandler;
   XML_AttlistDeclHandler oldAttlistDeclHandler = attlistDeclHandler;
@@ -1037,6 +1041,12 @@ void XML_SetExternalEntityRefHandlerArg(XML_Parser parser, void *arg)
     externalEntityRefHandlerArg = parser;
 }
 
+void XML_SetInternalEntityRefHandler(XML_Parser parser,
+                                    XML_InternalEntityRefHandler handler)
+{
+  internalEntityRefHandler = handler;
+}
+
 void XML_SetUnknownEncodingHandler(XML_Parser parser,
                                   XML_UnknownEncodingHandler handler,
                                   void *data)

diff --git a/expat/sample/Makefile.in b/expat/sample/Makefile.in
index afd9ceb1ad0efac8766ead231c8deb67e1a15957..96eeff91c1d9a349329bccb4d07ef860b852ee24 100644 (file)
--- a/expat/sample/Makefile.in
+++ b/expat/sample/Makefile.in
@@ -34,5 +34,15 @@ all: elements
 elements: elements.o
        $(CC) -o elements elements.o $(LDFLAGS) $(LIBS)
 
+check: $(SUBDIRS)
+       @echo
+       @echo This package does not yet have a regression test.
+       @echo
+
 clean:
        rm -f elements core *.o
+
+distclean: clean
+       rm -r Makefile
+
+maintainer-clean: distclean

diff --git a/expat/xmlwf/Makefile.in b/expat/xmlwf/Makefile.in
index 00850ae224bb019515f7b52b7be80870d8244b41..b8cbbc72aeedde449f6ea1545a29c513214248de 100644 (file)
--- a/expat/xmlwf/Makefile.in
+++ b/expat/xmlwf/Makefile.in
@@ -36,5 +36,15 @@ VPATH = @srcdir@
 xmlwf: $(OBJS)
        $(CC) -o xmlwf $(LDFLAGS) $(OBJS) $(LIBS)
 
+check: $(SUBDIRS)
+       @echo
+       @echo This package does not yet have a regression test.
+       @echo
+
 clean:
        rm -f xmlwf core *.o
+
+distclean: clean
+       rm -f Makefile
+
+maintainer-clean: distclean