Update makefiles and README

MELALabs · Sep 16, 2022 · f3fd0b6 · f3fd0b6
1 parent b3e6259
commit f3fd0b6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/CandidateLOCaster/makefile b/CandidateLOCaster/makefile
@@ -60,10 +60,11 @@ SOURCESCC = $(wildcard $(SRCDIR)*.cc)
 SOURCESCXX = $(wildcard $(SRCDIR)*.cxx)
 OBJECTSPRIM = $(SOURCESCC:.cc=.o) $(SOURCESCXX:.cxx=.o)
 OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(OBJECTSPRIM))
+DEPS = $(OBJECTS:.o=.d)
 
 
 .PHONY: all help compile clean
-.SILENT: alldirs clean $(OBJECTS) $(LIBRULE)
+.SILENT: alldirs clean $(OBJECTS) $(DEPS) $(LIBRULE)
 
 all: $(OBJECTS) $(LIBRULE)
 
@@ -78,10 +79,10 @@ $(LIBRULE):	$(OBJECTS) | alldirs
 
 $(OBJDIR)%.d:	$(SRCDIR)%.c* | alldirs
 	echo "Checking dependencies for $<"; \
-	$(CXX) -MM -MT $@ -MT ${@:.d=.o} $(CXXFLAGS) $< > $@; \
+	$(CC) -MM -MT $@ $(CXXFLAGS) $< > $@; \
                      [ -s $@ ] || rm -f $@
 
-$(OBJDIR)%.o: 	$(SRCDIR)%.c* | alldirs
+$(OBJDIR)%.o: 	$(SRCDIR)%.c* $(OBJDIR)%.d | alldirs
 	echo "Compiling $<"; \
 	$(CXX) $(CXXFLAGS) $< -c -o $@ $(LIBS)
 
@@ -115,6 +116,8 @@ clean:
 	rm -f $(TESTDIR)*.pyc
 
 
+include $(DEPS)
+
 
 endif
 endif
diff --git a/EventContainer/makefile b/EventContainer/makefile
@@ -60,10 +60,11 @@ SOURCESCC = $(wildcard $(SRCDIR)*.cc)
 SOURCESCXX = $(wildcard $(SRCDIR)*.cxx)
 OBJECTSPRIM = $(SOURCESCC:.cc=.o) $(SOURCESCXX:.cxx=.o)
 OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(OBJECTSPRIM))
+DEPS = $(OBJECTS:.o=.d)
 
 
 .PHONY: all help compile clean
-.SILENT: alldirs clean $(OBJECTS) $(LIBRULE)
+.SILENT: alldirs clean $(OBJECTS) $(DEPS) $(LIBRULE)
 
 all: $(OBJECTS) $(LIBRULE)
 
@@ -78,10 +79,10 @@ $(LIBRULE):	$(OBJECTS) | alldirs
 
 $(OBJDIR)%.d:	$(SRCDIR)%.c* | alldirs
 	echo "Checking dependencies for $<"; \
-	$(CXX) -MM -MT $@ -MT ${@:.d=.o} $(CXXFLAGS) $< > $@; \
+	$(CC) -MM -MT $@ $(CXXFLAGS) $< > $@; \
                      [ -s $@ ] || rm -f $@
 
-$(OBJDIR)%.o: 	$(SRCDIR)%.c* | alldirs
+$(OBJDIR)%.o: 	$(SRCDIR)%.c* $(OBJDIR)%.d | alldirs
 	echo "Compiling $<"; \
 	$(CXX) $(CXXFLAGS) $< -c -o $@ $(LIBS)
 
@@ -115,6 +116,8 @@ clean:
 	rm -f $(TESTDIR)*.pyc
 
 
+include $(DEPS)
+
 
 endif
 endif
diff --git a/GenericMEComputer/makefile b/GenericMEComputer/makefile
@@ -59,10 +59,11 @@ SOURCESCC = $(wildcard $(SRCDIR)*.cc)
 SOURCESCXX = $(wildcard $(SRCDIR)*.cxx)
 OBJECTSPRIM = $(SOURCESCC:.cc=.o) $(SOURCESCXX:.cxx=.o)
 OBJECTS = $(subst $(SRCDIR),$(OBJDIR),$(OBJECTSPRIM))
+DEPS = $(OBJECTS:.o=.d)
 
 
 .PHONY: all help compile clean
-.SILENT: alldirs clean $(OBJECTS) $(LIBRULE)
+.SILENT: alldirs clean $(OBJECTS) $(DEPS) $(LIBRULE)
 
 all: $(OBJECTS) $(LIBRULE)
 
@@ -77,10 +78,10 @@ $(LIBRULE):	$(OBJECTS) | alldirs
 
 $(OBJDIR)%.d:	$(SRCDIR)%.c* | alldirs
 	echo "Checking dependencies for $<"; \
-	$(CXX) -MM -MT $@ -MT ${@:.d=.o} $(CXXFLAGS) $< > $@; \
+	$(CC) -MM -MT $@ $(CXXFLAGS) $< > $@; \
                      [ -s $@ ] || rm -f $@
 
-$(OBJDIR)%.o: 	$(SRCDIR)%.c* | alldirs
+$(OBJDIR)%.o: 	$(SRCDIR)%.c* $(OBJDIR)%.d | alldirs
 	echo "Compiling $<"; \
 	$(CXX) $(CXXFLAGS) $< -c -o $@ $(LIBS)
 
@@ -114,6 +115,8 @@ clean:
 	rm -f $(TESTDIR)*.pyc
 
 
+include $(DEPS)
+
 
 endif
 endif
diff --git a/README.md b/README.md
@@ -7,30 +7,20 @@
 - The CandidateLOCaster package allows the user to cast some topologies NLO in QCD into those LO in QCD by merging gluons into quarks appropriately.
 	It is a pretty good approxiamtion for EW processes, but does not provide a good enough description for QCD processes themselves.
 
-## Checkout instructions
+## Checkout and compilation instructions
 
 ### MELA
 
 ```
 git clone https://github.com/JHUGen/JHUGenMELA.git
-(cd JHUGenMELA; git checkout -b from-v235 v2.3.5; ./setup.sh -j;)
-# Last line could also use './setup.sh -j standalone' in order to force standalone computation.
+(cd JHUGenMELA; git checkout -b from-v238 v2.3.8; ./setup.sh -j;)
+eval $(./JHUGenMELA/setup.sh env)
 ```
 
 ### MELA Analytics
 
 ```
 git clone https://github.com/MELALabs/MelaAnalytics.git
-(cd MelaAnalytics; git checkout -b from-v22 v2.2)
-```
-
-## Compilation
-
-First, please follow the instructions on MELA core package to compile it. Assuming you already did that,
-
-- if you are using CMSSW, regular scram should work.
-- if you are not using CMSSW, each package contains its own makefile. You can simply do
-
-```
-make (-j #cores)
+(cd MelaAnalytics; git checkout -b from-v23 v2.3)
+eval $(./MelaAnalytics/setup.sh env)
 ```