Changeset 58b6d1b for libcfa/src/Makefile.in

Timestamp:

Aug 6, 2018, 4:33:35 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:

524ed86

Parents:

73abe95

Message:

Fixed tests after headers change

File:

• libcfa/src/Makefile.in (modified) (4 diffs)

libcfa/src/Makefile.in

@@ -343 +343 @@
 AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@
 
+#----------------------------------------------------------------------------------------------------------------
+
 # not all platforms support concurrency, add option do disable it
-headers = fstream iostream iterator limits rational time stdlib common \
-        containers/maybe containers/pair containers/result \
-        containers/vector concurrency/coroutine concurrency/thread \
-        concurrency/kernel concurrency/monitor concurrency/mutex
-libobjs = ${headers:=.o}
+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 concurrency/coroutine.hfa \
+        concurrency/thread.hfa concurrency/kernel.hfa \
+        concurrency/monitor.hfa concurrency/mutex.hfa
+libobjs = ${headers:.hfa=.o}
 
 # not all platforms support concurrency, add option do disable it
 libsrc = prelude.c startup.cfa interpose.cfa bits/debug.cfa assert.cfa \
-        exception.c virtual.c heap.cfa ${headers:=.cfa} \
+        exception.c virtual.c heap.cfa ${headers:.hfa=.cfa} \
         concurrency/CtxSwitch-@ARCHITECTURE@.S concurrency/alarm.cfa \
         concurrency/invoke.c concurrency/preemption.cfa
@@ -359 +363 @@
 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            \
+        ${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.h
 
-CLEANFILES = prelude.c
+MOSTLYCLEANFILES = prelude.c
 all: all-am
 
@@ -670 +674 @@
         fi
 mostlyclean-generic:
+        -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
@@ -783 +787 @@
         $(am__mv) $$depbase.Tpo $$depbase.Po
 
-# 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}
+
+#----------------------------------------------------------------------------------------------------------------
 maintainer-clean-local:
         -rm -rf ${CFA_INCDIR} ${CFA_LIBDIR}