Index: lldb/trunk/packages/Python/lldbsuite/test/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/Makefile @@ -1,4 +1,3 @@ -LLDB_LEVEL := .. include $(LLDB_LEVEL)/Makefile .PHONY: programs Index: lldb/trunk/packages/Python/lldbsuite/test/android/platform/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/android/platform/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/android/platform/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/api/listeners/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/api/listeners/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/api/listeners/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - MAKE_DSYM := NO ENABLE_THREADS := YES CXX_SOURCES := multi-process-driver.cpp testprog.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/api/multiple-targets/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/api/multiple-targets/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/api/multiple-targets/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - MAKE_DSYM := NO ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/api/multithreaded/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) Index: lldb/trunk/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/arm/breakpoint-it/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS = -mthumb -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/arm/breakpoint-thumb-codesection/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS = -mthumb -include $(LEVEL)/Makefile.rules \ No newline at end of file +include Makefile.rules \ No newline at end of file Index: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/continue/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/libcxxlist/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/benchmarks/libcxxmap/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c a.c b.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/import/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/import/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/import/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile @@ -1,3 +1 @@ -LEVEL = ../../../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := lotta-signals.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := call-throws.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/char/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/char/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/char/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp other.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../../make # We don't have any standard include directories, so we can't # parse the test_common.h header we usually inject as it includes # system headers. @@ -7,4 +6,4 @@ CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXXFLAGS += -I $(SRCDIR)/root/usr/include/c++/include/ -I $(SRCDIR)/root/usr/include/ -nostdinc -nostdinc++ -nostdlib++ CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../make USE_LIBCPP := 1 CXXFLAGS += $(MANDATORY_CXXMODULE_BUILD_CFLAGS) CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Cocoa Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - default: a.out C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/macros/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/macros/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/macros/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp DEBUG_INFO_FLAG = -g3 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make OBJCXX_SOURCES := main.mm util.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := locking.c ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/options/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/options/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/options/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp foo.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation -framework CloudKit Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/test/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/test/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/test/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := wait-a-while.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp test.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: dummy Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := dummy.cpp EXE := dummy -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m foo.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXX_FLAGS_EXTRA := -finput-charset=UTF-8 -fextended-identifiers -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile @@ -1,7 +1,6 @@ -LEVEL = ../../../make CFLAGS_EXTRAS += -std=c99 LD_FLAGS := -dynamiclib -include $(LEVEL)/Makefile.rules +include Makefile.rules all: a.out dylib missing Index: lldb/trunk/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/language/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp other.cpp other-2.cpp C_SOURCES := somefunc.c -include $(LEVEL)/Makefile.rules +include Makefile.rules other-2.o: other-2.cpp $(CXX) $(CFLAGS_NO_DEBUG) -c $(SRCDIR)/other-2.cpp Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -g0 # No debug info. MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/select/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/frame/var/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/frame/var/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/frame/var/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/gui/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/gui/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/gui/basic/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/log/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/log/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/log/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES EXE := AttachResume -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp EXE := ProcessAttach -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile @@ -1,12 +1,10 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp EXE := AttachDenied all: AttachDenied sign -include $(LEVEL)/Makefile.rules +include Makefile.rules sign: entitlements.plist AttachDenied ifeq ($(OS),Darwin) Index: lldb/trunk/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/process/launch/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/process/launch/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/process/launch/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp #CXX_SOURCES := print-cwd.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -mmpx -fcheck-pointer-bounds -fuse-ld=bfd -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp a.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/settings/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/settings/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/settings/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/source/info/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/source/info/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/source/info/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp second.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/target/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/target/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/target/basic/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - # Example: # # C_SOURCES := b.c # EXE := b.out -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile @@ -1,11 +1,9 @@ -LEVEL := ../../../make - LIB_PREFIX := load_ LD_EXTRAS := -L. -l$(LIB_PREFIX)a CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: lib_a Index: lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk +++ lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LIB_PREFIX := load_ DYLIB_NAME := $(LIB_PREFIX)a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/driver/batch_mode/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/archives/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - C_SOURCES := main.c MAKE_DSYM := NO ARCHIVE_NAME := libfoo.a ARCHIVE_C_SOURCES := a.c b.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/asan/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=address -g -gcolumn-info -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/basic/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity-chain/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/activity/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/category/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/message/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/exact_match/subsystem/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity-chain/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/activity/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/category/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/message/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/filter/regex/subsystem/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/format/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/debug/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/darwin_log/source/info/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Accelerate \ No newline at end of file Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsindexpath/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 0 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/atomic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/bitset/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/forward_list/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/function/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/optional/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -std=c++17 -fno-exceptions Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/queue/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -std=c++11 -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/tuple/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp # Work around "exception specification in declaration does not match previous @@ -8,5 +6,5 @@ CFLAGS_EXTRAS += -fno-exceptions USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/variant/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -std=c++17 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -O0 Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CXXFLAGS := -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../../../make - CXX_SOURCES := main.cpp CXXFLAGS := -O0 USE_LIBSTDCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthtype/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/language_category_updates/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/parray/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/poarray/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/pyobjsynthprovider/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/type_summary_list_script/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c ifeq "$(OS)" "" @@ -15,4 +13,4 @@ MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/deleted-executable/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := pass-to-base.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp all: a.out secondprog -include $(LEVEL)/Makefile.rules +include Makefile.rules secondprog: $(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/secondprog.mk Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/exec/secondprog.mk @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := secondprog.cpp EXE = secondprog -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - all: a.c clean $(CC) -arch i386 -g -c $(SRCDIR)/a.c ar -q liba-i386.a a.o Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -fomit-frame-pointer -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - CXX_SOURCES := calling.cpp ifneq (,$(findstring icc,$(CC))) CXXFLAGS += -debug inline-debug-info endif -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile @@ -1,13 +1,11 @@ -LEVEL = ../../make - C_SOURCES := main.c all: a.out simple -include $(LEVEL)/Makefile.rules +include Makefile.rules simple: $(MAKE) VPATH=$(VPATH) -f $(SRCDIR)/simple.mk clean:: $(MAKE) -f $(SRCDIR)/simple.mk clean \ No newline at end of file Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/simple.mk @@ -1,6 +1,4 @@ -LEVEL = ../../make - C_SOURCES := simple.c EXE = simple -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile @@ -1,12 +1,10 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -l$(LIB_PREFIX)d CXX_SOURCES := main.cpp USE_LIBDL := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: lib_a lib_b lib_c lib_d hidden_lib_d install_name_tool Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk @@ -1,5 +1,3 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ LD_EXTRAS := -L. -l$(LIB_PREFIX)b @@ -8,7 +6,7 @@ DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules $(DYLIB_FILENAME): lib_b Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk @@ -1,9 +1,7 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)b DYLIB_CXX_SOURCES := b.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk @@ -1,9 +1,7 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)c DYLIB_CXX_SOURCES := c.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk @@ -1,5 +1,3 @@ -LEVEL := ../../make - LIB_PREFIX := loadunload_ DYLIB_EXECUTABLE_PATH := $(CURDIR) @@ -8,4 +6,4 @@ DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LIB_PREFIX := loadunload_ DYLIB_NAME := $(LIB_PREFIX)d DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_using_paths/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../make - CXX_SOURCES := main.cpp USE_LIBDL := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules all: hidden_lib a.out Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/load_using_paths/hidden/Makefile @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := loadunload DYLIB_CXX_SOURCES := d.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory-region/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules clean:: rm -rf $(wildcard *.o *.d *.dSYM) Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/cache/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/find/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/mtc/simple/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -framework AppKit -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - DYLIB_CXX_SOURCES := plugin.cpp DYLIB_NAME := plugin DYLIB_ONLY := YES MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/gcore/main.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/elf-core/thread_crash/main.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/pre_run_dylibs/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - DYLIB_NAME := unlikely_name DYLIB_CXX_SOURCES := foo.cpp CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_group/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/process_save_core/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/ptr_refs/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/recursion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/rerun/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/return-value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := call-func.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/set-data/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-abrt/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/stats_api/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - C_SOURCES := with-debug.c without-debug.c -include $(LEVEL)/Makefile.rules +include Makefile.rules without-debug.o: without-debug.c $(CC) $(CFLAGS_NO_DEBUG) -c $< Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/step_scripted/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq1/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/ambiguous_tail_call_seq2/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_call_site/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/disambiguate_tail_call_seq/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/inlining_and_tail_calls/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/sbapi_support/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_message/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/thread_step_out_or_return/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tail_call_frames/unambiguous_sequence/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules CXXFLAGS += -g -O1 -glldb Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/target-new-solib-notifications/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_var/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_var/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/target_var/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: globals.ll $(CC) $(CFLAGS) -g -c $^ -o globals.o Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXXFLAGS += -std=c++11 CXX_SOURCES := ParallelTask.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/backtrace_limit/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXXFLAGS += -std=c++11 CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp other.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/num_threads/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile @@ -1,4 +1,2 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/step_until/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break_plus_condition/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/basic/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/cpp_global_location/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/global_location/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/multiple/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/thread_leak/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tsan/thread_numbers/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=thread -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/tty/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/ubsan/basic/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=undefined -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/ubsan/user-expression/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS := -fsanitize=undefined -g -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/ehframe/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS ?= -g -fomit-frame-pointer -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS ?= -g -Os -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile @@ -1,3 +1 @@ -LEVEL = ../../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/functionalities/var_path/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/functionalities/var_path/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/var_path/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/issue_verification/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/issue_verification/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/issue_verification/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../make CXX_SOURCES := inline_rerun_inferior.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/array_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/blocks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -fblocks -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LD_EXTRAS := -L. -LOne -l$(LIB_PREFIX)One -LTwo -l$(LIB_PREFIX)Two C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: a.out: lib_One lib_Two Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/One.mk @@ -1,10 +1,8 @@ -LEVEL := ../../../make - DYLIB_NAME := One DYLIB_C_SOURCES := One.c OneConstant.c DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules OneConstant.o: OneConstant.c $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/Two.mk @@ -1,10 +1,8 @@ -LEVEL := ../../../make - DYLIB_NAME := Two DYLIB_C_SOURCES := Two.c TwoConstant.c DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules TwoConstant.o: TwoConstant.c $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c functions.c CFLAGS_EXTRAS += -O3 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/find_struct_type/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/forward/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c foo.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/function_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - C_SOURCES := main.c DYLIB_NAME := a DYLIB_C_SOURCES := a.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/local_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -O1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/modules/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/offsetof/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/recurse/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/recurse/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/recurse/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - C_SOURCES := test.c CFLAGS_EXTRAS += -O1 -D_FORTIFY_SOURCE=0 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/set_values/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - DYLIB_NAME := foo DYLIB_C_SOURCES := foo.c C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := foo DYLIB_C_SOURCES := foo.c C_SOURCES := main.c SPLIT_DEBUG_SYMBOLS = YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/step-target/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/step-target/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/step-target/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/stepping/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/strings/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c DYLIB_NAME := a @@ -7,4 +5,4 @@ ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/typedef/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/unicode/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/unicode/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/unicode/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -finput-charset=UTF-8 -fextended-identifiers -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/unions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/unions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/unions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/c/vla/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/c/vla/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/c/vla/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/auto/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := nested.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/breakpoint_in_member_func_w_non_primitive_params/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp a.cpp CFLAGS_EXTRAS = $(MANDATORY_CXXMODULE_BUILD_CFLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS :=-g -O0 -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/char8_t/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS_EXTRAS := -std=c++2a -fchar8_t -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/const_this/Makefile @@ -1,7 +1,6 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules cleanup: rm -f Makefile *.d Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value-same-basename/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := pass-to-base.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := exceptions.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/extern_c/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/frame-var-anon-unions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/function-template-parameter-pack/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/function_refs/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/gmodules-templates/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp # CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/gmodules/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - PCH_CXX_SOURCE = pch.h CXX_SOURCES = main.cpp CFLAGS_EXTRAS += $(MODULE_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp length.cpp a.cpp CFLAGS_LIMIT = -c $(CXXFLAGS) @@ -32,4 +30,4 @@ clean: OBJECTS += limit nolimit length_limit.o length_nolimit.o length_limit.dwo length_nolimit.dwo -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/inlines/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := inlines.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp derived.cpp base.cpp CFLAGS_EXTRAS += $(LIMIT_DEBUG_INFO_FLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/llvm-style/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules \ No newline at end of file +include Makefile.rules \ No newline at end of file Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/member-and-local-vars-with-same-name/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES = main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/modules-import/Makefile @@ -1,5 +1,4 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp CFLAGS_EXTRAS = $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(BUILDDIR)/include -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ns.cpp ns2.cpp ns3.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_conflicts/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../../make - LD_EXTRAS := -L. -l$(LIB_PREFIX)a -l$(LIB_PREFIX)b CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: a.out: lib_a lib_b Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/a.mk @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := a DYLIB_CXX_SOURCES := a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/namespace_definitions/b.mk @@ -1,7 +1,5 @@ -LEVEL := ../../../make - DYLIB_NAME := b DYLIB_CXX_SOURCES := b.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/offsetof/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES = a.cpp b.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules a.o: a.cpp $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operators/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp static-a.cpp static-b.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules \ No newline at end of file +include Makefile.rules \ No newline at end of file Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/std-function-step-into-callable/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 USE_LIBCPP := 1 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/symbols/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/template-function/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/template/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/template/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/template/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/this/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/trivial_abi/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unicode-literals/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 -std=c++11 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual-overload/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp CFLAGS := -g -O0 clean: OBJECTS+=$(wildcard main.d.*) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/mixed/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - CXX_SOURCES := foo.cpp C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := ivars-in-blocks.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - LD_EXTRAS = -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules all: a.out Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/Test/Test.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../make - DYLIB_NAME := Test DYLIB_ONLY := YES CFLAGS_EXTRAS = -I$(SRCDIR)/.. @@ -7,4 +5,4 @@ DYLIB_OBJC_SOURCES = Test/Test.m -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/conflicting-definition/TestExt/TestExt.mk @@ -1,5 +1,3 @@ -LEVEL = ../../../make - DYLIB_NAME := TestExt DYLIB_ONLY := YES CFLAGS_EXTRAS = -I$(SRCDIR)/.. @@ -7,4 +5,4 @@ DYLIB_OBJC_SOURCES = TestExt/TestExt.m -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/exceptions/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := Container DYLIB_OBJC_SOURCES := Container.m OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m my-base.m #OBJC_SOURCES := const-strings.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/global_ptrs/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - DYLIB_NAME := InternalDefiner DYLIB_OBJC_SOURCES := InternalDefiner.m OBJC_SOURCES := main.m LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CC ?= clang ifeq "$(ARCH)" "" ARCH = x86_64 @@ -25,4 +23,4 @@ clean:: rm -f myclass.o -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile @@ -1,6 +1,5 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-cache/Makefile @@ -1,3 +1,2 @@ -LEVEL = ../../../make OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m myModule.m -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - C_SOURCES := myModule.c OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS += $(MANDATORY_MODULE_BUILD_CFLAGS) -I$(PWD) Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/modules/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LD_EXTRAS = -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := class.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LD_EXTRAS = -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := dynamic-value.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := objc-ivar-offsets.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation @@ -12,4 +10,4 @@ rm -f a.out.stripped rm -rf a.out.stripped.dSYM -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m CFLAGS ?= -arch $(ARCH) -g -O2 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := static.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation @@ -13,4 +11,4 @@ rm -f a.out.stripped rm -rf $(wildcard *.dSYM) -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := static.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := stepping-tests.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := test.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := test.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := class.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/orderedset/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := blocked.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/ptr_refs/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules ifneq (,$(findstring arm,$(ARCH))) LD_EXTRAS = -framework Foundation -framework UIKit Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := Bar.m Foo.m main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/sample/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/sample/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/sample/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/self/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m LD_EXTRAS ?= -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objc/single-entry-dictionary/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - OBJC_SOURCES := main.m -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/class-name-clash/Makefile @@ -1,6 +1,5 @@ -LEVEL = ../../../make OBJCXX_SOURCES := main.mm myobject.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules CFLAGS_NO_DEBUG = ifeq "$(OS)" "Darwin" CFLAGS_NO_DEBUG += -arch $(ARCH) Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/cxx-bridged-po/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework CoreFoundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/hide-runtime-values/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - OBJCXX_SOURCES := main.mm LDFLAGS = $(CFLAGS) -lobjc -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/linux/add-symbols/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make CXX_SOURCES := main.cpp LD_EXTRAS += -Wl,--build-id=none @@ -10,4 +9,4 @@ clean:: $(RM) stripped.out -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/linux/mix-dwo-and-regular-objects/Makefile @@ -1,9 +1,7 @@ -LEVEL := ../../make - C_SOURCES := a.c b.c a.o: CFLAGS_EXTRAS += -gsplit-dwarf -include $(LEVEL)/Makefile.rules +include Makefile.rules .PHONY: clean clean:: Index: lldb/trunk/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/linux/sepdebugsymlink/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make C_SOURCES := main.c all: dirsymlink @@ -17,4 +16,4 @@ clean:: $(RM) -r dirreal dirsymlink -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp ENABLE_THREADS := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py +++ lldb/trunk/packages/Python/lldbsuite/test/lldbinline.py @@ -101,11 +101,6 @@ makefile = open(makefilePath, 'w+') - level = os.sep.join( - [".."] * len(self.mydir.split(os.sep))) + os.sep + "make" - - makefile.write("LEVEL = " + level + "\n") - for t in list(categories.keys()): line = t + " := " + " ".join(categories[t]) makefile.write(line + "\n") @@ -118,7 +113,7 @@ if ('CXX_SOURCES' in list(categories.keys())): makefile.write("CXXFLAGS += -std=c++11\n") - makefile.write("include $(LEVEL)/Makefile.rules\n") + makefile.write("include Makefile.rules\n") makefile.write("\ncleanup:\n\trm -f Makefile *.d\n\n") makefile.flush() makefile.close() Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/duplicate-archive-members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c # Make an archive that has two object files with the same name, but @@ -14,7 +12,7 @@ $(AR) $(ARFLAGS) $@ a.o sub1/a.o rm a.o sub1/a.o -include $(LEVEL)/Makefile.rules +include Makefile.rules # Needs to come after include OBJECTS += libfoo.a Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/find-app-in-bundle/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - CC ?= clang ifeq "$(ARCH)" "" Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/bundle-with-dot-in-filename/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - CC ?= clang ifeq "$(ARCH)" "" Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/find-dsym/deep-bundle/Makefile @@ -1,5 +1,4 @@ SRCDIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/ - CC ?= clang ifeq "$(ARCH)" "" Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/function-starts/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/function-starts/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/function-starts/Makefile @@ -1,10 +1,8 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp EXE := StripMe MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules main.o: main.cpp $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - -include $(LEVEL)/Makefile.rules +include Makefile.rules LIB_PREFIX := lib Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - MAKE_DSYM := NO C_SOURCES := main.c @@ -12,4 +10,4 @@ clean:: $(MAKE) -f create-empty-corefile.mk clean -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk @@ -1,8 +1,6 @@ -LEVEL = ../../../make - MAKE_DSYM := NO CXX_SOURCES := create-empty-corefile.cpp EXE = create-empty-corefile -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/nslog/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../make - OBJC_SOURCES := main.m LD_EXTRAS = -framework Foundation -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/order/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/order/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/order/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../make - C_SOURCES := main.c LDFLAGS = $(CFLAGS) -Xlinker -order_file -Xlinker $(SRCDIR)/order-file MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/queues/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/thread-names/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/thread-names/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/thread-names/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/macosx/universal/Makefile @@ -1,8 +1,6 @@ -LEVEL := ../../make - EXE := testit -include $(LEVEL)/Makefile.rules +include Makefile.rules all: testit Index: lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py +++ lldb/trunk/packages/Python/lldbsuite/test/plugins/builder_base.py @@ -75,6 +75,7 @@ "VPATH="+src_dir, "-C", build_dir, "-I", src_dir, + "-I", os.path.join(lldb_test, "make"), "-f", makefile] Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/class_members/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - OBJCXX_SOURCES := main.mm -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/event/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/event/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/event/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp # Clean renamed executable on 'make clean' clean: OBJECTS+=no_synth -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/formatters/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp # Clean renamed executable on 'make clean' clean: OBJECTS+=no_synth -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/get-variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../../make - C_SOURCES := inlines.c ifneq (,$(findstring icc,$(CC))) CFLAGS += -debug inline-debug-info endif -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/hello_world/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../make - C_SOURCES := main.c # See TestHelloWorld.py, which specifies the executable name with a dictionary. EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/interpreter/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/module_section/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp b.cpp c.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/name_lookup/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/objc_type/Makefile @@ -1,9 +1,7 @@ -LEVEL = ../../make - OBJC_SOURCES := main.m CFLAGS_EXTRAS += -w -include $(LEVEL)/Makefile.rules +include Makefile.rules LDFLAGS += -framework Foundation Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/process/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/process/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/process/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/process/io/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := process_io -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/process/read-mem-cstring/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - C_SOURCES := main.c EXE := read-mem-cstring -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbdata/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile @@ -1,4 +1,3 @@ -LEVEL = ../../make CXX_SOURCES := main.cpp CXXFLAGS += -std=c++11 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp # Clean renamed executable on 'make clean' clean: OBJECTS+=no_synth -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/section/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/section/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/section/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/signals/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/symbol-context/two-files/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := file1.cpp file2.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/target/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/target/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/target/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/thread/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES ?= main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/type/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/type/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/type/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/empty_class/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 # See TestHelloWorld.py, which specifies the executable name with a dictionary. EXE := hello_world -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/sample_test/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/sample_test/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/sample_test/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../make - C_SOURCES := main.c CFLAGS_EXTRAS += -std=c99 -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/source-manager/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/source-manager/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/source-manager/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../make - C_SOURCES := main-copy.c -include $(LEVEL)/Makefile.rules +include Makefile.rules # Copy file into the build folder to enable the test to modify it. main-copy.c: main.c Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../make - override CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile @@ -1,8 +1,6 @@ -LEVEL = ../../../make - CFLAGS_EXTRAS += -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11 # LD_EXTRAS := -lpthread CXX_SOURCES := main.cpp MAKE_DSYM :=NO -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile @@ -1,12 +1,10 @@ -LEVEL = ../../../make - LIB_PREFIX := svr4lib LD_EXTRAS := -L. -l$(LIB_PREFIX)_a -l$(LIB_PREFIX)_b\" CXX_SOURCES := main.cpp USE_LIBDL := 1 MAKE_DSYM := NO -include $(LEVEL)/Makefile.rules +include Makefile.rules a.out: $(LIB_PREFIX)_a $(LIB_PREFIX)_b_quote Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_a.mk @@ -1,9 +1,7 @@ -LEVEL = ../../../make - LIB_PREFIX := svr4lib DYLIB_NAME := $(LIB_PREFIX)_a DYLIB_CXX_SOURCES := $(LIB_PREFIX)_a.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/svr4lib_b_quote.mk @@ -1,9 +1,7 @@ -LEVEL = ../../../make - LIB_PREFIX := svr4lib DYLIB_NAME := $(LIB_PREFIX)_b\" DYLIB_CXX_SOURCES := $(LIB_PREFIX)_b_quote.cpp DYLIB_ONLY := YES -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/register-reading/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/signal-filtering/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/thread-name/Makefile @@ -1,6 +1,4 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/attach/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/breakpoint/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/launch/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/stackTrace/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - C_SOURCES := main.c -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/step/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../../../make - ENABLE_THREADS := YES CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-vscode/variables/Makefile @@ -1,5 +1,3 @@ -LEVEL = ../../../make - CXX_SOURCES := main.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules Index: lldb/trunk/packages/Python/lldbsuite/test/types/Makefile =================================================================== --- lldb/trunk/packages/Python/lldbsuite/test/types/Makefile +++ lldb/trunk/packages/Python/lldbsuite/test/types/Makefile @@ -1,7 +1,5 @@ -LEVEL = ../make - # Example: # # CXX_SOURCES := int.cpp -include $(LEVEL)/Makefile.rules +include Makefile.rules