Changeset 4f18de3

Timestamp:

Jul 28, 2018, 5:41:20 PM (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:

a8a7612

Parents:

e10537a9

Message:

Tentative fix for extensionless headers getting deleted

Location:

src

Files:

• libcfa/Makefile.am (modified) (1 diff)
• libcfa/Makefile.in (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (2 diffs)

src/libcfa/Makefile.am

@@ -64 +64 @@
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
+# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
 % : %.c
-        @true
+        echo "Dummy rule, should never be called"
+        false
+
+# This rule should always match headers and since it has no prerequisite it will never be called
+$(addprefix $(srcdir)/,$(headers)):
+        echo "Dummy rule, should never be called"
+        false
 
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c

src/libcfa/Makefile.in

@@ -1676 +1676 @@
 
 # extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
+# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
 % : %.c
-        @true
+        echo "Dummy rule, should never be called"
+        false
+
+# This rule should always match headers and since it has no prerequisite it will never be called
+$(addprefix $(srcdir)/,$(headers)):
+        echo "Dummy rule, should never be called"
+        false
 
 concurrency/libcfa_a-invoke.o : concurrency/invoke.c

src/tests/Makefile.am

@@ -79 +79 @@
         @+${TEST_PY} --debug=${debug} -Iconcurrent
 
+# 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
+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_deps) :
+        echo "Dummy rule, should never be called"
+
+# implicit rule so not all test require a rule
 % : %.c $(CC)
         $(COMPILE) $(abspath ${<}) -o ${@}

src/tests/Makefile.in

@@ -309 +309 @@
 fstream_test_SOURCES = fstream_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
+
+# 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
+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))
 all: all-am
 
@@ -626 +634 @@
 concurrency :
         @+${TEST_PY} --debug=${debug} -Iconcurrent
-
+$(headers_deps) :
+        echo "Dummy rule, should never be called"
+
+# implicit rule so not all test require a rule
 % : %.c $(CC)
         $(COMPILE) $(abspath ${<}) -o ${@}