ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/make_basic.mk
(Generate patch)

Comparing make_basic.mk (file contents):
Revision 1.10 by arta, Wed Mar 5 15:56:13 2008 UTC vs.
Revision 1.11 by arta, Mon Mar 10 18:19:13 2008 UTC

# Line 65 | Line 65 | ifeq ($(COMPILER), icc)
65  
66      # All 3rd-party math libraries - local rules can define a subset
67      FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio
68 +    CFITSIOLIBS = $(CFITSIOL) -lcfitsio
69    else
70   #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
71      # Path to 32-bit 3rd-party libraries
# Line 73 | Line 74 | ifeq ($(COMPILER), icc)
74  
75      # All 3rd-party math libraries - local rules can define a subset
76      FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio
77 +    CFITSIOLIBS = $(CFITSIOL) -lcfitsio
78    endif
79   endif
80  
# Line 181 | Line 183 | FLINK          = $(F77) $(F_LF_ALL) $(LF_TGT) -o
183   SLBIN           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../bin/$(JSOC_MACHINE)/
184   SLLIB           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../lib/$(JSOC_MACHINE)/
185  
186 < ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
186 > ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDSTRUCT_FPIC) $(LIBMISC_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
187  
188   ### Standard parts
189   #
# Line 225 | Line 227 | $(FEXE):       %:      %.o $(MATHLIBS)
227                  $(FLINK)
228                  $(SLBIN)
229  
230 < $(SERVEREXE):   LL_TGT := $(LL_TGT) -lpq
230 > $(SERVEREXE):   LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)
231   $(SERVEREXE):   %:      %.o $(SERVERLIBS)
232                          $(LINK)
233                          $(SLBIN)
234  
235 < $(MODEXE):      LL_TGT := $(LL_TGT) -lpq
235 > $(MODEXE):      LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)
236   $(MODEXE):      %:      %.o $(MODLIBS)
237                          $(LINK)
238                          $(SLBIN)
239  
240 + $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
241   $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
242                          $(LINK)
243                          $(SLBIN)
244  
245 + $(FMODEXE):     LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
246   $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)
247                          $(FLINK)
248                          $(SLBIN)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines