[Testsuite] Get rid of most of the recursive shared library Makefiles

Most of the secondary Makefiles we have are just a couple variable
definitions and then an include of Makefile.rules. This patch removes
most of the secondary Makefiles and replaces them with a direct
invocation of Makefile.rules in the main Makefile. The specificities
of each sub-build are listed right there on the recursive $(MAKE)
call. All the variables that matter are being passed automagically by
make as they have been passed on the command line. The only things you
need to specify are the variables customizating the Makefile.rules
logic for each image.

This patch also removes most of the clean logic from those Makefiles
and from Makefile.rules. The clean rule is not required anymore now
that we run the testsuite in a separate build directory that is wiped
with each run. The patch leaves a very crude version of clean in
Makefile.rules which removes everything inside of $(BUILDDIR). It does
this only when the $(BUILDDIR) looks like a sub-directory of our
standard testsuite build directory to be extra safe.

Reviewers: aprantl, labath

Subscribers: lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D68558

llvm-svn: 374076

4 files changed, 5 insertions, 22 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile
index af03cf6ff5d..ad37346bbeb 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile
@@ -5,9 +5,7 @@ C_SOURCES := main.c
 all: a.out create-empty-corefile
 
 create-empty-corefile:
-	$(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/create-empty-corefile.mk
-
-clean::
-	$(MAKE) -f create-empty-corefile.mk clean
+	$(MAKE) -f $(MAKEFILE_RULES) EXE=create-empty-corefile \
+		C_SOURCES=create-empty-corefile.c
 
 include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk
deleted file mode 100644
index 4967e956679..00000000000
--- a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-MAKE_DSYM := NO
-
-CXX_SOURCES := create-empty-corefile.cpp
-EXE = create-empty-corefile
-
-include Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile
index f035d912b10..286c77452c5 100644
--- a/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/macabi/Makefile
@@ -8,11 +8,8 @@ CFLAGS_EXTRAS := -target $(TRIPLE)
 
 all: libfoo.dylib a.out
 
-lib%.dylib: %.c
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) \
-		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
-		BASENAME=$(shell basename $< .c) \
-		TRIPLE=x86_64-apple-macosx10.15 SDKROOT=$(SDKROOT) \
-		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
+libfoo.dylib: foo.c \
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_ONLY=YES DYLIB_NAME=foo DYLIB_C_SOURCES=foo.c
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/macosx/macabi/dylib.mk b/lldb/packages/Python/lldbsuite/test/macosx/macabi/dylib.mk
deleted file mode 100644
index 6f2c17adbf0..00000000000
--- a/lldb/packages/Python/lldbsuite/test/macosx/macabi/dylib.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../make
-DYLIB_ONLY := YES
-DYLIB_NAME := $(BASENAME)
-DYLIB_C_SOURCES := $(DYLIB_NAME).c
-
-include $(LEVEL)/Makefile.rules