From 234fdda8837b32c6acbb458d3acdafb0d6ffdcfb Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 3 Sep 2014 23:22:11 +0200 Subject: [PATCH] fix makefiles and revised master makefile --- acat2/makefile | 8 ++++---- aconvert2/makefile | 4 ++-- adeterminize2/makefile | 4 ++-- adiff2/makefile | 4 ++-- aepsilon2/makefile | 4 ++-- aminimize2/makefile | 4 ++-- anormalize2/makefile | 4 ++-- arand2/makefile | 4 ++-- atrim2/makefile | 4 ++-- makefile | 26 ++++++++++++-------------- 10 files changed, 32 insertions(+), 34 deletions(-) diff --git a/acat2/makefile b/acat2/makefile index 4195cb0693..d6e4d02f16 100644 --- a/acat2/makefile +++ b/acat2/makefile @@ -20,7 +20,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -39,7 +39,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ @@ -75,7 +75,7 @@ test-bin/$(TESTBIN): test-obj/ bin/$(EXECUTABLE) $(TEST_OBJECTS) test-obj/makefile: mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -94,7 +94,7 @@ test-obj/makefile: echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)test-obj/\$$(SRCDIR)%.d,../\$$(DEPTH)test-src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/aconvert2/makefile b/aconvert2/makefile index e531a97aea..6a5314fdd0 100644 --- a/aconvert2/makefile +++ b/aconvert2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/adeterminize2/makefile b/adeterminize2/makefile index e972c74ff4..3938bd1f31 100644 --- a/adeterminize2/makefile +++ b/adeterminize2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/adiff2/makefile b/adiff2/makefile index 350382614e..642ce40815 100644 --- a/adiff2/makefile +++ b/adiff2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/aepsilon2/makefile b/aepsilon2/makefile index 0ae3f4208e..a27207f150 100644 --- a/aepsilon2/makefile +++ b/aepsilon2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/aminimize2/makefile b/aminimize2/makefile index 076ce8784b..e0b982c6f8 100644 --- a/aminimize2/makefile +++ b/aminimize2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/anormalize2/makefile b/anormalize2/makefile index 1171e3d55d..6c93eb7afe 100644 --- a/anormalize2/makefile +++ b/anormalize2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/arand2/makefile b/arand2/makefile index 96efdd1172..41eec9290c 100644 --- a/arand2/makefile +++ b/arand2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/atrim2/makefile b/atrim2/makefile index f6d429ad3b..54ff5a10e8 100644 --- a/atrim2/makefile +++ b/atrim2/makefile @@ -17,7 +17,7 @@ bin/$(EXECUTABLE): obj/ $(OBJECTS) obj/makefile: makefile mkdir -p $(dir $@) - echo "SHELL:=/bin/bash" >> $@ + echo "SHELL:=/bin/bash" > $@ echo "SRCDIR:=" >> $@ echo "DEPTH:=" >> $@ echo "" >> $@ @@ -36,7 +36,7 @@ obj/makefile: makefile echo "all: \$$(OBJECTS_DIRS) \$$(OBJECTS)" >> $@ echo "" >> $@ echo "%.d:" >> $@ - echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" >> \$$@" >> $@ + echo " @echo \"\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\") = \\$$\$$(shell (\\$$\$$(CXX) -MM \\$$\$$(CXXFLAGS) \$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) 2>/dev/null || echo \\\"\$$(patsubst ../\$$(DEPTH)obj/\$$(SRCDIR)%.d,../\$$(DEPTH)src/\$$(SRCDIR)%.cpp, \$$@) FORCE\\\") | sed \\\"s/.*://g;s/\\\\\\\\\\\\\\\\//g\\\")\" > \$$@" >> $@ echo " @echo \"\$$(patsubst %.d,%.o, \$$@): \\$$\$$(\$$(shell sha1sum <<< \"\$$@\" | sed \"s/ -//g\"))\" >> \$$@" >> $@ echo " @echo \" \\$$\$$(CXX) \\$$\$$(CXXFLAGS) \\$$\$$< -o \$$(patsubst %.d,%.o, \$$@)\" >> \$$@" >> $@ echo "" >> $@ diff --git a/makefile b/makefile index 5ac98ba644..0a0236cb26 100644 --- a/makefile +++ b/makefile @@ -2,20 +2,18 @@ APPPATH = /usr/bin LIBPATH = /usr/lib BINFOLDER = bin -CORE_LIB = alib -SUBDIRS_LIBS = libaregexptree -SUBDIRS_BINS = acat \ - aconvert aconvert.dot aconvert.gastex aconvert.regexp aconvert.automaton aconvert.grammar \ - aminimize \ - adeterminize \ - adiff adiff.automaton adiff.grammar \ - aepsilon \ - atrim \ - anormalize \ - aconversions \ - aderivation aintegral \ - aoptimize.regexp \ - arand +CORE_LIB = alib2data +SUBDIRS_LIBS = alib2algo +SUBDIRS_BINS = acat2 \ + aconvert2 \ + adeterminize2 \ + adiff2 \ + aepsilon2 \ + aminimize2 \ + anormalize2 \ + arand2 \ + atrim2 \ + SUBDIRS_WITH_MAKE = $(dir $(wildcard */makefile)) .PHONY: $(CORE_LIB) $(SUBDIRS_LIBS) $(SUBDIRS_BINS) -- GitLab