diff options
| -rw-r--r-- | ACEXML/ChangeLog | 12 | ||||
| -rw-r--r-- | ACEXML/common/Makefile.am | 37 | ||||
| -rw-r--r-- | ACEXML/common/common.mpc | 4 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Makefile.am | 23 | ||||
| -rw-r--r-- | ACEXML/parser/parser/parser.mpc | 4 |
5 files changed, 58 insertions, 22 deletions
diff --git a/ACEXML/ChangeLog b/ACEXML/ChangeLog index f347267bfdc..9842bf2eac9 100644 --- a/ACEXML/ChangeLog +++ b/ACEXML/ChangeLog @@ -1,3 +1,15 @@ +Fri Apr 22 11:09:59 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * parser/parser/Makefile.am: + * common/Makefile.am: + + Regenerated. + + * parser/parser/parser.mpc: + * common/common.mpc: + + Add Pkgconfig_Files section. + Wed Apr 20 12:20:26 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * common/Attributes.h: diff --git a/ACEXML/common/Makefile.am b/ACEXML/common/Makefile.am index 5504a626eed..9ffc861ab79 100644 --- a/ACEXML/common/Makefile.am +++ b/ACEXML/common/Makefile.am @@ -6,15 +6,15 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc includedir = @includedir@/ACEXML/common -pkgconfigdatadir = ${prefix}/lib/pkgconfig +pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.ACEXML.am + lib_LTLIBRARIES = libACEXML.la libACEXML_la_CPPFLAGS = \ @@ -23,18 +23,24 @@ libACEXML_la_CPPFLAGS = \ -DACEXML_BUILD_DLL libACEXML_la_SOURCES = \ + Attributes.cpp \ AttributesImpl.cpp \ Attributes_Def_Builder.cpp \ CharStream.cpp \ + ContentHandler.cpp \ + DTDHandler.cpp \ DTD_Manager.cpp \ DefaultHandler.cpp \ Element_Def_Builder.cpp \ Encoding.cpp \ + EntityResolver.cpp \ Env.cpp \ + ErrorHandler.cpp \ Exception.cpp \ FileCharStream.cpp \ HttpCharStream.cpp \ InputSource.cpp \ + Locator.cpp \ LocatorImpl.cpp \ Mem_Map_Stream.cpp \ NamespaceSupport.cpp \ @@ -45,6 +51,7 @@ libACEXML_la_SOURCES = \ URL_Addr.cpp \ Validator.cpp \ XMLFilterImpl.cpp \ + XMLReader.cpp \ XML_Codecs.cpp \ ZipCharStream.cpp @@ -52,12 +59,13 @@ libACEXML_la_LDFLAGS = \ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libACEXML_la_LIBADD = \ - $(top_builddir)/ace/libACE.la + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS = \ ACEXML_Export.h \ Attributes.h \ AttributesImpl.h \ + AttributesImpl.i \ Attributes_Def_Builder.h \ CharStream.h \ ContentHandler.h \ @@ -68,41 +76,44 @@ nobase_include_HEADERS = \ Encoding.h \ EntityResolver.h \ Env.h \ + Env.i \ ErrorHandler.h \ Exception.h \ + Exception.i \ FileCharStream.h \ HttpCharStream.h \ InputSource.h \ Locator.h \ LocatorImpl.h \ + LocatorImpl.i \ Mem_Map_Stream.h \ NamespaceSupport.h \ SAXExceptions.h \ + SAXExceptions.i \ StrCharStream.h \ StreamFactory.h \ Transcode.h \ URL_Addr.h \ + URL_Addr.inl \ Validator.h \ XMLFilter.h \ XMLFilterImpl.h \ + XMLFilterImpl.i \ XMLReader.h \ XML_Codecs.h \ XML_Macros.h \ XML_Types.h \ - ZipCharStream.h \ - AttributesImpl.i \ - Env.i \ - Exception.i \ - LocatorImpl.i \ - SAXExceptions.i \ - URL_Addr.inl \ - XMLFilterImpl.i + ZipCharStream.h -pkgconfigdata_DATA = ACEXML.pc +pkgconfig_DATA = ACEXML.pc ACEXML.pc: ${top_builddir}/config.status ${srcdir}/ACEXML.pc.in ${top_builddir}/config.status --file $@:${srcdir}/ACEXML.pc.in +EXTRA_DIST = \ + ACEXML.pc.in + + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACEXML/common/common.mpc b/ACEXML/common/common.mpc index edd903cf5b7..1632b334500 100644 --- a/ACEXML/common/common.mpc +++ b/ACEXML/common/common.mpc @@ -24,4 +24,8 @@ project(ACEXML): acelib, codecs, core { XMLReader.h XML_Types.h } + + Pkgconfig_Files { + ACEXML.pc.in + } } diff --git a/ACEXML/parser/parser/Makefile.am b/ACEXML/parser/parser/Makefile.am index 3f50136debf..98ead5b42a9 100644 --- a/ACEXML/parser/parser/Makefile.am +++ b/ACEXML/parser/parser/Makefile.am @@ -6,15 +6,15 @@ ## this file will be lost the next time it is generated. ## ## MPC Command: -## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu +## ./bin/mwc.pl -include /home/jtc/ACE/ACE-config3/MPC/config -include /home/jtc/ACE/ACE-config3/MPC/templates -type automake ACE.mwc includedir = @includedir@/ACEXML/parser/parser -pkgconfigdatadir = ${prefix}/lib/pkgconfig +pkgconfigdir = @libdir@/pkgconfig ACE_BUILDDIR = $(top_builddir) ACE_ROOT = $(top_srcdir) -## Makefile.ACEXML_Parser.am + lib_LTLIBRARIES = libACEXML_Parser.la libACEXML_Parser_la_CPPFLAGS = \ @@ -32,23 +32,28 @@ libACEXML_Parser_la_LDFLAGS = \ -version-number @ACE_MAJOR@:@ACE_MINOR@:@ACE_BETA@ libACEXML_Parser_la_LIBADD = \ - $(top_builddir)/ACEXML/common/libACEXML.la $(top_builddir)/ace/libACE.la + $(ACE_BUILDDIR)/ACEXML/common/libACEXML.la \ + $(ACE_BUILDDIR)/ace/libACE.la nobase_include_HEADERS = \ Entity_Manager.h \ + Entity_Manager.i \ Parser.h \ + Parser.i \ ParserContext.h \ + ParserContext.inl \ ParserInternals.h \ - Parser_export.h \ - Entity_Manager.i \ - Parser.i \ - ParserContext.inl + Parser_export.h -pkgconfigdata_DATA = ACEXML_Parser.pc +pkgconfig_DATA = ACEXML_Parser.pc ACEXML_Parser.pc: ${top_builddir}/config.status ${srcdir}/ACEXML_Parser.pc.in ${top_builddir}/config.status --file $@:${srcdir}/ACEXML_Parser.pc.in +EXTRA_DIST = \ + ACEXML_Parser.pc.in + + ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/ACEXML/parser/parser/parser.mpc b/ACEXML/parser/parser/parser.mpc index adac22796f0..859882e838d 100644 --- a/ACEXML/parser/parser/parser.mpc +++ b/ACEXML/parser/parser/parser.mpc @@ -6,4 +6,8 @@ project(ACEXML_Parser): acelib, core { after += ACEXML libs += ACEXML dynamicflags += ACEXML_PARSER_BUILD_DLL + + Pkgconfig_Files { + ACEXML_Parser.pc.in + } } |