(file) Return to make_basic.mk CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/make_basic.mk between version 1.56 and 1.93

version 1.56, 2009/09/22 17:43:03 version 1.93, 2022/11/20 00:47:00
Line 1 
Line 1 
   #***********************************************************************************************#
   #
   # INITIALIZATION
   #
   
 VPATH  = $(SRCDIR) VPATH  = $(SRCDIR)
 STATIC = STATIC =
 DBNAME = POSTGRESQL  DBMS = POSTGRESQL
   CUSTOMSW =
 _JSOCROOT_ = ..  
  
 # This optional file has custom definitions created by the configure script  # Run a script to determine the machine on which make is being run. This
 -include $(SRCDIR)/custom.mk  # MAY return a machine type, if the host found falls into one of several
   # categories (like dbserver).
   MACHTYPE = $(shell hostname)
   
   # If MACH was set when the make command was issued (eg., make MACH='N02'), then
   # use its value for the output/obj directory and use the drmsparams.mk variables
   # relevant to its value. Otherwise, use $(JSOC_MACHINE).
   ifeq ($(MACH),)
   MACH = $(JSOC_MACHINE)
   endif
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 13  _JSOCROOT_ = ..
Line 26  _JSOCROOT_ = ..
 # #
 COMPILER = icc COMPILER = icc
 FCOMPILER = ifort FCOMPILER = ifort
   ifeq ($(JSOC_MACHINE), linux_avx2)
 ifneq ($(JSOC_AUTOCOMPILER),)  MPICOMPILER = mpiicc
 COMPILER = $(JSOC_AUTOCOMPILER)  MPIFCOMPILER = mpiifort
 endif  else
   MPICOMPILER = $(MPI_PATH)/mpicc
 ifneq ($(JSOC_AUTOFCOMPILER),)  MPIFCOMPILER = $(MPI_PATH)/mpif90
 FCOMPILER = $(JSOC_AUTOFCOMPILER)  
 endif endif
  
 # can set through custom.mk or through environment  # can set through drmsparams.mk or through environment
 ifneq ($(JSOC_COMPILER),) ifneq ($(JSOC_COMPILER),)
 COMPILER = $(JSOC_COMPILER) COMPILER = $(JSOC_COMPILER)
 endif endif
Line 32  FCOMPILER = $(JSOC_FCOMPILER)
Line 44  FCOMPILER = $(JSOC_FCOMPILER)
 endif endif
 #***********************************************************************************************# #***********************************************************************************************#
  
   #***********************************************************************************************#
   # This optional file has custom definitions created by the configure script.
   # Do this after compiler selection since drmsparams.mk might use $COMPILER or $FCOMPILER.
   # drmsparams.mk might also set compiler (through moreconfigure.pl)
   -include $(SRCDIR)/$(LOCALIZATIONDIR)/drmsparams.mk
   #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 94  endif
Line 112  endif
  
 # PostgreSQL # PostgreSQL
 PGH = -I$(POSTGRES_INCS) PGH = -I$(POSTGRES_INCS)
 PGL = -L$(POSTGRES_LIBS)  
 PGLIBNAME = $(POSTGRES_LIB)  # For use of dynamic library
 PGLIBS = $(PGL) -l$(PGLIBNAME)  PGLIBS = $(POSTGRES_LIBS)/lib$(POSTGRES_LIB).so
  
 # CFITSIO # CFITSIO
 CFITSIOH = -I$(CFITSIO_INCS) CFITSIOH = -I$(CFITSIO_INCS)
 CFITSIOL = -L$(CFITSIO_LIBS) CFITSIOL = -L$(CFITSIO_LIBS)
 CFITSIOLIBNAME = $(CFITSIO_LIB) CFITSIOLIBNAME = $(CFITSIO_LIB)
 CFITSIOLIBS =  $(CFITSIOL) -l$(CFITSIOLIBNAME)  # make sure to use static library so we don't have to deal with locating the dynamic one at run time
   # set back to dynamic (the default) for the other libraries that could follow cfitsio
   CFITSIOLIBS = $(CFITSIOL) -Wl,-Bstatic -l$(CFITSIOLIBNAME) -Wl,-Bdynamic
   # end CFITSIO
   
   # GSL
   GSLH = -I$(GSL_INCS)
   GSLL = -L$(GSL_LIBS)
   GSLLIBS = $(GSLL) -lgsl
   
   # FFTW
   ifeq ($(JSOC_MACHINE), linux_avx2)
   FFTWH =
   FFTWL =
   FFTW3LIBS =
   FFTW3FLIBS =
   else
   FFTWH = -I$(FFTW_INCS)
   FFTWL = -L$(FFTW_LIBS)
   FFTW3LIBS = $(FFTWL) -lfftw3
   FFTW3FLIBS = $(FFTWL) -lfftw3f
   endif
   
   # TAR
   LIBTARH = -I$(TAR_INCS)
   LIBTARL = -L$(TAR_LIBS) -ltar
   
   # Python
   LIBPYH = -I$(PY_INCS)
   LIBPYL = -L$(PY_LIBS) -l$(PY_LIB)
   PYTHONHOME = "\"$(PY_HOME)\""
  
 #***********************************************************************************************# #***********************************************************************************************#
  
Line 112  CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOLI
Line 160  CFITSIOLIBS = $(CFITSIOL) -l$(CFITSIOLI
 # CUSTOM BUILDS # CUSTOM BUILDS
 # #
 # Compilation define customizations (eg., for remote DRMS builds) # Compilation define customizations (eg., for remote DRMS builds)
 CUSTOMSW =  
 ifneq ($(DRMS_DEFAULT_RETENTION),) ifneq ($(DRMS_DEFAULT_RETENTION),)
 #       CUSTOMSW = $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION="\"$(DRMS_DEFAULT_RETENTION)\"" #       CUSTOMSW = $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION="\"$(DRMS_DEFAULT_RETENTION)\""
         CUSTOMSW := $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION=$(DRMS_DEFAULT_RETENTION)         CUSTOMSW := $(CUSTOMSW) -DDRMS_DEFAULT_RETENTION=$(DRMS_DEFAULT_RETENTION)
 endif endif
  
 ifneq ($(CUSTOM_DEFINES),)  # Due to legacy code, the name __LOCALIZED_DEFS__ must be used for NetDRMS builds.
 CUSTOMSW := $(CUSTOMSW) -D$(CUSTOM_DEFINES)  # Despite the name, this macro has nothing to do with localized definitions. It means
   # "not Stanford JSOC-SDP" (it essentially means NetDRMS). So, if __LOCALIZED_DEFS__ is set, then
   # the binaries were built for use outside of Stanford.
   # For future use, we also define the NETDRMS_BUILD as a synonym, but with a more appropriate name.
   # __LOCALIZED_DEFS__ is deprecated and should not be used in new code.
   ifeq ($(BUILD_TYPE),NETDRMS)
   CUSTOMSW := $(CUSTOMSW) -DNETDRMS_BUILD -D__LOCALIZED_DEFS__
   endif
   
   # Stanford builds are marked by the JSOC_SDP_BUILD  macro.
   ifeq ($(BUILD_TYPE),JSOC_SDP)
   CUSTOMSW := $(CUSTOMSW) -DJSOC_SDP_BUILD
 endif endif
  
 # #
 #***********************************************************************************************# #***********************************************************************************************#
  
   #***********************************************************************************************#
   #
   # Global flags
   #
   # All modules must be able to find libdsds.so. The define DRMS_LIBDIR specifies the path to
   # all libraries.
   
   GLOBALSW = -DDRMS_ARCH="\"$(MACH)\"" -DDRMS_MAKE_ROOT_DIRECTORY="\"$(SRCDIR)\""
   #
   #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
 # #
Line 166  endif
Line 234  endif
 # #
 # Link flags for all targets # Link flags for all targets
 # #
 LL_ALL          = $(SYSLIBS)  ifeq ($(JSOC_MACHINE), linux_avx2)
   LL_ALL          = $(SYSLIBS) -lcurl -ltirpc
   else
   LL_ALL          = $(SYSLIBS) -lcurl
   endif
   
   ifeq ($(JSOC_MACHINE), linux_avx2)
   GCC_LF_ALL      = $(STATIC) -Wl,--copy-dt-needed-entries
   ICC_LF_ALL      = $(STATIC) -qopenmp -Wl,-export-dynamic -Wl,--copy-dt-needed-entries
   else ifeq ($(JSOC_MACHINE), linux_avx)
   GCC_LF_ALL      = $(STATIC) -Wl,--copy-dt-needed-entries
   ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic -Wl,--copy-dt-needed-entries
   else
 GCC_LF_ALL      = $(STATIC) GCC_LF_ALL      = $(STATIC)
 ICC_LF_ALL      = $(STATIC)  ICC_LF_ALL      = -diag-disable 10237 $(STATIC) -openmp -static-intel -Wl,-export-dynamic
   endif
  
 # Fortran global LINK flags # Fortran global LINK flags
 F_LF_ALL        = -nofor_main -no-ipo  ifeq ($(FCOMPILER), ifort)
   ifeq ($(JSOC_MACHINE), linux_avx2)
   F_LF_ALL        = -nofor-main -qopenmp -Wl,-export-dynamic
   else
   F_LF_ALL        = -diag-disable 10237 -nofor-main  -openmp -static-intel -Wl,-export-dynamic
   endif
   endif
 #***********************************************************************************************# #***********************************************************************************************#
  
 #***********************************************************************************************# #***********************************************************************************************#
Line 179  F_LF_ALL = -nofor_main -no-ipo
Line 266  F_LF_ALL = -nofor_main -no-ipo
 # GLOBAL COMPILE FLAGS # GLOBAL COMPILE FLAGS
 # #
 GCC_CF_GCCCOMP  = -DGCCCOMP GCC_CF_GCCCOMP  = -DGCCCOMP
 ICC_CF_ICCCOMP  = -DICCCOMP  ifeq ($(JSOC_MACHINE), linux_avx2)
   ICC_CF_ICCCOMP  = -DICCCOMP -qopenmp
 CCFLAGS_OPT     :=  else
   ICC_CF_ICCCOMP  = -DICCCOMP -openmp
 ifeq ($(COMPILER), icc)  
   ifeq ($(JSOC_MACHINE), linux_x86_64)  
     CCFLAGS_OPT := -xW  
   endif  
 endif endif
  
 # can't figure out how to get stupid make to do if/else if/else # can't figure out how to get stupid make to do if/else if/else
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
   GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)    GCC_CF_ALL    = -I$(SRCDIR)/base/include -std=gnu99 -O2 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
 # -xW tells the icc compiler to optimize for Pentium 4  
   ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(CCFLAGS_OPT) $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)  
  
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)      ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
       GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=opteron $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
     endif
   
     ifeq ($(JSOC_MACHINE), linux_avx2)
       ICC_CF_ALL = -diag-disable=cpu-dispatch,warn,10441 -axcore-avx512,core-avx2 -I/usr/include/tirpc -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
     endif
   
     ifeq ($(JSOC_MACHINE), linux_avx)
       ICC_CF_ALL = -xavx -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia64)   ifeq ($(JSOC_MACHINE), linux_ia64)
     ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)      ICC_CF_ALL  = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
   endif   endif
  
   ifeq ($(JSOC_MACHINE), linux_ia32)   ifeq ($(JSOC_MACHINE), linux_ia32)
     GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)      GCC_CF_ALL  = -I$(SRCDIR)/base/include -std=gnu99 -O2 -march=i686 $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW) -DNDEBUG
   endif   endif
  
 else else
 # -g tells the icc and gcc compilers to generate full debugging information # -g tells the icc and gcc compilers to generate full debugging information
   GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW)    ifeq ($(JSOC_MACHINE), linux_avx2)
   ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE -g $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW)      GCC_CF_ALL = -I/usr/include/tirpc -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
       ICC_CF_ALL = -I/usr/include/tirpc -I$(SRCDIR)/base/include -std=c99 -g -D_GNU_SOURCE $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
     else
       GCC_CF_ALL = -I$(SRCDIR)/base/include -std=gnu99 -g $(GCC_WARN) $(GCC_CF_GCCCOMP) $(CUSTOMSW) $(GLOBALSW)
       ICC_CF_ALL = -I$(SRCDIR)/base/include -std=c99 -D_GNU_SOURCE -g $(ICC_WARN) $(ICC_CF_ICCCOMP) $(CUSTOMSW) $(GLOBALSW)
     endif
 endif endif
  
 # Fortran global COMPILE flags # Fortran global COMPILE flags
 ifeq ($(JSOC_MACHINE), linux_x86_64)  ifeq ($(JSOC_MACHINE), linux_avx2)
   ifeq ($(FCOMPILER), ifort)   ifeq ($(FCOMPILER), ifort)
     F_CF_ALL := -mcmodel=medium      F_CF_ALL := -diag-disable=cpu-dispatch,warn -axcore-avx512,core-avx2 -qopenmp
   endif   endif
 endif endif
  
 # Other compiler-specific Fortran COMPILE flags  ifeq ($(JSOC_MACHINE), linux_avx)
 ifeq ($(FCOMPILER), ifort) ifeq ($(FCOMPILER), ifort)
       F_CF_ALL := -xavx -openmp
     endif
   endif
   
   ifeq ($(JSOC_MACHINE), linux_x86_64)   ifeq ($(JSOC_MACHINE), linux_x86_64)
     FCFLAGS_OPT := -xW    ifeq ($(FCOMPILER), ifort)
       F_CF_ALL := -openmp
     endif
   endif   endif
   
   # Other compiler-specific Fortran COMPILE flags
   ifeq ($(FCOMPILER), ifort)
   FCFLAGS_INIT := -ftrapuv   FCFLAGS_INIT := -ftrapuv
 else else
   # must be gfortran   # must be gfortran
   FCFLAGS_OPT   :=  
   FCFLAGS_INIT  :=   FCFLAGS_INIT  :=
 endif endif
  
 ifeq ($(DEBUG), 0) ifeq ($(DEBUG), 0)
 # -xW optimizes ifort compilation for Pentium 4 # -xW optimizes ifort compilation for Pentium 4
 # -ftrapuv initializes stack local variables to an unusual value to aid error detection. # -ftrapuv initializes stack local variables to an unusual value to aid error detection.
   F_CF_ALL      := $(F_CF_ALL) $(FCFLAGS_OPT) $(FCOMPILER_WARN)    F_CF_ALL      := $(F_CF_ALL) $(FCOMPILER_WARN)
 else else
   F_CF_ALL      := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN)   F_CF_ALL      := $(F_CF_ALL) -g $(FCFLAGS_INIT) $(FCOMPILER_WARN)
 endif endif
Line 278  endif
Line 381  endif
 FCOMP           = $(FCOMPILER) $(F_CF_ALL) $(FF_TGT) -o $@ -c $< FCOMP           = $(FCOMPILER) $(F_CF_ALL) $(FF_TGT) -o $@ -c $<
 FLINK           = $(FCOMPILER) $(F_LF_ALL) $(LF_TGT) -o $@ $^ $(LL_TGT) $(LL_ALL) FLINK           = $(FCOMPILER) $(F_LF_ALL) $(LF_TGT) -o $@ $^ $(LL_TGT) $(LL_ALL)
  
 SLBIN           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../bin/$(JSOC_MACHINE)/  SLBIN           = ln -sf ../../_$(MACH)/$@ ../bin/$(MACH)/
 SLLIB           = ln -sf ../../_$(JSOC_MACHINE)/$@ ../lib/$(JSOC_MACHINE)/  SLLIB           = ln -sf ../../_$(MACH)/$@ ../lib/$(MACH)/
 #***********************************************************************************************# #***********************************************************************************************#
  
  
Line 288  SLLIB = ln -sf ../../_$(JSOC_MACHINE)/$
Line 391  SLLIB = ln -sf ../../_$(JSOC_MACHINE)/$
 # LIBRARY COLLECTIONS # LIBRARY COLLECTIONS
 # #
 ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC) ALL_LIBS_FPIC = $(LIBDRMSCLIENT_FPIC) $(LIBDBCLIENT_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
   ALL_LIBS_PY_FPIC = $(LIBDRMS_SERVER_FPIC) $(LIBDB_SERVER_FPIC) $(LIBCMDPARAMS_FPIC) $(LIBTHREADUTIL_FPIC) $(LIBRICECOMP_FPIC) $(LIBDEFS_FPIC) $(LIBMISC_FPIC) $(LIBDSTRUCT_FPIC) $(LIBTIMEIO_FPIC) $(LIBFITSRW_FPIC)
  
 ### Standard parts ### Standard parts
 # #
Line 295  include $(SRCDIR)/Rules.mk
Line 399  include $(SRCDIR)/Rules.mk
  
 # Libraries from src/util linked with all programs. # Libraries from src/util linked with all programs.
 ifneq ($(COMPILER), icc) ifneq ($(COMPILER), icc)
   SYSLIBS = -lz -ldl -lpthread -lm    SYSLIBS = -lz -ldl -lpthread -lm -lutil
 else else
   SYSLIBS = -lz -ldl -lpthread    SYSLIBS = -lz -ldl -lpthread -lutil
 endif endif
 SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)  SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBEXPDRMS) $(LIBEXPUTL) $(LIBMISC) $(LIBDSTRUCT) $(LIBSTATS)
 FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBMISC) $(LIBDSTRUCT)  FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) $(LIBEXPDRMS) $(LIBEXPUTL) $(LIBMISC) $(LIBDSTRUCT) $(LIBSTATS)
  
 ########## Libraries to link for server executables,    ############## ########## Libraries to link for server executables,    ##############
 ########## standalone executables and pipeline modules. ############## ########## standalone executables and pipeline modules. ##############
  
 # SERVERLIBS: Libraries linked with "server" programs that # SERVERLIBS: Libraries linked with "server" programs that
 # need direct access to the DRMS databases. # need direct access to the DRMS databases.
 SERVERLIBS = $(LIBDRMS) $(LIBDEFSSERVER) $(LIBDB) $(LIBSUMSAPI) $(SRCLIBS)  SERVERLIBS = $(LIBDRMS) $(LIBDEFSSERVER) $(LIBDB) $(LIBSUMSAPI) $(LIBCJSON) $(SRCLIBS)
  
 # EXELIBS: Libraries linked with standalone executables. # EXELIBS: Libraries linked with standalone executables.
 EXELIBS = $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(SRCLIBS) EXELIBS = $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(SRCLIBS)
Line 316  EXELIBS = $(LIBDRMSCLIENT) $(LIBDEFSCLIE
Line 420  EXELIBS = $(LIBDRMSCLIENT) $(LIBDEFSCLIE
 MODLIBS = $(LIBJSOC_MAIN) $(SERVERLIBS) MODLIBS = $(LIBJSOC_MAIN) $(SERVERLIBS)
  
 # MODLIBS_SOCK: Libraries linked with DRMS modules with socket connection to a drms_server # MODLIBS_SOCK: Libraries linked with DRMS modules with socket connection to a drms_server
 MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(LIBSUMSAPI) $(SRCLIBS)  MODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(LIBSUMSAPI) $(LIBCJSON) $(SRCLIBS)
  
 # FMODLIBS: Libraries linked with DRMS Fortran modules # FMODLIBS: Libraries linked with DRMS Fortran modules
 FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS) FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $(LIBINTHANDLESF) $(LIBDRMSCLIENT) $(LIBDEFSCLIENT) $(LIBDBCLIENT) $(FSRCLIBS)
Line 328  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
Line 432  FMODLIBS_SOCK = $(LIBJSOC_MAIN_SOCK_F) $
 # PROJECT MAKE RULES # PROJECT MAKE RULES
 # #
 # Make rules that apply to all projects outside of the base DRMS/SUMS system # Make rules that apply to all projects outside of the base DRMS/SUMS system
 -include $(SRCDIR)/proj/make_basic.mk  -include $(SRCDIR)/$(LOCALIZATIONDIR)/make_basic.mk
 #***********************************************************************************************# #***********************************************************************************************#
  
  
Line 355  $(MODEXE): %: %.o $(MODLIBS)
Line 459  $(MODEXE): %: %.o $(MODLIBS)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
  
 $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS)  $(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(LINK)                         $(LINK)
                         $(SLBIN)                         $(SLBIN)
 # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file. # FMODEXE_SOCK contains all Fortran modules - the DoIt() function is defined inside a .f file.
 # These are socket-connect modules only. Assume they use third-party Fortran libraries # These are socket-connect modules only. Assume they use third-party Fortran libraries
 # (although this may not be the case). # (although this may not be the case).
 $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(CFITSIOLIBS)  $(FMODEXE_SOCK):        LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK) $(FMODEXE_SOCK):     %_sock:    %.o $(FMODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
Line 373  $(MODEXE_USEF): %: %.o $(MODLIBS)
Line 477  $(MODEXE_USEF): %: %.o $(MODLIBS)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)
 # MODEXE_USEF contains all C socket-connect modules that use third-party Fortran libraries. # MODEXE_USEF contains all C socket-connect modules that use third-party Fortran libraries.
 $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(CFITSIOLIBS)  $(MODEXE_USEF_SOCK):    LL_TGT := $(LL_TGT) $(PGLIBS) $(CFITSIOLIBS)
 $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK) $(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK)
                         $(FLINK)                         $(FLINK)
                         $(SLBIN)                         $(SLBIN)


Legend:
Removed from v.1.56  
changed lines
  Added in v.1.93

Karen Tian
Powered by
ViewCVS 0.9.4