Fork me on GitHub

Changeset cdbca0d in git for Makefile


Ignore:
Timestamp:
Aug 10, 2018, 9:31:31 AM (6 years ago)
Author:
Pavel Demin <pavel-demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
01f9722
Parents:
c473838
Message:

fix formatting in genMakefile.tcl and Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    rc473838 rcdbca0d  
    3232endif
    3333
    34 
    3534# check consistency
    3635ifneq ($(PROMC),)
    37   ifneq ($(PROIO),)
    38   $(error Attention:  PROMC and PROIO env. variables are set simultaneously. You cannot compile ProMC and ProIO readers in one compilation process due to an inconsistency in protocol buffers libraries. The suggestion is to compile these two readers in two steps. First unset PROIO variable and then \"configure; make\". After this, unset PROMC, set PROIO,  and run \"configure; make\". During runs, make sure shared libraries are set correctly. )
    39   endif
    40 endif
    41 
     36ifneq ($(PROIO),)
     37$(error Attention:  PROMC and PROIO env. variables are set simultaneously. You cannot compile ProMC and ProIO readers in one compilation process due to an inconsistency in protocol buffers libraries. The suggestion is to compile these two readers in two steps. First unset PROIO variable and then \"configure; make\". After this, unset PROMC, set PROIO,  and run \"configure; make\". During runs, make sure shared libraries are set correctly.)
     38endif
     39endif
    4240
    4341ifneq ($(PROMC),)
     
    5149HAS_PROIO = true
    5250$(info ProIO reader is requested)
    53        ifeq ($(PROTOBUF),)
    54        $(error but PROTOBUF variable is not set.)
    55        endif
    56 
    57        PROTOBUF_FILE=$(PROTOBUF)/lib/libprotobuf.a
    58        ifeq ("$(wildcard $(PROTOBUF_FILE))","")
    59           $(error PROTOBUF variable is set, but it does not point to valid $(PROTOBUF_FILE))
    60        endif
    61 
    62        ifeq ($(LZ4),)
    63             $(error but LZ4 variable is not set.)                       
    64        endif
    65        LZ4_FILE=$(LZ4)/lib/liblz4.so
    66        ifeq ("$(wildcard $(LZ4_FILE))","")
    67             $(error LZ4 variable is set,  but it  does not point to valid $(LZ4_FILE))
    68        endif
    69 
    70 
     51ifeq ($(PROTOBUF),)
     52$(error but PROTOBUF variable is not set.)
     53endif
     54PROTOBUF_FILE=$(PROTOBUF)/lib/libprotobuf.a
     55ifeq ("$(wildcard $(PROTOBUF_FILE))","")
     56$(error PROTOBUF variable is set, but it does not point to valid $(PROTOBUF_FILE))
     57endif
     58ifeq ($(LZ4),)
     59$(error but LZ4 variable is not set.)
     60endif
     61LZ4_FILE=$(LZ4)/lib/liblz4.so
     62ifeq ("$(wildcard $(LZ4_FILE))","")
     63$(error LZ4 variable is set,  but it does not point to valid $(LZ4_FILE))
     64endif
    7165CXXFLAGS += -I$(PROIO)/include -I$(PROTOBUF)/include -I$(LZ4)/include -I$(PROIO)/src
    72 OPT_LIBS += -L$(PROTOBUF)/lib -lprotobuf -L$(PROIO)/lib -lproio -lproio.pb -lz -L$(LZ4)/lib -llz4 
     66OPT_LIBS += -L$(PROTOBUF)/lib -lprotobuf -L$(PROIO)/lib -lproio -lproio.pb -lz -L$(LZ4)/lib -llz4
    7367endif
    7468
Note: See TracChangeset for help on using the changeset viewer.