Skip to content

Commit ae20711

Browse files
committed
Include Cryptogams objects in clean recipe (GH #998)
1 parent 50c261c commit ae20711

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

GNUmakefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,8 @@ TESTIMPORTOBJS := $(TESTOBJS:.o=.import.o)
11691169
DLLTESTOBJS := dlltest.dllonly.o
11701170

11711171
# Clean recipe, Issue 998. Don't filter-out some artifacts from the list of objects
1172-
CLEAN_SRCS := $(wildcard *.cpp)
1172+
# The *.S is a hack. It makes the ASM appear like C++ so the object files make the CLEAN_OBJS list
1173+
CLEAN_SRCS := $(wildcard *.cpp) $(patsubst %.S,%.cpp,$(wildcard *.S))
11731174
CLEAN_OBJS := $(CLEAN_SRCS:.cpp=.o) $(CLEAN_SRCS:.cpp=.import.o) $(CLEAN_SRCS:.cpp=.export.o)
11741175

11751176
###########################################################

GNUmakefile-cross

+2-1
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,8 @@ TESTOBJS := $(TESTSRCS:.cpp=.o)
677677
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
678678

679679
# Clean recipe, Issue 998. Don't filter-out some artifacts from the list of objects
680-
CLEAN_SRCS := $(wildcard *.cpp)
680+
# The *.S is a hack. It makes the ASM appear like C++ so the object files make the CLEAN_OBJS list
681+
CLEAN_SRCS := $(wildcard *.cpp) $(patsubst %.S,%.cpp,$(wildcard *.S))
681682
CLEAN_OBJS := $(CLEAN_SRCS:.cpp=.o) $(CLEAN_SRCS:.cpp=.import.o) $(CLEAN_SRCS:.cpp=.export.o)
682683

683684
# For Shared Objects, Diff, Dist/Zip rules

0 commit comments

Comments
 (0)