Include Cryptogams objects in clean recipe (GH #998)

weidai11 · Jan 1, 2021 · ae20711 · ae20711
1 parent 50c261c
commit ae20711
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -1169,7 +1169,8 @@ TESTIMPORTOBJS := $(TESTOBJS:.o=.import.o)
 DLLTESTOBJS := dlltest.dllonly.o
 
 # Clean recipe, Issue 998. Don't filter-out some artifacts from the list of objects
-CLEAN_SRCS := $(wildcard *.cpp)
+# The *.S is a hack. It makes the ASM appear like C++ so the object files make the CLEAN_OBJS list 
+CLEAN_SRCS := $(wildcard *.cpp) $(patsubst %.S,%.cpp,$(wildcard *.S))
 CLEAN_OBJS := $(CLEAN_SRCS:.cpp=.o) $(CLEAN_SRCS:.cpp=.import.o) $(CLEAN_SRCS:.cpp=.export.o)
 
 ###########################################################

diff --git a/GNUmakefile-cross b/GNUmakefile-cross
@@ -677,7 +677,8 @@ TESTOBJS := $(TESTSRCS:.cpp=.o)
 LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
 
 # Clean recipe, Issue 998. Don't filter-out some artifacts from the list of objects
-CLEAN_SRCS := $(wildcard *.cpp)
+# The *.S is a hack. It makes the ASM appear like C++ so the object files make the CLEAN_OBJS list 
+CLEAN_SRCS := $(wildcard *.cpp) $(patsubst %.S,%.cpp,$(wildcard *.S))
 CLEAN_OBJS := $(CLEAN_SRCS:.cpp=.o) $(CLEAN_SRCS:.cpp=.import.o) $(CLEAN_SRCS:.cpp=.export.o)
 
 # For Shared Objects, Diff, Dist/Zip rules