From c78c16870ec27b9129bfa9efbe21333ba662598c Mon Sep 17 00:00:00 2001 From: olpc user Date: Tue, 31 Dec 2019 14:54:00 -0800 Subject: although level2 is broken, I'm merging to put friend on trunk, helps me understand i am preserving them --- starts/meaning-vm/makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'starts/meaning-vm/makefile') diff --git a/starts/meaning-vm/makefile b/starts/meaning-vm/makefile index 6e03081..143a9b3 100644 --- a/starts/meaning-vm/makefile +++ b/starts/meaning-vm/makefile @@ -13,17 +13,15 @@ liblevel2.a: $(patsubst %.cpp,%.o,$(wildcard level-0/*.cpp)) $(patsubst %.cpp,%. habit-starts/rhythm: habit-starts/rhythm.o liblevel2.a --include $(patsubst %.cpp,%.d,$(wildcard level-0/*.cpp) $(wildcard level-1/*.cpp) $(wildcrd level-2/*.cpp) $(wildcard level*.cpp)) - -%.o: %.ii +%.o: %.ii %.cpp $(CXX) $(CXXFLAGS) -c $*.ii -o $*.o -%.ii %.d: %.cpp - $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MMD -MQ $*.ii -E $*.cpp -o $*.ii +%.d: %.cpp + @$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MF $*.d -MT "$*.ii $*.o $*.d" -E $*.cpp +%.ii: %.cpp + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -E $*.cpp -o $*.ii .INTERMEDIATE: $(patsubst %.cpp,%.ii,$(wildcard */*.cpp) $(wildcard *.cpp)) -level-0/%.ii: $(wildcard level-0/*.hpp) -level-1/%.ii: $(wildcard level-0/*.hpp) $(wildcard level-1/*.hpp) -level-2/%.ii: $(wildcard level-0/*.hpp) $(wildcard level-1/*.hpp) $(wildcard level-2/*.hpp) +-include $(patsubst %.cpp,%.d,$(wildcard level-0/*.cpp) $(wildcard level-1/*.cpp) $(wildcard level-2/*.cpp) $(wildcard level*.cpp)) %.a: ar cr $@ $^ -- cgit v1.2.3