Commit 9a0c13fe authored by Andrea Bignamini's avatar Andrea Bignamini
Browse files

Merge tag 'v1.1.1' into devel 

v1.1.1
parents 8ab5a0e9 f5eb9230

Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ CXX_RELEASE_FLAGS=-O3 
CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x

CXX_DEFAULT_FLAGS=-c -Wall -Wextra -std=c++0x

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

LDFLAGS=-Wall -lomniORB4 -lomniDynamic4 -lCOS4 -lomnithread -ltango -llog4tango \

	-lsoci_core -lsoci_mysql -lCCfits -lboost_thread -lboost_filesystem \

	-lsoci_core -lsoci_mysql -lCCfits -lboost_thread -lboost_filesystem \

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex -lssl

	-lboost_system -lboost_iostreams -lboost_date_time -lboost_regex -lssl -lcrypto

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

INC_PARM=$(foreach d, $(INC_DIR), -I$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

LIB_PARM=$(foreach d, $(LIB_DIR), -L$d)

#================================================================================

#================================================================================