Merge pull request #56 from swt2c/unbundled-cctbx

Enable building against unbundled cctbx library

Author: vincefn

Fox/gnu.mak

@@ -8,14 +8,15 @@ shared-wxgtk=1
 shared-fftw=1
 shared-glut=1
 shared-mysql=1
+shared-cctbx=1
 endif
 
 all: Fox
 
 default: all
 
 Fox:
-	$(MAKE) -f gnu.mak wxcryst=1 opengl=1 fftw=1 debug=$(debug) unicode=$(unicode) cod=$(cod) shared=$(shared) shared-wxgtk=$(shared-wxgtk) shared-glut=$(shared-glut) shared-newmat=$(shared-newmat) shared-fftw=$(shared-fftw) shared-mysql=$(shared-mysql) -C src Fox
+	$(MAKE) -f gnu.mak wxcryst=1 opengl=1 fftw=1 debug=$(debug) unicode=$(unicode) cod=$(cod) shared=$(shared) shared-wxgtk=$(shared-wxgtk) shared-glut=$(shared-glut) shared-newmat=$(shared-newmat) shared-fftw=$(shared-fftw) shared-mysql=$(shared-mysql) shared-cctbx=$(shared-cctbx) -C src Fox
 
 Fox-nogui:
 	$(MAKE) -f gnu.mak wxcryst=0 opengl=0 fftw=0 cod=0 debug=$(debug) -C src Fox-nogui

Fox/src/gnu.mak

@@ -15,7 +15,7 @@ else
 endif
 
 ifeq ($(profile),2)
-%.o :  %.cpp $(libwx) $(libnewmat) libcctbx
+%.o :  %.cpp $(libwx) $(libnewmat) $(libcctbx)
 	@rm -f $(*F).gcda $(*F).gcno
 	@$(MAKEDEPEND)
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c $< -o $@
@@ -33,11 +33,11 @@ endif
 libFox: $(OBJ)
 
 #Main Application
-Fox: $(libwx) $(libnewmat)  $(libfftw) $(COD_LIB) libCrystVector libQuirks libRefinableObj libcctbx libCryst libwxCryst
+Fox: $(libwx) $(libnewmat)  $(libfftw) $(COD_LIB) libCrystVector libQuirks libRefinableObj $(libcctbx) libCryst libwxCryst
 	$(MAKE) -f gnu.mak libFox
 	${LINKER} ${CRYST_LDFLAGS} -o $@ ${filter-out %.h %.a %.so lib%, $^} $(OBJ) ${LOADLIBES}
 
-Fox-nogui: $(libnewmat) libcctbx libCrystVector libQuirks libRefinableObj libCryst Fox.o
+Fox-nogui: $(libnewmat) $(libcctbx) libCrystVector libQuirks libRefinableObj libCryst Fox.o
 	${LINKER} ${CRYST_LDFLAGS} -o $@ ${filter-out %.h %.a %.so lib%, $^} ${LOADLIBES}
 
 fox: Fox

ObjCryst/rules-gnu.mak

@@ -24,6 +24,7 @@ shared-newmat=1
 shared-wxgtk=1
 shared-fftw=1
 shared-glut=1
+shared-cctbx=1
 endif
 ### Rules for Linux & GCC
 # C compiler
@@ -237,7 +238,11 @@ $(DIR_STATIC_LIBS)/lib/libcctbx.a: $(BUILD_DIR)/cctbx.tar.bz2
 	#ln -sf $(BUILD_DIR)/boost $(DIR_STATIC_LIBS)/include/
 	#rm -Rf $(BUILD_DIR)/cctbx
 
-libcctbx: $(DIR_STATIC_LIBS)/lib/libcctbx.a
+ifneq ($(shared-cctbx),1)
+libcctbx= $(DIR_STATIC_LIBS)/lib/libcctbx.a
+else
+libcctbx=
+endif
 
 $(BUILD_DIR)/fftw-3.3.10.tar.gz:
 	cd $(BUILD_DIR) && $(DOWNLOAD_COMMAND) http://fftw.org/fftw-3.3.10.tar.gz
@@ -268,13 +273,13 @@ libboost:$(BUILD_DIR)/boost_1_68_0.tar.bz2
 	rm -Rf $(BUILD_DIR)/boost_1_68_0
 
 #ObjCryst++
-libCryst: $(libwx) libcctbx
+libCryst: $(libwx) $(libcctbx)
 	$(MAKE) -f gnu.mak -C ${DIR_LIBCRYST} lib
 
 libcryst: libCryst
 
 #wxCryst++
-libwxCryst: $(libwx) $(libfreeglut) $(libfftw) libcctbx
+libwxCryst: $(libwx) $(libfreeglut) $(libfftw) $(libcctbx)
 	$(MAKE) -f gnu.mak -C ${DIR_WXWCRYST} lib
 
 #Vector computation library
@@ -286,5 +291,5 @@ libQuirks: $(libwx)
 	$(MAKE) -f gnu.mak -C ${DIR_VFNQUIRKS} lib
 
 #Library to take care of refinable parameters, plus Global optimization and Least Squares refinements
-libRefinableObj:$(libnewmat) $(libwx) libcctbx
+libRefinableObj:$(libnewmat) $(libwx) $(libcctbx)
 	$(MAKE) -f gnu.mak -C ${DIR_REFOBJ}/ lib