Author: lkajan-guest Date: 2012-08-10 17:42:14 +0000 (Fri, 10 Aug 2012) New Revision: 12036
Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper Log: python shared lib now links with main C++ lib Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles =================================================================== --- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles 2012-08-10 17:27:51 UTC (rev 12035) +++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles 2012-08-10 17:42:14 UTC (rev 12036) @@ -161,13 +161,13 @@ --- a/Makefile +++ b/Makefile -@@ -1,4 +1,5 @@ +@@ -1,5 +1,4 @@ # Top level Makefile -+include etc/Makefile.platform - +- UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util UTIL_MODULE = util -@@ -66,7 +67,9 @@ + CHECKOUT_SCRIPT = checkout.sh +@@ -66,7 +65,9 @@ export WWPDB_XERCESC_LIB=xerces-c; \ ./$(COMPILE_SCRIPT)' @@ -178,11 +178,11 @@ +@sh -c 'cd ./$(UTIL_MODULE); \ export PIC=-fPIC; \ export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \ -@@ -79,12 +82,28 @@ +@@ -79,12 +80,28 @@ export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \ export WWPDB_XERCESC_LIB=xerces-c; \ ./$(COMPILE_SCRIPT)' -+ libtool --quiet --mode=link $(CCC) -version-info 0:0:0 -rpath /usr/lib $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o lib/librcsb-core-wrapper.la lib/*.lo ++ libtool --quiet --mode=link $(CXX) -version-info 0:0:0 -rpath /usr/lib $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o lib/librcsb-core-wrapper.la lib/*.lo + +compile_lnx_41: lib/librcsb-core-wrapper.la + +@sh -c 'cd ./$(UTIL_MODULE); \ Modified: trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper =================================================================== --- trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper 2012-08-10 17:27:51 UTC (rev 12035) +++ trunk/packages/rcsb-core-wrapper/trunk/debian/patches/pythonwrapper 2012-08-10 17:42:14 UTC (rev 12036) @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -98,6 +98,22 @@ +@@ -96,6 +96,22 @@ export WWPDB_XERCESC_LIB=xerces-c; \ exit 0;' @@ -23,3 +23,14 @@ debug: @sh -c 'cd ./$(UTIL_MODULE); ./$(COMPILE_SCRIPT) debug' +--- a/wrapper/Makefile ++++ b/wrapper/Makefile +@@ -140,7 +140,7 @@ + $(L_MOD_LIB): $(OBJ_FILES) $(ALL_DEP_LIBS) + # Create module library + +- @cd $(OBJ_DIR); $(CCC) $(LINK_METHOD) $(EXT_LIBS_DIRS) $(OBJ_FILES) $(ALL_DEP_LIBS) $(EXT_LIBS) $(SYS_LIBS) -o ../$@ ++ cd $(OBJ_DIR); $(CCC) $(LINK_METHOD) $(EXT_LIBS_DIRS) $(OBJ_FILES) -L../../lib/.libs -lrcsb-core-wrapper $(EXT_LIBS) $(SYS_LIBS) -o ../$@ + + + # Rule for making object files _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
