Integrate loadlibrary.c into build systems

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index 398b5550a96d2f210053890bb815622ad3ef60ef..568e4bd47fbd9ba639f1750db1bd8229b7713c9e 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -54,6 +54,7 @@ if(WIN32)
 endif(WIN32)\r
 \r
 set(expat_SRCS\r
+    lib/loadlibrary.c\r
     lib/xmlparse.c\r
     lib/xmlrole.c\r
     lib/xmltok.c\r

diff --git a/expat/MANIFEST b/expat/MANIFEST
index c8479ed0a212fd9d12e9415e184b85b78812683c..c90dadc075589bfed74c3072a16bd819be148b38 100644 (file)
--- a/expat/MANIFEST
+++ b/expat/MANIFEST
@@ -45,6 +45,7 @@ lib/internal.h
 lib/latin1tab.h
 lib/libexpat.def
 lib/libexpatw.def
+lib/loadlibrary.c
 lib/nametab.h
 lib/siphash.h
 lib/utf8tab.h

diff --git a/expat/Makefile.in b/expat/Makefile.in
index 76f77b17f8668208bb6ebb30e6ee94f46c99092f..3e98d24299412d66dbc4373acf0cb09426bcfa0d 100644 (file)
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -128,7 +128,7 @@ LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG)
 LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
 LINK_CXX_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CXXCOMPILE) $(LDFLAGS) -o $@
 
-LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
+LIB_OBJS = lib/loadlibrary.lo lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
 $(LIBRARY): $(LIB_OBJS)
        $(LINK_LIB) $(LIB_OBJS)
 
@@ -138,6 +138,8 @@ expat.pc: $(top_builddir)/config.status
 lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/siphash.h lib/xmlrole.h lib/xmltok.h \
        $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 
+lib/loadlibrary.lo: lib/loadlibrary.c
+
 lib/xmlrole.lo: lib/xmlrole.c lib/ascii.h lib/xmlrole.h \
        $(top_builddir)/expat_config.h lib/expat_external.h lib/internal.h
 

diff --git a/expat/lib/expat.vcxproj b/expat/lib/expat.vcxproj
index 1673e6765375b2e562e8098cafeb2d21863fa1d5..7270b8746cf4ca43cb6aa686bfebff7c8293850f 100644 (file)
--- a/expat/lib/expat.vcxproj
+++ b/expat/lib/expat.vcxproj
@@ -147,6 +147,7 @@
     <CustomBuild Include="libexpat.def" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c">
       <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </ExceptionHandling>

diff --git a/expat/lib/expat.vcxproj.filters b/expat/lib/expat.vcxproj.filters
index 34aea26dd1e82c45bb9ada2d988b15d64b6c53cc..61c52b58d882dea1c2843e0ccd9a69d13272a33b 100644 (file)
--- a/expat/lib/expat.vcxproj.filters
+++ b/expat/lib/expat.vcxproj.filters
@@ -15,6 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/expat/lib/expat_static.vcxproj b/expat/lib/expat_static.vcxproj
index 77c0ece93c6c7097db031495f64c9a5bd2182fc7..512e4c985b62f5928b273f6b745d4e063a7bf422 100644 (file)
--- a/expat/lib/expat_static.vcxproj
+++ b/expat/lib/expat_static.vcxproj
@@ -120,6 +120,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c" />
     <ClCompile Include="xmlrole.c" />
     <ClCompile Include="xmltok.c" />

diff --git a/expat/lib/expat_static.vcxproj.filters b/expat/lib/expat_static.vcxproj.filters
index e6d9d80fe2ec4e5f5534da8cd1777b2e629e0dd1..a2fe03e63514fafaa2aabd1271310d885cc42a8d 100644 (file)
--- a/expat/lib/expat_static.vcxproj.filters
+++ b/expat/lib/expat_static.vcxproj.filters
@@ -11,6 +11,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/expat/lib/expatw.vcxproj b/expat/lib/expatw.vcxproj
index cf54fd2abaa3b0f8c2d1084a73b55cd730a17a67..d42944db7d929a38b8b33dfd8972af21a01f0c63 100644 (file)
--- a/expat/lib/expatw.vcxproj
+++ b/expat/lib/expatw.vcxproj
@@ -147,6 +147,7 @@
     <CustomBuild Include="libexpatw.def" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c">
       <ExceptionHandling Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
       </ExceptionHandling>

diff --git a/expat/lib/expatw.vcxproj.filters b/expat/lib/expatw.vcxproj.filters
index dc6e96852f6ffc9d1563ab28c3ee6203c9bc2179..fb3909c9953a35ba2635683162a736b9a5576ba2 100644 (file)
--- a/expat/lib/expatw.vcxproj.filters
+++ b/expat/lib/expatw.vcxproj.filters
@@ -15,6 +15,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/expat/lib/expatw_static.vcxproj b/expat/lib/expatw_static.vcxproj
index 99a45e479c323ad1d63a444f0384048bc703a003..e7a211615da34e9608ebbd9ffffa70629dee104a 100644 (file)
--- a/expat/lib/expatw_static.vcxproj
+++ b/expat/lib/expatw_static.vcxproj
@@ -120,6 +120,7 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c" />
     <ClCompile Include="xmlparse.c" />
     <ClCompile Include="xmlrole.c" />
     <ClCompile Include="xmltok.c" />

diff --git a/expat/lib/expatw_static.vcxproj.filters b/expat/lib/expatw_static.vcxproj.filters
index 83a7c08c91cd3ffa74c1d2c3c4d42cd6fdad297b..724d9f8ce0508c28fbbc85aa091761235f006ed2 100644 (file)
--- a/expat/lib/expatw_static.vcxproj.filters
+++ b/expat/lib/expatw_static.vcxproj.filters
@@ -11,6 +11,9 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="loadlibrary.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="xmlparse.c">
       <Filter>Source Files</Filter>
     </ClCompile>