Commit 5d7ade48 authored by David King's avatar David King Committed by David King

Refactor build system

* Makefile.am: Merge from subdir Makefile.am files, excluding doc.

* MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj:
* MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj: Add
missing Visual studio project files.

* MSVC_Net2005/examples/*/Makefile.am:
* MSVC_Net2005/examples/Makefile.am:
* MSVC_Net2005/gendef/Makefile.am:
* MSVC_Net2005/libxml++/Makefile.am:
* MSVC_Net2008/examples/*/Makefile.am:
* MSVC_Net2008/examples/Makefile.am:
* MSVC_Net2008/gendef/Makefile.am:
* MSVC_Net2008/libxml++/Makefile.am: Remove from repository, and move
content to Makefile.am, making the MSVC project file build
non-recursive.

* README: Update.

* autogen.sh: Copy from gtkmm.

* configure.in: Move to configure.ac.

* configure.ac: Require autoconf 2.59 and automake 1.9. Use new-style
AC_INIT() with bug-report link and homepage URL. Use mm-common for
initialisation of version variables. Require libtool 2.2.6 for much
faster builds. Use MM_ARG_ENABLE_WARNINGS to configure compiler
warning flags. Use MM_CHECK_PERL to check for the required Perl
version. Use AC_CONFIG_FILES rather than AC_OUTPUT. Update for
Makefile.am changes.

* config.h.in: Remove from repository, as autoheader is now used.

* */.cvsignore: Remove old files.

* doc/manual/Makefile.am: Use the correct Perl.

* doc/reference/Doxyfile.in:
* MSVC_Net2005/libxml++/libxml++.rc.in:
* MSVC_Net2008/libxml++/libxml++.rc.in: Use new-style variable names.

* examples/Makefile.am_fragment:
* examples/Makefile.am:
* examples/*/Makefile.am: Remove from repository, and move content to
Makefile.am, making the examples build non-recursive.

* .gitignore: Update.

* libxml++/Makefile.am:
* libxml++/*/Makefile.am: Remove from repository, and move content to
Makefile.am, making the libxml++ build non-recursive.

* libxml++.spec.in:
* INSTALL: Remove from repository.

* scripts/README:
* scripts/Makfile.am: Remove from repository.

* scripts/reduced.m4: Move to macros/reduced.m4
parent 8da946ce
Makefile.in
Makefile
aclocal.m4
autom4te.cache
config.log
config.status
configure
libtool
libxml++-2.6.pc
libxml++.spec
# wildcard patterns
*.[ao]
*.l[ao]
*~
Makefile
Makefile.in
.deps/
.libs/
.stamps/
.dirstamp
libxml++config.h
stamp-h?
# /
/aclocal.m4
/INSTALL
/autom4te.cache/
/config.h
/config.h.in
/config.log
/config.status
/configure
/configure.lineno
/libxml++-2.6.pc
/libxml++-*.tar.*
/libtool
# MSVC
/MSVC_Net2005/libxml++/libxml++.rc
/MSVC_Net2008/libxml++/libxml++.rc
# docs
/docs/manual/html/
/docs/manual/libxml++.xml
/docs/reference/Doxyfile
/docs/reference/html/
/docs/reference/libxml++_doxygen_tags
/docs/reference/xml/
# examples
/examples/dom_build/dom_build
/examples/dom_parse_entities/dom_parse_entities
/examples/dom_parser/dom_parser
/examples/dom_parser_raw/dom_parser_raw
/examples/dom_read_write/dom_read_write
/examples/dom_xpath/dom_xpath
/examples/dtdvalidation/dtdvalidation
/examples/import_node/import_node
/examples/sax_exception/sax_exception
/examples/sax_parser/sax_parser
/examples/sax_parser_build_dom/sax_parser_build_dom
/examples/sax_parser_entities/sax_parser_entities
/examples/schemavalidation/schemavalidation
/examples/textreader/textreader
# macros
/macros/compile-binding.am
/macros/config.guess
/macros/config.sub
/macros/depcomp
/macros/dist-changelog.am
/macros/doc-reference.am
/macros/generate-binding.am
/macros/install-sh
/macros/libtool.m4
/macros/ltmain.sh
/macros/ltoptions.m4
/macros/ltsugar.m4
/macros/ltversion.m4
/macros/lt~obsolete.m4
/macros/missing
2010-03-27 David King <davidk@openismus.com>
Refactor build system
* Makefile.am: Merge from subdir Makefile.am files, excluding doc.
* MSVC_Net2005/examples/dom_parser_raw/dom_parser_raw.vcproj:
* MSVC_Net2008/examples/dom_parser_raw/dom_parser_raw.vcproj: Add
missing Visual studio project files.
* MSVC_Net2005/examples/*/Makefile.am:
* MSVC_Net2005/examples/Makefile.am:
* MSVC_Net2005/gendef/Makefile.am:
* MSVC_Net2005/libxml++/Makefile.am:
* MSVC_Net2008/examples/*/Makefile.am:
* MSVC_Net2008/examples/Makefile.am:
* MSVC_Net2008/gendef/Makefile.am:
* MSVC_Net2008/libxml++/Makefile.am: Remove from repository, and move
content to Makefile.am, making the MSVC project file build
non-recursive.
* README: Update.
* autogen.sh: Copy from gtkmm.
* configure.in: Move to configure.ac.
* configure.ac: Require autoconf 2.59 and automake 1.9. Use new-style
AC_INIT() with bug-report link and homepage URL. Use mm-common for
initialisation of version variables. Require libtool 2.2.6 for much
faster builds. Use MM_ARG_ENABLE_WARNINGS to configure compiler
warning flags. Use MM_CHECK_PERL to check for the required Perl
version. Use AC_CONFIG_FILES rather than AC_OUTPUT. Update for
Makefile.am changes.
* config.h.in: Remove from repository, as autoheader is now used.
* */.cvsignore: Remove old files.
* doc/manual/Makefile.am: Use the correct Perl.
* doc/reference/Doxyfile.in:
* MSVC_Net2005/libxml++/libxml++.rc.in:
* MSVC_Net2008/libxml++/libxml++.rc.in: Use new-style variable names.
* examples/Makefile.am_fragment:
* examples/Makefile.am:
* examples/*/Makefile.am: Remove from repository, and move content to
Makefile.am, making the examples build non-recursive.
* .gitignore: Update.
* libxml++/Makefile.am:
* libxml++/*/Makefile.am: Remove from repository, and move content to
Makefile.am, making the libxml++ build non-recursive.
* libxml++.spec.in:
* INSTALL: Remove from repository.
* scripts/README:
* scripts/Makfile.am: Remove from repository.
* scripts/reduced.m4: Move to macros/reduced.m4
2010-03-08 Murray Cumming <murrayc@murrayc.com>
Use 0 instead of NULL.
Use 0 instead of NULL.
* MSVC_Net2005/gendef/gendef.cc:
* MSVC_Net2008/gendef/gendef.cc:
......
Simple install procedure
========================
% gzip -dc libxml++-<version>.tar.gz | tar xvf - # unpack the sources
% cd libxml++-<version> # change to toplevel directory
% ./configure # run the `configure' script
% make # build libxml++
% make install # install libxml++
Makefile
Makefile.in
libxml++.ncb
libxml++.suo
SUBDIRS = gendef libxml++ examples
EXTRA_DIST = blank.cpp libxml++.sln README
SUBDIRS = dom_build dom_parse_entities dom_parser dom_read_write dom_xpath \
dtdvalidation import_node sax_exception sax_parser \
sax_parser_build_dom sax_parser_entities schemavalidation textreader
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="examples_dom_parser_raw"
ProjectGUID="{947E2653-58AE-4BCC-8A77-B131850C8206}"
RootNamespace="examples_dispatcher"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories="../../..;&quot;../../libxml++&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="glibmm-vc80-d-2_4.lib"
OutputFile="$(OutDir)/dom_parser_raw.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
AdditionalIncludeDirectories="../../..;&quot;../../libxml++&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="glibmm-vc80-2_4.lib"
OutputFile="$(OutDir)/dom_parser_raw.exe"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\blank.cpp"
>
</File>
<File
RelativePath="..\..\..\examples\dom_parser_raw\main.cc"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Makefile
Makefile.in
Debug
Release
EXTRA_DIST = gendef.vcproj gendef.cc
Makefile
Makefile.in
Debug
Release
libxml++.rc
libxml++.aps
BUILT_SOURCES = libxml++config.h libxml++.rc
MAINTAINERCLEANFILES = $(built_sources)
EXTRA_DIST = libxml++config.h libxml++.vcproj libxml++.rc
# Copy config file generated by the configure script. Dependency is
# wht respect to the .h.in file, to prevent an error with 'make distcheck'.
# See http://sources.redhat.com/automake/automake.html#distcleancheck
libxml++config.h: $(top_srcdir)/libxml++/libxml++config.h.in $(top_srcdir)/configure.in
cp -f $(top_builddir)/libxml++/libxml++config.h $@
......@@ -33,8 +33,8 @@ END
#endif // APSTUDIO_INVOKED
VS_VERSION_INFO VERSIONINFO
FILEVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1
PRODUCTVERSION @GENERIC_MAJOR_VERSION@,@GENERIC_MINOR_VERSION@,@GENERIC_MICRO_VERSION@,1
FILEVERSION @LIBXMLXX_MAJOR_VERSION@,@LIBXMLXX_MINOR_VERSION@,@LIBXMLXX_MICRO_VERSION@,1
PRODUCTVERSION @LIBXMLXX_MAJOR_VERSION@,@LIBXMLXX_MINOR_VERSION@,@LIBXMLXX_MICRO_VERSION@,1
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
......@@ -51,11 +51,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "The libxml++ development team (see AUTHORS)"
VALUE "FileDescription", "The official C++ wrapper for libxml2"
VALUE "FileVersion", "@VERSION@"
VALUE "FileVersion", "@PACKAGE_VERSION@"
VALUE "LegalCopyright", "Distribution is under the LGPL (see COPYING)"
VALUE "OriginalFilename", "libxml++-2.6"
VALUE "ProductName", "libxml++"
VALUE "ProductVersion", "@VERSION@"
VALUE "ProductName", "@PACKAGE_NAME@"
VALUE "ProductVersion", "@PACKAGE_VERSION@"
END
END
BLOCK "VarFileInfo"
......
SUBDIRS = gendef libxml++ examples
EXTRA_DIST = blank.cpp libxml++.sln README
SUBDIRS = dom_build dom_parse_entities dom_parser dom_read_write dom_xpath \
dtdvalidation import_node sax_exception sax_parser \
sax_parser_build_dom sax_parser_entities schemavalidation textreader
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="examples_dom_parser_raw"
ProjectGUID="{947E2653-58AE-4BCC-8A77-B131850C8206}"
RootNamespace="examples_dispatcher"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
Optimization="0"
AdditionalIncludeDirectories="../../..;&quot;../../libxml++&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="glibmm-vc90-d-2_4.lib"
OutputFile="$(OutDir)/dom_parser_raw.exe"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalOptions="/vd2"
AdditionalIncludeDirectories="../../..;&quot;../../libxml++&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"