rice 1.7.0 → 2.0.0

data/sample/Makefile.am

@@ -23,10 +23,10 @@ inheritance/Makefile: inheritance/extconf.rb ../config.status ../ruby/lib/mkmf-r
 
 all: enum/Makefile map/Makefile inheritance/Makefile all_extensions
 
-all_extensions:
+all_extensions: $(addsuffix /Makefile,$(RICE_SAMPLES))
 	@for sample in $(RICE_SAMPLES); \
 	do \
-	  $(MAKE) -C $${sample} all; \
+	  ${MAKE} -C $${sample} all; \
 	done
 
 clean: enum/Makefile map/Makefile inheritance/Makefile clean_extensions
@@ -34,7 +34,7 @@ clean: enum/Makefile map/Makefile inheritance/Makefile clean_extensions
 clean_extensions:
 	@for sample in $(RICE_SAMPLES); \
 	do \
-	  $(MAKE) -C $${sample} clean; \
+	  ${MAKE} -C $${sample} clean; \
 	done
 
 distclean: enum/Makefile map/Makefile inheritance/Makefile distclean_extensions
@@ -42,6 +42,6 @@ distclean: enum/Makefile map/Makefile inheritance/Makefile distclean_extensions
 distclean_extensions:
 	@for sample in $(RICE_SAMPLES);
 	do \
-	  $(MAKE) -C $${sample} distclean; \
+	  ${MAKE} -C $${sample} distclean; \
 	done
 

data/sample/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,13 +88,13 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = sample
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
@@ -109,6 +119,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -271,7 +282,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu sample/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu sample/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -435,6 +445,8 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 enum/Makefile: enum/extconf.rb ../config.status ../ruby/lib/mkmf-rice.rb
 	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C enum extconf.rb $(EXTCONF_OPTIONS)
@@ -447,10 +459,10 @@ inheritance/Makefile: inheritance/extconf.rb ../config.status ../ruby/lib/mkmf-r
 
 all: enum/Makefile map/Makefile inheritance/Makefile all_extensions
 
-all_extensions:
+all_extensions: $(addsuffix /Makefile,$(RICE_SAMPLES))
 	@for sample in $(RICE_SAMPLES); \
 	do \
-	  $(MAKE) -C $${sample} all; \
+	  ${MAKE} -C $${sample} all; \
 	done
 
 clean: enum/Makefile map/Makefile inheritance/Makefile clean_extensions
@@ -458,7 +470,7 @@ clean: enum/Makefile map/Makefile inheritance/Makefile clean_extensions
 clean_extensions:
 	@for sample in $(RICE_SAMPLES); \
 	do \
-	  $(MAKE) -C $${sample} clean; \
+	  ${MAKE} -C $${sample} clean; \
 	done
 
 distclean: enum/Makefile map/Makefile inheritance/Makefile distclean_extensions
@@ -466,7 +478,7 @@ distclean: enum/Makefile map/Makefile inheritance/Makefile distclean_extensions
 distclean_extensions:
 	@for sample in $(RICE_SAMPLES);
 	do \
-	  $(MAKE) -C $${sample} distclean; \
+	  ${MAKE} -C $${sample} distclean; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

data/test/Makefile.am

@@ -1,8 +1,8 @@
-noinst_PROGRAMS = unittest vm_unittest
+noinst_PROGRAMS = unittest
 
 SUBDIRS = ext
 
-TESTS = unittest vm_unittest
+TESTS = unittest
 
 
 check: run_multiple_extensions_test
@@ -36,7 +36,6 @@ unittest_SOURCES = \
 	test_Builtin_Object.cpp \
 	test_Class.cpp \
 	test_Constructor.cpp \
-	test_Critical_Guard.cpp \
 	test_Data_Object.cpp \
 	test_Data_Type.cpp \
 	test_Director.cpp \
@@ -54,10 +53,6 @@ unittest_SOURCES = \
 	test_To_From_Ruby.cpp \
 	test_global_functions.cpp
 
-vm_unittest_SOURCES = \
-	unittest.cpp \
-	test_VM.cpp
-
 AM_CPPFLAGS = \
 	-I.. \
 	$(RUBY_CFLAGS)

data/test/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,17 +88,16 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-noinst_PROGRAMS = unittest$(EXEEXT) vm_unittest$(EXEEXT)
-TESTS = unittest$(EXEEXT) vm_unittest$(EXEEXT)
+noinst_PROGRAMS = unittest$(EXEEXT)
+TESTS = unittest$(EXEEXT)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
@@ -97,20 +106,17 @@ PROGRAMS = $(noinst_PROGRAMS)
 am_unittest_OBJECTS = unittest.$(OBJEXT) \
 	test_Address_Registration_Guard.$(OBJEXT) test_Array.$(OBJEXT) \
 	test_Builtin_Object.$(OBJEXT) test_Class.$(OBJEXT) \
-	test_Constructor.$(OBJEXT) test_Critical_Guard.$(OBJEXT) \
-	test_Data_Object.$(OBJEXT) test_Data_Type.$(OBJEXT) \
-	test_Director.$(OBJEXT) test_Enum.$(OBJEXT) \
-	test_Exception.$(OBJEXT) test_Hash.$(OBJEXT) \
-	test_Identifier.$(OBJEXT) test_Jump_Tag.$(OBJEXT) \
-	test_Memory_Management.$(OBJEXT) test_Module.$(OBJEXT) \
-	test_Object.$(OBJEXT) test_String.$(OBJEXT) \
-	test_Struct.$(OBJEXT) test_Symbol.$(OBJEXT) \
-	test_To_From_Ruby.$(OBJEXT) test_global_functions.$(OBJEXT)
+	test_Constructor.$(OBJEXT) test_Data_Object.$(OBJEXT) \
+	test_Data_Type.$(OBJEXT) test_Director.$(OBJEXT) \
+	test_Enum.$(OBJEXT) test_Exception.$(OBJEXT) \
+	test_Hash.$(OBJEXT) test_Identifier.$(OBJEXT) \
+	test_Jump_Tag.$(OBJEXT) test_Memory_Management.$(OBJEXT) \
+	test_Module.$(OBJEXT) test_Object.$(OBJEXT) \
+	test_String.$(OBJEXT) test_Struct.$(OBJEXT) \
+	test_Symbol.$(OBJEXT) test_To_From_Ruby.$(OBJEXT) \
+	test_global_functions.$(OBJEXT)
 unittest_OBJECTS = $(am_unittest_OBJECTS)
 unittest_LDADD = $(LDADD)
-am_vm_unittest_OBJECTS = unittest.$(OBJEXT) test_VM.$(OBJEXT)
-vm_unittest_OBJECTS = $(am_vm_unittest_OBJECTS)
-vm_unittest_LDADD = $(LDADD)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -140,8 +146,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(unittest_SOURCES) $(vm_unittest_SOURCES)
-DIST_SOURCES = $(unittest_SOURCES) $(vm_unittest_SOURCES)
+SOURCES = $(unittest_SOURCES)
+DIST_SOURCES = $(unittest_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
@@ -386,6 +392,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
+	$(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -557,7 +565,6 @@ unittest_SOURCES = \
 	test_Builtin_Object.cpp \
 	test_Class.cpp \
 	test_Constructor.cpp \
-	test_Critical_Guard.cpp \
 	test_Data_Object.cpp \
 	test_Data_Type.cpp \
 	test_Director.cpp \
@@ -575,10 +582,6 @@ unittest_SOURCES = \
 	test_To_From_Ruby.cpp \
 	test_global_functions.cpp
 
-vm_unittest_SOURCES = \
-	unittest.cpp \
-	test_VM.cpp
-
 AM_CPPFLAGS = \
 	-I.. \
 	$(RUBY_CFLAGS)
@@ -606,7 +609,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu test/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -632,10 +634,6 @@ unittest$(EXEEXT): $(unittest_OBJECTS) $(unittest_DEPENDENCIES) $(EXTRA_unittest
 	@rm -f unittest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(unittest_OBJECTS) $(unittest_LDADD) $(LIBS)
 
-vm_unittest$(EXEEXT): $(vm_unittest_OBJECTS) $(vm_unittest_DEPENDENCIES) $(EXTRA_vm_unittest_DEPENDENCIES) 
-	@rm -f vm_unittest$(EXEEXT)
-	$(AM_V_CXXLD)$(CXXLINK) $(vm_unittest_OBJECTS) $(vm_unittest_LDADD) $(LIBS)
-
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -647,7 +645,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Builtin_Object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Class.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Constructor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Critical_Guard.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Data_Type.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Director.Po@am__quote@
@@ -663,7 +660,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Struct.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_Symbol.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_To_From_Ruby.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_VM.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_global_functions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unittest.Po@am__quote@
 
@@ -812,7 +808,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	if test -n "$$am__remaking_logs"; then \
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
-	else \
+	elif test -n "$$redo_logs"; then \
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
@@ -930,13 +926,6 @@ unittest.log: unittest$(EXEEXT)
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-vm_unittest.log: vm_unittest$(EXEEXT)
-	@p='vm_unittest$(EXEEXT)'; \
-	b='vm_unittest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
@@ -1131,6 +1120,8 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
 	uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 check: run_multiple_extensions_test
 

data/test/ext/Makefile.am

@@ -15,29 +15,27 @@ t1/Makefile: t1/extconf.rb ../../config.status ../../ruby/lib/mkmf-rice.rb
 t2/Makefile: t2/extconf.rb ../../config.status ../../ruby/lib/mkmf-rice.rb
 	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C t2 extconf.rb $(EXTCONF_OPTIONS)
 
-all clean distclean: t1/Makefile t2/Makefile
-
 all: t1_all t2_all
 
-t1_all:
-	make -C t1 all
+t1_all: t1/Makefile
+	${MAKE} -C t1 all
 
-t2_all:
-	make -C t2 all
+t2_all: t2/Makefile
+	${MAKE} -C t2 all
 
 clean: t1_clean t2_clean
 
-t1_clean:
-	make -C t1 clean
+t1_clean: t1/Makefile
+	${MAKE} -C t1 clean
 
-t2_clean:
-	make -C t2 clean
+t2_clean: t2/Makefile
+	${MAKE} -C t2 clean
 
 distclean: t1_distclean t2_distclean
 
-t1_distclean:
-	make -C t1 distclean
+t1_distclean: t1/Makefile
+	${MAKE} -C t1 distclean
 
-t2_distclean:
-	make -C t2 distclean
+t2_distclean: t2/Makefile
+	${MAKE} -C t2 distclean
 

data/test/ext/Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,13 +88,13 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = test/ext
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/check_stdcxx_11.ac \
 	$(top_srcdir)/ruby.ac $(top_srcdir)/doxygen.ac \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/rice/config.hpp
 CONFIG_CLEAN_FILES =
@@ -109,6 +119,7 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -266,7 +277,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/ext/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu test/ext/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -430,6 +440,8 @@ uninstall-am:
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 all:
 
@@ -439,31 +451,29 @@ t1/Makefile: t1/extconf.rb ../../config.status ../../ruby/lib/mkmf-rice.rb
 t2/Makefile: t2/extconf.rb ../../config.status ../../ruby/lib/mkmf-rice.rb
 	@RUBY@ $(RUBY_EXTCONF_OPTIONS) -C t2 extconf.rb $(EXTCONF_OPTIONS)
 
-all clean distclean: t1/Makefile t2/Makefile
-
 all: t1_all t2_all
 
-t1_all:
-	make -C t1 all
+t1_all: t1/Makefile
+	${MAKE} -C t1 all
 
-t2_all:
-	make -C t2 all
+t2_all: t2/Makefile
+	${MAKE} -C t2 all
 
 clean: t1_clean t2_clean
 
-t1_clean:
-	make -C t1 clean
+t1_clean: t1/Makefile
+	${MAKE} -C t1 clean
 
-t2_clean:
-	make -C t2 clean
+t2_clean: t2/Makefile
+	${MAKE} -C t2 clean
 
 distclean: t1_distclean t2_distclean
 
-t1_distclean:
-	make -C t1 distclean
+t1_distclean: t1/Makefile
+	${MAKE} -C t1 distclean
 
-t2_distclean:
-	make -C t2 distclean
+t2_distclean: t2/Makefile
+	${MAKE} -C t2 distclean
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.