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.38 by arta, Fri Feb 6 00:25:08 2009 UTC vs.
Revision 1.39 by arta, Wed Apr 8 18:31:52 2009 UTC

# Line 64 | Line 64 | ifeq ($(JSOC_MACHINE), linux_x86_64)
64    F77 = ifort -mcmodel=medium
65   endif
66  
67 + #***********************************************************************************************#
68 + #
69 + # This section contains make variables that hold the paths to and names of third-party libraries.
70 + # Variables that end in 'H' contain the -I link flags that contain the include paths
71 + # for the library headers, variables that end in 'L' contain the -L link flags that
72 + # contain the paths to the library binaries, and variables
73 + # that end in "LIBS" contain the full link cmd (the -L flag plus the -l flag)
74 + #
75   # Path to 3rd-party library headers
76   FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include
77   CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include
# Line 103 | Line 111 | ifeq ($(JSOC_MACHINE), mac_osx_ia32)
111   endif
112  
113   # All 3rd-party math libraries - local rules can define a subset
114 < FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio
114 > FMATHLIBS = $(FMATHLIBSL) -lfftw3f
115   CFITSIOLIBS = $(CFITSIOL) -lcfitsio
116  
117   ifeq ($(COMPILER), gcc)
# Line 116 | Line 124 | ifeq ($(COMPILER), gcc)
124   endif
125  
126   GSLLIBS = $(GSLL) -lgsl -lgslcblas
127 + #***********************************************************************************************#
128 +
129  
130   # Compilation define customizations (eg., for remote DRMS builds)
131   CUSTOMSW =
# Line 295 | Line 305 | $(MODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CF
305   $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
306                          $(LINK)
307                          $(SLBIN)
308 <
309 < $(FMODEXE):     LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
310 < $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)
308 > # FMODEXE contains all Fortran modules - the DoIt() function is defined inside a .f file.
309 > # These are socket-connect modules only. Assume they use third-party Fortran libraries
310 > # (although this may not be the case).
311 > $(FMODEXE):     LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)
312 > $(FMODEXE):     %_sock: %.o $(FMODLIBS_SOCK)
313                          $(FLINK)
314                          $(SLBIN)
315  
316 < $(MODEXE_USEF): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS)
316 > # MODEXE_USEF contains all C direct-connect modules that use third-party Fortran libraries.
317 > $(MODEXE_USEF): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS) $(FMATHLIBS)
318   $(MODEXE_USEF):     %:  %.o $(MODLIBS)
319                          $(FLINK)
320                          $(SLBIN)
321 <
322 < $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
321 > # MODEXE_USEF contains all C socket-connect modules that use third-party Fortran libraries.
322 > $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)
323   $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK)
324                          $(FLINK)
325                          $(SLBIN)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines