Added parameters for dict folder, write folder and read folder. ROOT files and JSON files are now written directly in designated folders.

DICT_DIR, WRITE_DIR and READ_DIR always end with '/', so that inner Makefiles can be run individually.

Adjusted DICT_DIR, WRITE_DIR and READ_DIR to always end with '/', so that inner Makefiles can be run individually

Author: undefined-panda

Makefile

@@ -3,21 +3,17 @@ ifeq ($(ROOT_EXE),)
 $(error Could not find root.exe)
 endif
 
-define move_files
-    mkdir -p $(1)_files && \
-    find . -name "*.$(1)" -not -path "./$(1)_files/*" -exec mv {} "$(1)_files" \;
-endef
-
-ver :=
-DICT_DIR := $(shell pwd)/dict/$(ver)/
+# directory arguments can be empty -> no sudirectories will be created, everything will be stored directly in those folders
+DICT_DIR := $(shell pwd)/dict/$(if $(dict_dir),$(dict_dir)/)
+WRITE_DIR := $(shell pwd)/write/$(if $(write_dir),$(write_dir)/)
+READ_DIR := $(shell pwd)/read/$(if $(write_dir),$(write_dir)/)$(if $(read_dir),$(read_dir)/)
 export DICT_DIR
 
 .PHONY: all
 all:
 	$(MAKE) dict
 	$(MAKE) write
 	$(MAKE) read
-	$(MAKE) store
 
 # This assumes there is no whitespace in any of the paths...
 DICT_MAKEFILE_DIR := $(sort $(shell find */ -name Makefile -printf "%h\n"))
@@ -34,15 +30,17 @@ $(DICT_DIR)::
 
 .PHONY: write
 write:: $(WRITE_C)
-$(WRITE_C)::
-	@LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(or $(DICT_DIR),$(shell dirname $@))" $(ROOT_EXE) -q -l $@
+$(WRITE_C):: $(WRITE_DIR)
+	@LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(DICT_DIR)" $(ROOT_EXE) -q -l '$@("$(WRITE_DIR)$(subst /,.,$(shell dirname $@)).root")'
+$(WRITE_DIR)::
+	@mkdir -p $@
+	$(info Storing root files in: '$@')
 
 .PHONY: read
 read:: $(READ_C)
-$(READ_C)::
-	@LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(or $(DICT_DIR),$(shell dirname $@))" $(ROOT_EXE) -q -l $@
-
-.PHONY: store
-store:
-	@$(call move_files,root)
-	@$(call move_files,json)
+$(READ_C):: $(READ_DIR)
+	@LD_LIBRARY_PATH="$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(DICT_DIR)" $(ROOT_EXE) -q -l \
+	'$@("$(WRITE_DIR)/$(subst /,.,$(shell dirname $@)).root", "$(READ_DIR)$(subst /,.,$(shell dirname $@)).json")'
+$(READ_DIR)::
+	@mkdir -p $@
+	$(info Storing root files in: '$@')

types/map/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedMap.cxx: NestedMap.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^ 
 
 $(DICT_DIR)libNestedMap.so: $(DICT_DIR)NestedMap.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedMap.cxx NestedMap_rdict.pcm libNestedMap.so

types/multimap/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedMultimap.cxx: NestedMultimap.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedMultimap.so: $(DICT_DIR)NestedMultimap.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedMultimap.cxx NestedMultimap_rdict.pcm libNestedMultimap.so

types/multiset/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedMultiset.cxx: NestedMultiset.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedMultiset.so: $(DICT_DIR)NestedMultiset.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedMultiset.cxx NestedMultiset_rdict.pcm libNestedMultiset.so

types/set/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedSet.cxx: NestedSet.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedSet.so: $(DICT_DIR)NestedSet.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedSet.cxx NestedSet_rdict.pcm libNestedSet.so

types/unordered_map/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedUnorderedMap.cxx: NestedUnorderedMap.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedUnorderedMap.so: $(DICT_DIR)NestedUnorderedMap.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedUnorderedMap.cxx NestedUnorderedMap_rdict.pcm libNestedUnorderedMap.so

types/unordered_multimap/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedUnorderedMultimap.cxx: NestedUnorderedMultimap.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedUnorderedMultimap.so: $(DICT_DIR)NestedUnorderedMultimap.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedUnorderedMultimap.cxx NestedUnorderedMultimap_rdict.pcm libNestedUnorderedMultimap.so

types/unordered_multiset/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedUnorderedMultiset.cxx: NestedUnorderedMultiset.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedUnorderedMultiset.so: $(DICT_DIR)NestedUnorderedMultiset.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedUnorderedMultiset.cxx NestedUnorderedMultiset_rdict.pcm libNestedUnorderedMultiset.so

types/unordered_set/nested/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)NestedUnorderedSet.cxx: NestedUnorderedSet.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libNestedUnorderedSet.so: $(DICT_DIR)NestedUnorderedSet.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) NestedUnorderedSet.cxx NestedUnorderedSet_rdict.pcm libNestedUnorderedSet.so

types/user/class/Makefile

@@ -20,7 +20,7 @@ $(DICT_DIR)UserClass.cxx: UserClass.hxx LinkDef.h
 	$(ROOTCLING) -f $@ $^
 
 $(DICT_DIR)libUserClass.so: $(DICT_DIR)UserClass.cxx
-	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I $$(pwd)
+	$(CXX) -shared -fPIC -o $@ $^ $(CXXFLAGS) $(LDFLAGS) -I .
 
 clean:
 	$(RM) UserClass.cxx UserClass_rdict.pcm libUserClass.so