|
version 1.10, 2008/03/05 15:56:13
|
version 1.11, 2008/03/10 18:19:13
|
| Line 65 ifeq ($(COMPILER), icc) |
|
| Line 65 ifeq ($(COMPILER), icc) |
|
| | |
| # All 3rd-party math libraries - local rules can define a subset | # All 3rd-party math libraries - local rules can define a subset |
| FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio | FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |
| |
CFITSIOLIBS = $(CFITSIOL) -lcfitsio |
| else | else |
| # FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio | # FMATHLIBS = -lmkl_lapack -lmkl -L$(_JSOCROOT_)/lib_third_party/lib/linux-ia32/ -lfftw3f -lcfitsio |
| # Path to 32-bit 3rd-party libraries | # Path to 32-bit 3rd-party libraries |
| Line 73 ifeq ($(COMPILER), icc) |
|
| Line 74 ifeq ($(COMPILER), icc) |
|
| | |
| # All 3rd-party math libraries - local rules can define a subset | # All 3rd-party math libraries - local rules can define a subset |
| FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio | FMATHLIBS = $(FMATHLIBSL) -lfftw3f -lcfitsio |
| |
CFITSIOLIBS = $(CFITSIOL) -lcfitsio |
| endif | endif |
| endif | endif |
| | |
| Line 225 $(FEXE): %: %.o $(MATHLIBS) |
|
| Line 227 $(FEXE): %: %.o $(MATHLIBS) |
|
| $(FLINK) | $(FLINK) |
| $(SLBIN) | $(SLBIN) |
| | |
| $(SERVEREXE): LL_TGT := $(LL_TGT) -lpq |
$(SERVEREXE): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS) |
| $(SERVEREXE): %: %.o $(SERVERLIBS) | $(SERVEREXE): %: %.o $(SERVERLIBS) |
| $(LINK) | $(LINK) |
| $(SLBIN) | $(SLBIN) |
| | |
| $(MODEXE): LL_TGT := $(LL_TGT) -lpq |
$(MODEXE): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS) |
| $(MODEXE): %: %.o $(MODLIBS) | $(MODEXE): %: %.o $(MODLIBS) |
| $(LINK) | $(LINK) |
| $(SLBIN) | $(SLBIN) |
| | |
| |
$(MODEXE_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS) |
| $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) | $(MODEXE_SOCK): %_sock: %.o $(MODLIBS_SOCK) |
| $(LINK) | $(LINK) |
| $(SLBIN) | $(SLBIN) |
| | |
| |
$(FMODEXE): LL_TGT := $(LL_TGT) $(CFITSIOLIBS) |
| $(FMODEXE): %_sock: %.o $(FMODLIBS_SOCK) | $(FMODEXE): %_sock: %.o $(FMODLIBS_SOCK) |
| $(FLINK) | $(FLINK) |
| $(SLBIN) | $(SLBIN) |
Return to
make_basic.mk
CVS log
Up to [Development] / JSOC