Changeset b1e63ac5 for src/tests/Makefile.in

Timestamp:

Jul 4, 2017, 9:40:16 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into references

File:

• src/tests/Makefile.in (modified) (6 diffs)

src/tests/Makefile.in

@@ -39 +39 @@
 @BUILD_CONCURRENCY_TRUE@am__append_1 = coroutine thread monitor
 EXTRA_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
-        avl_test$(EXEEXT) constant0-1DP$(EXEEXT) \
-        constant0-1ND$(EXEEXT) constant0-1NDDP$(EXEEXT)
+        avl_test$(EXEEXT)
 subdir = src/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -56 +55 @@
 avl_test_OBJECTS = $(am_avl_test_OBJECTS)
 avl_test_LDADD = $(LDADD)
-constant0_1DP_SOURCES = constant0-1DP.c
-constant0_1DP_OBJECTS = constant0-1DP.$(OBJEXT)
-constant0_1DP_LDADD = $(LDADD)
-constant0_1ND_SOURCES = constant0-1ND.c
-constant0_1ND_OBJECTS = constant0-1ND.$(OBJEXT)
-constant0_1ND_LDADD = $(LDADD)
-constant0_1NDDP_SOURCES = constant0-1NDDP.c
-constant0_1NDDP_OBJECTS = constant0-1NDDP.$(OBJEXT)
-constant0_1NDDP_LDADD = $(LDADD)
 am_fstream_test_OBJECTS = fstream_test.$(OBJEXT)
 fstream_test_OBJECTS = $(am_fstream_test_OBJECTS)
@@ -95 +85 @@
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
-SOURCES = $(avl_test_SOURCES) constant0-1DP.c constant0-1ND.c \
-        constant0-1NDDP.c $(fstream_test_SOURCES) \
+SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
-DIST_SOURCES = $(avl_test_SOURCES) constant0-1DP.c constant0-1ND.c \
-        constant0-1NDDP.c $(fstream_test_SOURCES) \
+DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
         $(vector_test_SOURCES)
 ETAGS = etags
@@ -230 +218 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
+@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt
 
 # applies to both programs
@@ -297 +285 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl4.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant0-1DP.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant0-1ND.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant0-1NDDP.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vector_int.Po@am__quote@
@@ -676 +661 @@
         @+python test.py --debug=${debug} --concurrent=${concurrent} ${concurrent_test}
 
-.dummy : .dummy.c
+.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}                              #don't use CFLAGS, this rule is not a real test
 
-constant0-1DP : constant0-1.c
-        ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
-
-constant0-1ND : constant0-1.c
-        ${CC} ${CFLAGS} -DNEWDECL ${<} -o ${@}
-
-constant0-1NDDP : constant0-1.c
-        ${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
-
-dtor-early-exit-ERR1: dtor-early-exit.c
+% : %.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${CFLAGS} ${<} -o ${@}
+
+dtor-early-exit-ERR1: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-dtor-early-exit-ERR2: dtor-early-exit.c
+dtor-early-exit-ERR2: dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR2 ${<} -o ${@}
 
-declarationSpecifier: declarationSpecifier.c
+declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gccExtensions : gccExtensions.c
+gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-extension : extension.c
+extension : extension.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-attributes : attributes.c
+attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-KRfunctions : KRfunctions.c
+KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
-gmp : gmp.c
+gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 
-memberCtors-ERR1: memberCtors.c
+memberCtors-ERR1: memberCtors.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
 
-completeTypeError : completeTypeError.c
+completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}