Changeset a4248de1

Timestamp:

Jul 30, 2018, 10:51:33 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

04e367c, 0dc3ac3, 944a90f, 95b1e28

Parents:

02559df

Message:

New tentative for headers using wildcard characters in rules

Location:

src/tests

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• test.py (modified) (1 diff)

src/tests/Makefile.am

@@ -80 +80 @@
 
 # SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
-# however, here it is more complicated because it must match the dependencies exactly
-# depencies seem to have the absolute path to the build directory and relative path
-# to the headers from there
+# however, here it is more complicated because it must match the dependencies based on how
+# they are generated by gcc
 headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
-headers_real = $(shell realpath --relative-to=$(top_builddir) $(headers))
-headers_deps = $(addprefix $(abs_top_builddir)/, $(headers))
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers_deps = $(addprefix %/, $(headers_real))
 $(headers_deps) :
         echo "Dummy rule, should never be called"
 
+# %/stdlib:
+#       echo "Dummy rule, should never be called"
+
 # implicit rule so not all test require a rule
 % : %.c $(CC)
+        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}
 

src/tests/Makefile.in

@@ -315 +315 @@
 # to the headers from there
 headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
-headers_real = $(shell realpath --relative-to=$(top_builddir) $(headers))
-headers_deps = $(addprefix $(abs_top_builddir)/, $(headers))
+headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers))
+headers_deps = $(addprefix %/, $(headers_real))
 all: all-am
 
@@ -637 +637 @@
         echo "Dummy rule, should never be called"
 
+# %/stdlib:
+#       echo "Dummy rule, should never be called"
+
 # implicit rule so not all test require a rule
 % : %.c $(CC)
+        echo $(headers_deps)
         $(COMPILE) $(abspath ${<}) -o ${@}
 

src/tests/test.py

@@ -219 +219 @@
         make('clean', redirects = '> /dev/null 2>&1')
 
-        # automake doesn't clean the dependencies so do it by hand
-        sh("find %s -type d -name .deps -delete" % settings.BUIDDIR)
-
         # create the executor for our jobs and handle the signal properly
         pool = setupPool(jobs)