Changeset 73abe95 for libcfa/src/Makefile.am

Timestamp:

Aug 6, 2018, 2:50:03 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

aaron-thesis, arm-eh, 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:

58b6d1b

Parents:

ff593a3

Message:

Replace extension-less headers with .hfa

File:

• libcfa/src/Makefile.am (modified) (2 diffs)

libcfa/src/Makefile.am

@@ -33 +33 @@
 CFACC = @CFACC@
 
-headers = fstream iostream iterator limits rational time stdlib common \
-          containers/maybe containers/pair containers/result containers/vector
+#----------------------------------------------------------------------------------------------------------------
+headers = fstream.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa time.hfa stdlib.hfa common.hfa \
+          containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
 
 # not all platforms support concurrency, add option do disable it
-headers += concurrency/coroutine concurrency/thread concurrency/kernel concurrency/monitor concurrency/mutex
+headers += concurrency/coroutine.hfa concurrency/thread.hfa concurrency/kernel.hfa concurrency/monitor.hfa concurrency/mutex.hfa
 
-libobjs = ${headers:=.o}
+libobjs = ${headers:.hfa=.o}
 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa exception.c virtual.c heap.cfa \
-        ${headers:=.cfa}
+        ${headers:.hfa=.cfa}
 
 # not all platforms support concurrency, add option do disable it
 libsrc += concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa concurrency/invoke.c concurrency/preemption.cfa
 
-# 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
-        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
-
-
-${libobjs} : ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
+#----------------------------------------------------------------------------------------------------------------
+# add dependency to cfa-cpp so all libraries are rebuilt with new translator
+${libobjs} : ${cfalib_DATA}
 
 libcfa_a_SOURCES = ${libsrc}
@@ -65 +56 @@
 
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS =    \
-        ${headers}              \
-        ${stdhdr}               \
-        math                    \
-        gmp                     \
-        time_t.h                \
-        bits/align.h            \
-        bits/containers.h       \
-        bits/defs.h             \
-        bits/debug.h            \
-        bits/locks.h            \
-        concurrency/invoke.h
+nobase_cfa_include_HEADERS = \
+        ${headers}             \
+        ${stdhdr}              \
+        math.hfa               \
+        gmp.hfa                \
+        time_t.hfa             \
+        bits/align.hfa         \
+        bits/containers.hfa    \
+        bits/defs.hfa          \
+        bits/debug.hfa         \
+        bits/locks.hfa         \
+        concurrency/invoke.hfa
 
-CLEANFILES = prelude.c
+MOSTLYCLEANFILES = prelude.c
 
+#----------------------------------------------------------------------------------------------------------------
 maintainer-clean-local:
         -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}