From e5d92bd7ee3cfb3f80ed6ab6f65f32f7015aa802 Mon Sep 17 00:00:00 2001
From: rulrich <ralf.m.ulrich@kit.edu>
Date: Sat, 11 Jul 2020 21:56:40 +0200
Subject: [PATCH] tabdir
---
Makefile | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index efab439..e6a9f44 100644
--- a/Makefile
+++ b/Makefile
@@ -129,13 +129,11 @@ ifeq ("$(SYSTEM)", "Darwin")
endif
BZ2=""
-INTERFACE_SOURCE := $(CORSIKA_DATA)/readLib/source/Interface.dummy.cc
+INTERFACE_SOURCE := $(TABDIR)/readLib/source/Interface.dummy.cc
OBJS += $(OBJDIR)/Interface.o
-ifdef CORSIKA_DATA
- ifndef NO_BOOST
- BZ2=".bz2"
- INTERFACE_SOURCE := $(CORSIKA_DATA)/readLib/source/Interface.boost.cc
- endif
+ifndef NO_BOOST
+ BZ2=".bz2"
+ INTERFACE_SOURCE := $(TABDIR)/readLib/source/Interface.boost.cc
endif
@@ -207,7 +205,7 @@ $(OBJDIR)/ConexDynamicInterface.o: dirs src/ConexDynamicInterface.cc src/ConexDy
# the optional compressed data reading
$(OBJDIR)/Interface.o: $(INTERFACE_SOURCE)
- $(CXX) -I$(CORSIKA_DATA)/readLib $(CXXFLAGS) $^ -c -o $@
+ $(CXX) -I$(TABDIR)/readLib $(CXXFLAGS) $^ -c -o $@
$(OBJDIR)/CxRoot.o: dirs src/CxRoot.cc src/CxRoot.h src/conexConfig.h src/leadingInteractionsData.cc src/leadingInteractionsData.h
$(CXX) $(CXXFLAGS) $(ROOTCXXFLAGS) -D_CONEX_PREFIX=\"$(CONEX_PREFIX)\" -D_CONEX_SYSTEM=\"$(SYSTEM)\" src/CxRoot.cc -c -o $@
--
GitLab