You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/08/09 15:33:24 UTC
svn commit: r564200 - in /xerces/c/trunk: obj/Makefile.am
samples/Makefile.am scripts/packageBinaries.pl tests/Makefile.am
xerces-c.spec
Author: amassari
Date: Thu Aug 9 06:33:23 2007
New Revision: 564200
URL: http://svn.apache.org/viewvc?view=rev&rev=564200
Log:
Rename library to libxerces-c.so, as it was in version 2.7
Modified:
xerces/c/trunk/obj/Makefile.am
xerces/c/trunk/samples/Makefile.am
xerces/c/trunk/scripts/packageBinaries.pl
xerces/c/trunk/tests/Makefile.am
xerces/c/trunk/xerces-c.spec
Modified: xerces/c/trunk/obj/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/obj/Makefile.am?view=diff&rev=564200&r1=564199&r2=564200
==============================================================================
--- xerces/c/trunk/obj/Makefile.am (original)
+++ xerces/c/trunk/obj/Makefile.am Thu Aug 9 06:33:23 2007
@@ -21,14 +21,14 @@
include ../version.incl
-lib_LTLIBRARIES = libxerces.la
-libxerces_la_SOURCES =
-nodist_EXTRA_libxerces_la_SOURCES = dummyfile-to-force-cpp-linking.cpp
+lib_LTLIBRARIES = libxerces-c.la
+libxerces_c_la_SOURCES =
+nodist_EXTRA_libxerces_c_la_SOURCES = dummyfile-to-force-cpp-linking.cpp
-libxerces_la_LIBADD = ${top_builddir}/src/libsrc.la ${top_builddir}/lib/libcompat.la
-libxerces_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libxerces_c_la_LIBADD = ${top_builddir}/src/libsrc.la ${top_builddir}/lib/libcompat.la
+libxerces_c_la_LDFLAGS = -release ${PACKAGE_VERSION}
if XERCES_USE_MSGLOADER_ICU
-libxerces_la_LDFLAGS += -L${top_builddir}/obj/.libs -lXercesMessages$(VER)
+libxerces_c_la_LDFLAGS += -L${top_builddir}/obj/.libs -lXercesMessages$(VER)
endif
Modified: xerces/c/trunk/samples/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/samples/Makefile.am?view=diff&rev=564200&r1=564199&r2=564200
==============================================================================
--- xerces/c/trunk/samples/Makefile.am (original)
+++ xerces/c/trunk/samples/Makefile.am Thu Aug 9 06:33:23 2007
@@ -21,7 +21,7 @@
bin_PROGRAMS = ${sampleprogs}
-LDADD = ${top_builddir}/obj/libxerces.la
+LDADD = ${top_builddir}/obj/libxerces-c.la
# the -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp
# header file when doing out-of-tree builds
AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src
Modified: xerces/c/trunk/scripts/packageBinaries.pl
URL: http://svn.apache.org/viewvc/xerces/c/trunk/scripts/packageBinaries.pl?view=diff&rev=564200&r1=564199&r2=564200
==============================================================================
--- xerces/c/trunk/scripts/packageBinaries.pl (original)
+++ xerces/c/trunk/scripts/packageBinaries.pl Thu Aug 9 06:33:23 2007
@@ -775,7 +775,7 @@
#
print("\n\nBuild the xerces-c library ...\n");
pchdir ("$XERCESCROOT");
- psystem ("chmod +x configure config/install-sh config/pretty-make");
+ psystem ("chmod +x configure config/install-sh config/pretty-make config/compile");
$cfg_icu = "";
$cfg_m = "";
@@ -876,27 +876,27 @@
pchdir ("$targetdir/lib");
psystem("rm -f libxerces-c* ");
- if ((-e "$XERCESCROOT/obj/.libs/libxerces-3.0.so" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-3.0.so .");
- psystem("ln -s libxerces-3.0.so libxerces-3.so ");
- psystem("ln -s libxerces-3.so libxerces.so ");
+ if ((-e "$XERCESCROOT/obj/.libs/libxerces-c-3.0.so" )) {
+ psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-c-3.0.so .");
+ psystem("ln -s libxerces-c-3.0.so libxerces-c-3.so ");
+ psystem("ln -s libxerces-c-3.so libxerces-c.so ");
}
- if ((-e "$XERCESCROOT/obj/.libs/libxerces-3.0.sl" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-3.0.sl .");
- psystem("ln -s libxerces-3.0.sl libxerces-3.sl ");
- psystem("ln -s libxerces-3.sl libxerces.sl ");
+ if ((-e "$XERCESCROOT/obj/.libs/libxerces-c-3.0.sl" )) {
+ psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-c-3.0.sl .");
+ psystem("ln -s libxerces-c-3.0.sl libxerces-c-3.sl ");
+ psystem("ln -s libxerces-c-3.sl libxerces-c.sl ");
}
- if ((-e "$XERCESCROOT/obj/.libs/libxerces.a" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces.a . ");
+ if ((-e "$XERCESCROOT/obj/.libs/libxerces-c.a" )) {
+ psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-c.a . ");
}
# Mac OS X
- if ((-e "$XERCESCROOT/obj/.libs/libxerces-3.0.dylib" )) {
- psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-3.0.dylib .");
- psystem("ln -s libxerces-3.0.dylib libxerces-3.dylib ");
- psystem("ln -s libxerces-3.dylib libxerces.dylib ");
+ if ((-e "$XERCESCROOT/obj/.libs/libxerces-c-3.0.dylib" )) {
+ psystem("cp -f $XERCESCROOT/obj/.libs/libxerces-c-3.0.dylib .");
+ psystem("ln -s libxerces-c-3.0.dylib libxerces-c-3.dylib ");
+ psystem("ln -s libxerces-c-3.dylib libxerces-c.dylib ");
}
# Populate the Message Catalog Files
Modified: xerces/c/trunk/tests/Makefile.am
URL: http://svn.apache.org/viewvc/xerces/c/trunk/tests/Makefile.am?view=diff&rev=564200&r1=564199&r2=564200
==============================================================================
--- xerces/c/trunk/tests/Makefile.am (original)
+++ xerces/c/trunk/tests/Makefile.am Thu Aug 9 06:33:23 2007
@@ -1,164 +1,164 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# $Id: DOM.hpp,v 1.12 2004/09/08 13:55:38 peiyongz Exp $
-#
-
-check_PROGRAMS = ${testprogs}
-
-LDADD = ${top_builddir}/obj/libxerces.la
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# $Id: DOM.hpp,v 1.12 2004/09/08 13:55:38 peiyongz Exp $
+#
+
+check_PROGRAMS = ${testprogs}
+
+LDADD = ${top_builddir}/obj/libxerces-c.la
# the -I${top_builddir}/src is needed to pick the xercesc/util/Xerces_autoconf_config.hpp
# header file when doing out-of-tree builds
AM_CPPFLAGS = -I${top_builddir}/src -I${top_srcdir}/src
-
-testprogs =
-
-testprogs += DOMTest
-DOMTest_SOURCES = src/DOM/DOMTest/DTest.cpp \
- src/DOM/DOMTest/DTest.h
-
-testprogs += DOMMemTest
-DOMMemTest_SOURCES = src/DOM/DOMMemTest/DOMMemTest.cpp
-
-testprogs += Normalizer
-Normalizer_SOURCES = src/DOM/Normalizer/Normalizer.cpp \
- src/DOM/Normalizer/Normalizer.hpp
-Normalizer_EXTRA = src/DOM/Normalizer/expectedOutput
-
-testprogs += RangeTest
-RangeTest_SOURCES = src/DOM/RangeTest/RangeTest.cpp
-
-testprogs += DOMTraversalTest
-DOMTraversalTest_SOURCES = src/DOM/Traversal/Traversal.cpp
-
-testprogs += DOMTypeInfoTest
-DOMTypeInfoTest_SOURCES = src/DOM/TypeInfo/TypeInfo.cpp \
- src/DOM/TypeInfo/TypeInfo.hpp
-DOMTypeInfoTest_EXTRA = src/DOM/TypeInfo/data/combined.dtd \
- src/DOM/TypeInfo/data/combined.xml \
- src/DOM/TypeInfo/data/combined.xsd \
- src/DOM/TypeInfo/data/SecondSchema.xsd \
- src/DOM/TypeInfo/data/TypeInfo.dtd \
- src/DOM/TypeInfo/data/TypeInfo.xml \
- src/DOM/TypeInfo/data/TypeInfo.xsd \
- src/DOM/TypeInfo/data/TypeInfoJustDTD.xml \
- src/DOM/TypeInfo/data/TypeInfoNoDTD.xml \
- src/DOM/TypeInfo/data/TypeInfoNoDTD.xsd
-
-testprogs += EncodingTest
-EncodingTest_SOURCES = src/EncodingTest/EncodingTest.cpp
-
-testprogs += InitTermTest
-InitTermTest_SOURCES = src/InitTermTest/InitTermTest.cpp \
- src/InitTermTest/InitTermTest.hpp
-
-testprogs += MemHandlerTest
-MemHandlerTest_SOURCES = src/MemHandlerTest/MemoryMonitor.cpp \
- src/MemHandlerTest/MemoryMonitor.hpp \
- src/MemHandlerTest/SimpleHashPtr.cpp \
- src/MemHandlerTest/SimpleHashPtr.hpp \
- src/MemHandlerTest/SimpleValueHashTableOf.hpp
-
-testprogs += NetAccessorTest
-NetAccessorTest_SOURCES = src/NetAccessorTest/NetAccessorTest.cpp
-
-# Doesn't compile under gcc4 for some reason
-# dcargill says this is obsolete and we can delete it.
-#testprogs += ParserTest
-#ParserTest_SOURCES = src/ParserTest/ParserTest.cpp \
-# src/ParserTest/ParserTest.hpp \
-# src/ParserTest/ParserTest_Parser.cpp \
-# src/ParserTest/ParserTest_Parser.hpp
-
-testprogs += ThreadTest
-ThreadTest_SOURCES = src/ThreadTest/ThreadTest.cpp
-
-# Fails to compile under gcc 4 (ambiguous calls to NullPointerException)
-# dcargill says this is obsolete and we can delete it.
-#testprogs += UtilTests
-#UtilTests_SOURCES = src/UtilTests/CoreTests_BitSet.cpp \
-# src/UtilTests/CoreTests_CountedPointer.cpp \
-# src/UtilTests/CoreTests_RefArray.cpp \
-# src/UtilTests/CoreTests_RefHashTable.cpp \
-# src/UtilTests/CoreTests_RefStack.cpp \
-# src/UtilTests/CoreTests_RefVector.cpp \
-# src/UtilTests/CoreTests_String.cpp \
-# src/UtilTests/CoreTests_Transcoders.cpp \
-# src/UtilTests/CoreTests_URL.cpp \
-# src/UtilTests/CoreTests_ValueArray.cpp \
-# src/UtilTests/CoreTests_ValueStack.cpp \
-# src/UtilTests/CoreTests_ValueVector.cpp \
-# src/UtilTests/CoreTestsMain.cpp \
-# src/UtilTests/CoreTests.hpp
-
-testprogs += XSerializerTest
-XSerializerTest_SOURCES = src/XSerializerTest/XSerializerHandlers.cpp \
- src/XSerializerTest/XSerializerHandlers.hpp \
- src/XSerializerTest/XSerializerTest.cpp \
- src/XSerializerTest/XSerializerTest.hpp
-
-# Fails to compile under gcc4 (values too long for long type)
-testprogs += XSValueTest
-XSValueTest_SOURCES = src/XSValueTest/XSValueTest.cpp \
- src/XSValueTest/XSValueTest.hpp
-
-#
-# Override generated rules to provide prettier make rules
-#
-# Warning: If Automake changes sufficiently, these rules may need to
-# be regenerated from the (new) default output of Automake
-#
-if XERCES_PRETTY_MAKE
-.cpp.o:
-@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
-
-PRETTY_MAKE=${top_srcdir}/config/pretty-make
-PRETTY_COMPILE=${PRETTY_MAKE} Compiling
-endif
-
-CXXCOMPILE = ${PRETTY_COMPILE} \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = ${PRETTY_COMPILE} \
- $(LIBTOOL) --quiet --tag=CXX --mode=compile \
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-
-
-
+
+testprogs =
+
+testprogs += DOMTest
+DOMTest_SOURCES = src/DOM/DOMTest/DTest.cpp \
+ src/DOM/DOMTest/DTest.h
+
+testprogs += DOMMemTest
+DOMMemTest_SOURCES = src/DOM/DOMMemTest/DOMMemTest.cpp
+
+testprogs += Normalizer
+Normalizer_SOURCES = src/DOM/Normalizer/Normalizer.cpp \
+ src/DOM/Normalizer/Normalizer.hpp
+Normalizer_EXTRA = src/DOM/Normalizer/expectedOutput
+
+testprogs += RangeTest
+RangeTest_SOURCES = src/DOM/RangeTest/RangeTest.cpp
+
+testprogs += DOMTraversalTest
+DOMTraversalTest_SOURCES = src/DOM/Traversal/Traversal.cpp
+
+testprogs += DOMTypeInfoTest
+DOMTypeInfoTest_SOURCES = src/DOM/TypeInfo/TypeInfo.cpp \
+ src/DOM/TypeInfo/TypeInfo.hpp
+DOMTypeInfoTest_EXTRA = src/DOM/TypeInfo/data/combined.dtd \
+ src/DOM/TypeInfo/data/combined.xml \
+ src/DOM/TypeInfo/data/combined.xsd \
+ src/DOM/TypeInfo/data/SecondSchema.xsd \
+ src/DOM/TypeInfo/data/TypeInfo.dtd \
+ src/DOM/TypeInfo/data/TypeInfo.xml \
+ src/DOM/TypeInfo/data/TypeInfo.xsd \
+ src/DOM/TypeInfo/data/TypeInfoJustDTD.xml \
+ src/DOM/TypeInfo/data/TypeInfoNoDTD.xml \
+ src/DOM/TypeInfo/data/TypeInfoNoDTD.xsd
+
+testprogs += EncodingTest
+EncodingTest_SOURCES = src/EncodingTest/EncodingTest.cpp
+
+testprogs += InitTermTest
+InitTermTest_SOURCES = src/InitTermTest/InitTermTest.cpp \
+ src/InitTermTest/InitTermTest.hpp
+
+testprogs += MemHandlerTest
+MemHandlerTest_SOURCES = src/MemHandlerTest/MemoryMonitor.cpp \
+ src/MemHandlerTest/MemoryMonitor.hpp \
+ src/MemHandlerTest/SimpleHashPtr.cpp \
+ src/MemHandlerTest/SimpleHashPtr.hpp \
+ src/MemHandlerTest/SimpleValueHashTableOf.hpp
+
+testprogs += NetAccessorTest
+NetAccessorTest_SOURCES = src/NetAccessorTest/NetAccessorTest.cpp
+
+# Doesn't compile under gcc4 for some reason
+# dcargill says this is obsolete and we can delete it.
+#testprogs += ParserTest
+#ParserTest_SOURCES = src/ParserTest/ParserTest.cpp \
+# src/ParserTest/ParserTest.hpp \
+# src/ParserTest/ParserTest_Parser.cpp \
+# src/ParserTest/ParserTest_Parser.hpp
+
+testprogs += ThreadTest
+ThreadTest_SOURCES = src/ThreadTest/ThreadTest.cpp
+
+# Fails to compile under gcc 4 (ambiguous calls to NullPointerException)
+# dcargill says this is obsolete and we can delete it.
+#testprogs += UtilTests
+#UtilTests_SOURCES = src/UtilTests/CoreTests_BitSet.cpp \
+# src/UtilTests/CoreTests_CountedPointer.cpp \
+# src/UtilTests/CoreTests_RefArray.cpp \
+# src/UtilTests/CoreTests_RefHashTable.cpp \
+# src/UtilTests/CoreTests_RefStack.cpp \
+# src/UtilTests/CoreTests_RefVector.cpp \
+# src/UtilTests/CoreTests_String.cpp \
+# src/UtilTests/CoreTests_Transcoders.cpp \
+# src/UtilTests/CoreTests_URL.cpp \
+# src/UtilTests/CoreTests_ValueArray.cpp \
+# src/UtilTests/CoreTests_ValueStack.cpp \
+# src/UtilTests/CoreTests_ValueVector.cpp \
+# src/UtilTests/CoreTestsMain.cpp \
+# src/UtilTests/CoreTests.hpp
+
+testprogs += XSerializerTest
+XSerializerTest_SOURCES = src/XSerializerTest/XSerializerHandlers.cpp \
+ src/XSerializerTest/XSerializerHandlers.hpp \
+ src/XSerializerTest/XSerializerTest.cpp \
+ src/XSerializerTest/XSerializerTest.hpp
+
+# Fails to compile under gcc4 (values too long for long type)
+testprogs += XSValueTest
+XSValueTest_SOURCES = src/XSValueTest/XSValueTest.cpp \
+ src/XSValueTest/XSValueTest.hpp
+
+#
+# Override generated rules to provide prettier make rules
+#
+# Warning: If Automake changes sufficiently, these rules may need to
+# be regenerated from the (new) default output of Automake
+#
+if XERCES_PRETTY_MAKE
+.cpp.o:
+@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
+@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Po"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@ @depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
+@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
+@am__fastdepCXX_TRUE@ then mv -f "$$depbase.Tpo" "$$depbase.Plo"; else rm -f "$$depbase.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ @source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+PRETTY_MAKE=${top_srcdir}/config/pretty-make
+PRETTY_COMPILE=${PRETTY_MAKE} Compiling
+endif
+
+CXXCOMPILE = ${PRETTY_COMPILE} \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = ${PRETTY_COMPILE} \
+ $(LIBTOOL) --quiet --tag=CXX --mode=compile \
+ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+
+
+
Modified: xerces/c/trunk/xerces-c.spec
URL: http://svn.apache.org/viewvc/xerces/c/trunk/xerces-c.spec?view=diff&rev=564200&r1=564199&r2=564200
==============================================================================
--- xerces/c/trunk/xerces-c.spec (original)
+++ xerces/c/trunk/xerces-c.spec Thu Aug 9 06:33:23 2007
@@ -60,8 +60,8 @@
export XERCESCROOT=$RPM_BUILD_DIR/%{name}-src_%{tarversion}
cd $XERCESCROOT
make prefix=$RPM_BUILD_ROOT%{prefix} libdir=$RPM_BUILD_ROOT%{prefix}/%{_lib} install
-ln -sf %{prefix}/%{_lib}/libxerces-3.0.so $RPM_BUILD_ROOT%{prefix}/%{_lib}/libxerces-c.so
-rm -f $RPM_BUILD_ROOT%{prefix}/%{_lib}/libxerces.la
+ln -sf %{prefix}/%{_lib}/libxerces-c-3.0.so $RPM_BUILD_ROOT%{prefix}/%{_lib}/libxerces-c.so
+rm -f $RPM_BUILD_ROOT%{prefix}/%{_lib}/libxerces-c.la
mkdir -p $RPM_BUILD_ROOT%{prefix}/share/%{name}/samples
cp -a $XERCESCROOT/samples/src $RPM_BUILD_ROOT%{prefix}/share/%{name}/samples
cp -a $XERCESCROOT/samples/data $RPM_BUILD_ROOT%{prefix}/share/%{name}/samples
@@ -78,8 +78,8 @@
%files
%defattr(755,root,root)
%{prefix}/bin/*
-%{prefix}/%{_lib}/libxerces*.so
-%{prefix}/%{_lib}/libxerces*.a
+%{prefix}/%{_lib}/libxerces-c*.so
+%{prefix}/%{_lib}/libxerces-c*.a
%files devel
%defattr(-,root,root)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org