version 1.17, 2008/04/18 21:25:32
|
version 1.20, 2008/05/20 17:19:20
|
Line 6 DBNAME = POSTGRESQL |
|
Line 6 DBNAME = POSTGRESQL |
|
PGIPATH = /usr/include/pgsql | PGIPATH = /usr/include/pgsql |
| |
| |
COMPILER = gcc |
COMPILER = icc |
| |
# Check for debug vs. release build - release is default. | # Check for debug vs. release build - release is default. |
# To do a debug build, either set the environment variable JSOC_DEBUG to 1, OR | # To do a debug build, either set the environment variable JSOC_DEBUG to 1, OR |
# modify the following line so that DEBUG = 1. The environment variable takes precedence. | # modify the following line so that DEBUG = 1. The environment variable takes precedence. |
DEBUG = 1 |
DEBUG = 0 |
| |
ifdef JSOC_DEBUG | ifdef JSOC_DEBUG |
ifeq ($(JSOC_DEBUG), 1) | ifeq ($(JSOC_DEBUG), 1) |
Line 205 ifneq ($(COMPILER), icc) |
|
Line 205 ifneq ($(COMPILER), icc) |
|
else | else |
SYSLIBS = -lz -ldl -lpthread | SYSLIBS = -lz -ldl -lpthread |
endif | endif |
SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) |
SRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMS) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) |
FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) |
FSRCLIBS = $(LIBTHREADUTIL) $(LIBRICECOMP) $(LIBCMDPARAMSF) $(LIBMISC) $(LIBDSTRUCT) $(LIBTIMEIO) $(LIBFITSRW) $(LIBERRLOG) |
| |
########## Libraries to link for server executables, ############## | ########## Libraries to link for server executables, ############## |
########## standalone executables and pipeline modules. ############## | ########## standalone executables and pipeline modules. ############## |
Line 260 $(FMODEXE): LL_TGT := $(LL_TGT) $(CFITSI |
|
Line 260 $(FMODEXE): LL_TGT := $(LL_TGT) $(CFITSI |
|
$(FMODEXE): %_sock: %.o $(FMODLIBS_SOCK) | $(FMODEXE): %_sock: %.o $(FMODLIBS_SOCK) |
$(FLINK) | $(FLINK) |
$(SLBIN) | $(SLBIN) |
|
|
|
$(MODEXE_USEF): LL_TGT := $(LL_TGT) -lpq $(CFITSIOLIBS) |
|
$(MODEXE_USEF): %: %.o $(MODLIBS) |
|
$(FLINK) |
|
$(SLBIN) |
|
|
|
$(MODEXE_USEF_SOCK): LL_TGT := $(LL_TGT) $(CFITSIOLIBS) |
|
$(MODEXE_USEF_SOCK): %_sock: %.o $(MODLIBS_SOCK) |
|
$(FLINK) |
|
$(SLBIN) |