Changeset 4f18de3


Ignore:
Timestamp:
Jul 28, 2018, 5:41:20 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
a8a7612
Parents:
e10537a9
Message:

Tentative fix for extensionless headers getting deleted

Location:
src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/Makefile.am

    re10537a9 r4f18de3  
    6464
    6565# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     66# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
    6667% : %.c
    67         @true
     68        echo "Dummy rule, should never be called"
     69        false
     70
     71# This rule should always match headers and since it has no prerequisite it will never be called
     72$(addprefix $(srcdir)/,$(headers)):
     73        echo "Dummy rule, should never be called"
     74        false
    6875
    6976concurrency/libcfa_a-invoke.o : concurrency/invoke.c
  • src/libcfa/Makefile.in

    re10537a9 r4f18de3  
    16761676
    16771677# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     1678# SKULLDUGGERY in order to make sure this isn't called make the rule always fail but also create a rule for headers
    16781679% : %.c
    1679         @true
     1680        echo "Dummy rule, should never be called"
     1681        false
     1682
     1683# This rule should always match headers and since it has no prerequisite it will never be called
     1684$(addprefix $(srcdir)/,$(headers)):
     1685        echo "Dummy rule, should never be called"
     1686        false
    16801687
    16811688concurrency/libcfa_a-invoke.o : concurrency/invoke.c
  • src/tests/Makefile.am

    re10537a9 r4f18de3  
    7979        @+${TEST_PY} --debug=${debug} -Iconcurrent
    8080
     81# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
     82# however, here it is more complicated because it must match the dependencies exactly
     83# depencies seem to have the absolute path to the build directory and relative path
     84# to the headers from there
     85headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
     86headers_real = $(shell realpath --relative-to=$(top_builddir) $(headers))
     87headers_deps = $(addprefix $(abs_top_builddir)/, $(headers))
     88$(headers_deps) :
     89        echo "Dummy rule, should never be called"
     90
     91# implicit rule so not all test require a rule
    8192% : %.c $(CC)
    8293        $(COMPILE) $(abspath ${<}) -o ${@}
  • src/tests/Makefile.in

    re10537a9 r4f18de3  
    309309fstream_test_SOURCES = fstream_test.c
    310310avl_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
     311
     312# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated
     313# however, here it is more complicated because it must match the dependencies exactly
     314# depencies seem to have the absolute path to the build directory and relative path
     315# to the headers from there
     316headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*")
     317headers_real = $(shell realpath --relative-to=$(top_builddir) $(headers))
     318headers_deps = $(addprefix $(abs_top_builddir)/, $(headers))
    311319all: all-am
    312320
     
    626634concurrency :
    627635        @+${TEST_PY} --debug=${debug} -Iconcurrent
    628 
     636$(headers_deps) :
     637        echo "Dummy rule, should never be called"
     638
     639# implicit rule so not all test require a rule
    629640% : %.c $(CC)
    630641        $(COMPILE) $(abspath ${<}) -o ${@}
Note: See TracChangeset for help on using the changeset viewer.