/[debian-med]/trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles
ViewVC logotype

Diff of /trunk/packages/rcsb-core-wrapper/trunk/debian/patches/objectfiles

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 12035 by lkajan-guest, Fri Aug 10 17:13:59 2012 UTC revision 12036 by lkajan-guest, Fri Aug 10 17:42:14 2012 UTC
# Line 161  Line 161 
161    
162  --- a/Makefile  --- a/Makefile
163  +++ b/Makefile  +++ b/Makefile
164  @@ -1,4 +1,5 @@  @@ -1,5 +1,4 @@
165   # Top level Makefile   # Top level Makefile
166  +include etc/Makefile.platform  -
   
167   UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util   UTIL_LOC = https://svn-dev.wwpdb.org/svn-rcsb/build/util
168   UTIL_MODULE = util   UTIL_MODULE = util
169  @@ -66,7 +67,9 @@   CHECKOUT_SCRIPT = checkout.sh
170    @@ -66,7 +65,9 @@
171            export WWPDB_XERCESC_LIB=xerces-c; \            export WWPDB_XERCESC_LIB=xerces-c; \
172            ./$(COMPILE_SCRIPT)'            ./$(COMPILE_SCRIPT)'
173    
# Line 178  Line 178 
178          +@sh -c 'cd ./$(UTIL_MODULE); \          +@sh -c 'cd ./$(UTIL_MODULE); \
179           export PIC=-fPIC; \           export PIC=-fPIC; \
180           export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \           export WWPDB_PYTHON_INC=/apps/python/include/python2.5; \
181  @@ -79,12 +82,28 @@  @@ -79,12 +80,28 @@
182           export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \           export WWPDB_XERCESC_LIB_DIR=/apps/xerces-3.0.1/lib; \
183           export WWPDB_XERCESC_LIB=xerces-c; \           export WWPDB_XERCESC_LIB=xerces-c; \
184           ./$(COMPILE_SCRIPT)'           ./$(COMPILE_SCRIPT)'
185  +       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
186  +  +
187  +compile_lnx_41: lib/librcsb-core-wrapper.la  +compile_lnx_41: lib/librcsb-core-wrapper.la
188  +       +@sh -c 'cd ./$(UTIL_MODULE); \  +       +@sh -c 'cd ./$(UTIL_MODULE); \
Legend:
Removed from v.12035  
changed lines
  Added in v.12036
  ViewVC Help
Powered by ViewVC 1.1.5