Changeset 7fb69f6 for src/tests

Timestamp:

Jul 30, 2018, 10:34:00 AM (7 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:

944a90f

Parents:

bf5a6477

Message:

Added configure variable for building cfa source in tree

Location:

src/tests

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (3 diffs)
• preempt_longrun/Makefile.in (modified) (1 diff)

src/tests/Makefile.am

@@ -30 +30 @@
 # applies to both programs
 AM_CFLAGS = $(if $(test), 2> $(test), ) \
-        -XCFA \
-        -t \
-        -B@DRIVER_DIR@ \
         -g \
         -Wall \
         -Wno-unused-function \
         -quiet @CFA_FLAGS@ \
-        -I. \
         -DIN_DIR="${srcdir}/.in/" \
-        -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr
+        @BUILD_IN_TREE_FLAGS@
 
 if !BUILD_DEBUG
@@ -80 +72 @@
 
 % : %.c $(CC)
-        $(COMPILE) $(abspath ${<}) -o ${@}
+        echo "Compiling"
+        $(COMPILE) ${<} -o ${@}
+
+/home/tdelisle/workspace/clean-cforall/main/build/../src/libcfa/stdlib:
+        echo "Caught"
+
 
 declarationSpecifier: declarationSpecifier.c $(CC)

src/tests/Makefile.in

@@ -181 +181 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@
@@ -301 +303 @@
 
 # applies to both programs
-AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t -B@DRIVER_DIR@ -g \
-        -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \
-        -DIN_DIR="${srcdir}/.in/" -L${abs_top_builddir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa \
-        -I${abs_top_srcdir}/src/libcfa/containers \
-        -I${abs_top_srcdir}/src/libcfa/concurrency \
-        -I${abs_top_srcdir}/src/libcfa/stdhdr $(am__append_1) \
-        $(am__append_2) $(am__append_3)
+AM_CFLAGS = $(if $(test), 2> $(test), ) -g -Wall -Wno-unused-function \
+        -quiet @CFA_FLAGS@ -DIN_DIR="${srcdir}/.in/" \
+        @BUILD_IN_TREE_FLAGS@ $(am__append_1) $(am__append_2) \
+        $(am__append_3)
 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
@@ -630 +628 @@
 
 % : %.c $(CC)
-        $(COMPILE) $(abspath ${<}) -o ${@}
+        echo "Compiling"
+        $(COMPILE) ${<} -o ${@}
+
+/home/tdelisle/workspace/clean-cforall/main/build/../src/libcfa/stdlib:
+        echo "Caught"
 
 declarationSpecifier: declarationSpecifier.c $(CC)

src/tests/preempt_longrun/Makefile.in

@@ -337 +337 @@
 AWK = @AWK@
 BACKEND_CC = @BACKEND_CC@
+BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
+BUILD_IN_TREE_FLAGS_NOLIB = @BUILD_IN_TREE_FLAGS_NOLIB@
 CC = @CFACC@
 CCAS = @CCAS@