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.55 by arta, Fri Sep 4 18:51:15 2009 UTC vs.
Revision 1.56 by arta, Tue Sep 22 17:43:03 2009 UTC

# Line 4 | Line 4 | DBNAME = POSTGRESQL
4  
5   _JSOCROOT_ = ..
6  
7 # XXX This PGIPATH var isn't correct - we don't put libpq inside the lib_third_party directory
8 # at Stanford.
9 PGIPATH = /usr/include/pgsql
10 ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/$(JSOC_MACHINE)/
11
7   # This optional file has custom definitions created by the configure script
8   -include $(SRCDIR)/custom.mk
9  
# Line 96 | Line 91 | endif
91   # contain the paths to the library binaries, and variables
92   # that end in "LIBS" contain the full link cmd (the -L flag plus the -l flag)
93   #
99 # Path to 3rd-party library headers
100 FMATHLIBSH = -I$(_JSOCROOT_)/lib_third_party/include
101 CFITSIOH = -I$(_JSOCROOT_)/lib_third_party/include
102 GSLH = -I$(_JSOCROOT_)/lib_third_party/include
103
104 ifeq ($(JSOC_MACHINE), linux_x86_64)
105 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-x86_64/ -lfftw3f -lcfitsio
106  # Path to 64-bit 3rd-party libraries
107  FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
108  CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
109  GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
110 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_x86_64/
111 endif
112 ifeq ($(JSOC_MACHINE), linux_ia32)
113 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
114  # Path to 32-bit 3rd-party libraries
115  FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
116  CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
117  GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
118 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/linux_ia32/
119 endif
120 ifeq ($(JSOC_MACHINE), mac_osx_ppc)
121 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
122  # Path to appropriate 3rd-party libraries
123  FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
124  CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
125  GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
126 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ppc/
127 endif
128 ifeq ($(JSOC_MACHINE), mac_osx_ia32)
129 #    FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio
130  # Path to appropriate 3rd-party libraries
131  FMATHLIBSL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
132  CFITSIOL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
133  GSLL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
134 #  ECPGL = -L$(_JSOCROOT_)/lib_third_party/lib/mac_osx_ia32/
135 endif
136
137 # All 3rd-party libraries - local rules can define a subset
138 FMATHLIBS = $(FMATHLIBSL) -lfftw3f
139 CFITSIOLIBS = $(CFITSIOL) -lcfitsio
140 ECPGLIBS = $(ECPGL) -lpq
141
142 ifeq ($(COMPILER), gcc)
143        ifeq ($(JSOC_MACHINE), linux_x86_64)
144                ifneq ($(CFITSIOFNAME_GCC_X86_64),)
145                        FMATHLIBS = $(FMATHLIBSL) -lfftw3f -l$(CFITSIOFNAME_GCC_X86_64)
146                        CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOFNAME_GCC_X86_64)
147                endif
148        endif
149 endif
94  
95 < GSLLIBS = $(GSLL) -lgsl -lgslcblas
95 > # PostgreSQL
96 > PGH = -I$(POSTGRES_INCS)
97 > PGL = -L$(POSTGRES_LIBS)
98 > PGLIBNAME = $(POSTGRES_LIB)
99 > PGLIBS = $(PGL) -l$(PGLIBNAME)
100 >
101 > # CFITSIO
102 > CFITSIOH = -I$(CFITSIO_INCS)
103 > CFITSIOL = -L$(CFITSIO_LIBS)
104 > CFITSIOLIBNAME = $(CFITSIO_LIB)
105 > CFITSIOLIBS =  $(CFITSIOL) -l$(CFITSIOLIBNAME)
106 >
107   #***********************************************************************************************#
108  
109  
# Line 386 | Line 341 | $(CEXE):       %:      %.o $(EXELIBS)
341                  $(LINK)
342                  $(SLBIN)
343  
344 < $(FEXE):        %:      %.o $(FMATHLIBS)
344 > $(FEXE):        %:      %.o
345                  $(FLINK)
346                  $(SLBIN)
347  
348 < $(SERVEREXE):   LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS)
348 > $(SERVEREXE):   LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
349   $(SERVEREXE):   %:      %.o $(SERVERLIBS)
350                          $(LINK)
351                          $(SLBIN)
352  
353 < $(MODEXE):      LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS)
353 > $(MODEXE):      LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
354   $(MODEXE):      %:      %.o $(MODLIBS)
355                          $(LINK)
356                          $(SLBIN)
# Line 407 | Line 362 | $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SO
362   # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file.
363   # These are socket-connect modules only. Assume they use third-party Fortran libraries
364   # (although this may not be the case).
365 < $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)
365 > $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
366   $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
367                          $(FLINK)
368                          $(SLBIN)
369  
370   # MODEXE_USEF contains all C direct-connect modules that use third-party Fortran libraries.
371 < $(MODEXE_USEF): LL_TGT := $(LL_TGT) $(ECPGLIBS) $(CFITSIOLIBS) $(FMATHLIBS)
371 > $(MODEXE_USEF): LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
372   $(MODEXE_USEF):     %:  %.o $(MODLIBS)
373                          $(FLINK)
374                          $(SLBIN)
375   # MODEXE_USEF contains all C socket-connect modules that use third-party Fortran libraries.
376 < $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS) $(FMATHLIBS)
376 > $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS)
377   $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK)
378                          $(FLINK)
379                          $(SLBIN)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines