Index: src/Makefile.in =================================================================== --- src/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -299,5 +299,4 @@ am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_1 = -@MAINTAINER_MODE_FALSE@am__skiplex = test -f $@ || LEXCOMPILE = $(LEX) $(AM_LFLAGS) $(LFLAGS) AM_V_LEX = $(am__v_LEX_@AM_V@) @@ -306,5 +305,4 @@ am__v_LEX_1 = YLWRAP = $(top_srcdir)/automake/ylwrap -@MAINTAINER_MODE_FALSE@am__skipyacc = test -f $@ || am__yacc_c2h = sed -e s/cc$$/hh/ -e s/cpp$$/hpp/ -e s/cxx$$/hxx/ \ -e s/c++$$/h++/ -e s/c$$/h/ @@ -414,5 +412,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -557,5 +554,5 @@ .SUFFIXES: .SUFFIXES: .cc .ll .o .obj .yy -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/CodeGen/module.mk $(srcdir)/CodeTools/module.mk $(srcdir)/Concurrency/module.mk $(srcdir)/Common/module.mk $(srcdir)/ControlStruct/module.mk $(srcdir)/GenPoly/module.mk $(srcdir)/InitTweak/module.mk $(srcdir)/Parser/module.mk $(srcdir)/ResolvExpr/module.mk $(srcdir)/SymTab/module.mk $(srcdir)/SynTree/module.mk $(srcdir)/Tuples/module.mk $(srcdir)/Validate/module.mk $(srcdir)/Virtual/module.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -582,7 +579,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): Index: src/benchmark/Makefile.am =================================================================== --- src/benchmark/Makefile.am (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/benchmark/Makefile.am (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -17,6 +17,21 @@ # applies to both programs CFLAGS = -AM_CFLAGS = -g -Wall -Wno-unused-function -O2 -CC = @CFA_BINDIR@/@CFA_NAME@ +AM_CFLAGS = \ + -XCFA \ + -t \ + -B${abs_top_builddir}/src/driver \ + -g \ + -O2 \ + -Wall \ + -Wno-unused-function \ + -quiet \ + -I$(srcdir) \ + -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 + +CC = ${top_builddir}/src/driver/cfa TOOLSDIR = ${abs_top_srcdir}/tools/ REPEAT = ${TOOLSDIR}repeat @@ -93,11 +108,11 @@ ## ========================================================================================================= loop$(EXEEXT): - @@BACKEND_CC@ loop.c -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ loop.c -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} function$(EXEEXT): - @@BACKEND_CC@ function.c -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ function.c -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} fetch_add$(EXEEXT): - @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} ## ========================================================================================================= @@ -118,32 +133,32 @@ ctxswitch-pthread$(EXEEXT): - @@BACKEND_CC@ ctxswitch/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c -DBENCH_N=50000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-cfa_coroutine$(EXEEXT): - @${CC} ctxswitch/cfa_cor.c -DBENCH_N=50000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/ctxswitch/cfa_cor.c -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-cfa_thread$(EXEEXT): - @${CC} ctxswitch/cfa_thrd.c -DBENCH_N=50000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/ctxswitch/cfa_thrd.c -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-cfa_thread2$(EXEEXT): - @${CC} ctxswitch/cfa_thrd2.c -DBENCH_N=50000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/ctxswitch/cfa_thrd2.c -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-upp_coroutine$(EXEEXT): - @u++ ctxswitch/upp_cor.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/ctxswitch/upp_cor.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-upp_thread$(EXEEXT): - @u++ ctxswitch/upp_thrd.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/ctxswitch/upp_thrd.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-kos_fibre$(EXEEXT): - @${CXX} ctxswitch/kos_fibre.cpp -DBENCH_N=50000000 -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt + @${CXX} $(srcdir)/ctxswitch/kos_fibre.cpp -DBENCH_N=50000000 -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt ctxswitch-kos_fibre2$(EXEEXT): - @${CXX} ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000 -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt + @${CXX} $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000 -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt ctxswitch-goroutine$(EXEEXT): - @go build -o a.out ctxswitch/goroutine.go + @go build -o a.out $(srcdir)/ctxswitch/goroutine.go ctxswitch-java_thread$(EXEEXT): - @javac ctxswitch/JavaThread.java + @javac $(srcdir)/ctxswitch/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd ctxswitch && java JavaThread" >> a.out @@ -163,20 +178,20 @@ mutex-pthread_lock$(EXEEXT): - @@BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c -DBENCH_N=50000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-upp$(EXEEXT): - @u++ mutex/upp.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/mutex/upp.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-cfa1$(EXEEXT): - @${CC} mutex/cfa1.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/mutex/cfa1.c -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-cfa2$(EXEEXT): - @${CC} mutex/cfa2.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/mutex/cfa2.c -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-cfa4$(EXEEXT): - @${CC} mutex/cfa4.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/mutex/cfa4.c -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-java_thread$(EXEEXT): - @javac mutex/JavaThread.java + @javac $(srcdir)/mutex/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd mutex && java JavaThread" >> a.out @@ -193,20 +208,20 @@ signal-pthread_cond$(EXEEXT): - @@BACKEND_CC@ schedint/pthreads.c -DBENCH_N=500000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-upp$(EXEEXT): - @u++ schedint/upp.cc -DBENCH_N=5000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/schedint/upp.cc -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-cfa1$(EXEEXT): - @${CC} schedint/cfa1.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedint/cfa1.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-cfa2$(EXEEXT): - @${CC} schedint/cfa2.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedint/cfa2.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-cfa4$(EXEEXT): - @${CC} schedint/cfa4.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedint/cfa4.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-java_thread$(EXEEXT): - @javac schedint/JavaThread.java + @javac $(srcdir)/schedint/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd schedint && java JavaThread" >> a.out @@ -222,14 +237,14 @@ waitfor-upp$(EXEEXT): - @u++ schedext/upp.cc -DBENCH_N=5000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/schedext/upp.cc -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} waitfor-cfa1$(EXEEXT): - @${CC} schedext/cfa1.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedext/cfa1.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} waitfor-cfa2$(EXEEXT): - @${CC} schedext/cfa2.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedext/cfa2.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} waitfor-cfa4$(EXEEXT): - @${CC} schedext/cfa4.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedext/cfa4.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ## ========================================================================================================= @@ -245,26 +260,26 @@ creation-cfa_coroutine$(EXEEXT): - @${CC} creation/cfa_cor.c -DBENCH_N=10000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/creation/cfa_cor.c -DBENCH_N=10000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-cfa_coroutine_eager$(EXEEXT): - @${CC} creation/cfa_cor.c -DBENCH_N=10000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER + @${CC} $(srcdir)/creation/cfa_cor.c -DBENCH_N=10000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER creation-cfa_thread$(EXEEXT): - @${CC} creation/cfa_thrd.c -DBENCH_N=10000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/creation/cfa_thrd.c -DBENCH_N=10000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-upp_coroutine$(EXEEXT): - @u++ creation/upp_cor.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/creation/upp_cor.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-upp_thread$(EXEEXT): - @u++ creation/upp_thrd.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-pthread$(EXEEXT): - @@BACKEND_CC@ creation/pthreads.c -DBENCH_N=250000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/creation/pthreads.c -DBENCH_N=250000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-goroutine$(EXEEXT): - @go build -o a.out creation/goroutine.go + @go build -o a.out $(srcdir)/creation/goroutine.go creation-java_thread$(EXEEXT): - @javac creation/JavaThread.java + @javac $(srcdir)/creation/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd creation && java JavaThread" >> a.out @@ -284,29 +299,31 @@ +testdir = $(top_srcdir)/src/tests + compile-array$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/array.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/array.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-attributes$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/attributes.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-empty$(EXEEXT): - @${CC} -quiet -fsyntax-only -w compile/empty.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-expression$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/expression.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-io$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/io1.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-monitor$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/concurrent/monitor.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-operators$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/operators.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-thread$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/concurrent/thread.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-typeof$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/typeof.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} - + @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + Index: src/benchmark/Makefile.in =================================================================== --- src/benchmark/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/benchmark/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -135,5 +135,5 @@ AWK = @AWK@ BACKEND_CC = @BACKEND_CC@ -CC = @CFA_BINDIR@/@CFA_NAME@ +CC = ${top_builddir}/src/driver/cfa CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -177,5 +177,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -248,5 +247,20 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = -g -Wall -Wno-unused-function -O2 +AM_CFLAGS = \ + -XCFA \ + -t \ + -B${abs_top_builddir}/src/driver \ + -g \ + -O2 \ + -Wall \ + -Wno-unused-function \ + -quiet \ + -I$(srcdir) \ + -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 + TOOLSDIR = ${abs_top_srcdir}/tools/ REPEAT = ${TOOLSDIR}repeat @@ -256,8 +270,9 @@ TIME_FORMAT = "%E" PRINT_FORMAT = %20s: #Comments needed for spacing +testdir = $(top_srcdir)/src/tests all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -283,7 +298,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -506,11 +521,11 @@ loop$(EXEEXT): - @@BACKEND_CC@ loop.c -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ loop.c -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} function$(EXEEXT): - @@BACKEND_CC@ function.c -DBENCH_N=5000000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ function.c -DBENCH_N=5000000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} fetch_add$(EXEEXT): - @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ fetch_add.c -DBENCH_N=500000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch$(EXEEXT): \ @@ -530,32 +545,32 @@ ctxswitch-pthread$(EXEEXT): - @@BACKEND_CC@ ctxswitch/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/ctxswitch/pthreads.c -DBENCH_N=50000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-cfa_coroutine$(EXEEXT): - @${CC} ctxswitch/cfa_cor.c -DBENCH_N=50000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/ctxswitch/cfa_cor.c -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-cfa_thread$(EXEEXT): - @${CC} ctxswitch/cfa_thrd.c -DBENCH_N=50000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/ctxswitch/cfa_thrd.c -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-cfa_thread2$(EXEEXT): - @${CC} ctxswitch/cfa_thrd2.c -DBENCH_N=50000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/ctxswitch/cfa_thrd2.c -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-upp_coroutine$(EXEEXT): - @u++ ctxswitch/upp_cor.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/ctxswitch/upp_cor.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-upp_thread$(EXEEXT): - @u++ ctxswitch/upp_thrd.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/ctxswitch/upp_thrd.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} ctxswitch-kos_fibre$(EXEEXT): - @${CXX} ctxswitch/kos_fibre.cpp -DBENCH_N=50000000 -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt + @${CXX} $(srcdir)/ctxswitch/kos_fibre.cpp -DBENCH_N=50000000 -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt ctxswitch-kos_fibre2$(EXEEXT): - @${CXX} ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000 -I. -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt + @${CXX} $(srcdir)/ctxswitch/kos_fibre2.cpp -DBENCH_N=50000000 -I$(srcdir) -I/home/tdelisle/software/KOS/src/ -g -O2 -lfibre -lpthread -lrt ctxswitch-goroutine$(EXEEXT): - @go build -o a.out ctxswitch/goroutine.go + @go build -o a.out $(srcdir)/ctxswitch/goroutine.go ctxswitch-java_thread$(EXEEXT): - @javac ctxswitch/JavaThread.java + @javac $(srcdir)/ctxswitch/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd ctxswitch && java JavaThread" >> a.out @@ -574,20 +589,20 @@ mutex-pthread_lock$(EXEEXT): - @@BACKEND_CC@ mutex/pthreads.c -DBENCH_N=50000000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/mutex/pthreads.c -DBENCH_N=50000000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-upp$(EXEEXT): - @u++ mutex/upp.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/mutex/upp.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-cfa1$(EXEEXT): - @${CC} mutex/cfa1.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/mutex/cfa1.c -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-cfa2$(EXEEXT): - @${CC} mutex/cfa2.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/mutex/cfa2.c -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-cfa4$(EXEEXT): - @${CC} mutex/cfa4.c -DBENCH_N=5000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/mutex/cfa4.c -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} mutex-java_thread$(EXEEXT): - @javac mutex/JavaThread.java + @javac $(srcdir)/mutex/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd mutex && java JavaThread" >> a.out @@ -603,20 +618,20 @@ signal-pthread_cond$(EXEEXT): - @@BACKEND_CC@ schedint/pthreads.c -DBENCH_N=500000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/schedint/pthreads.c -DBENCH_N=500000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-upp$(EXEEXT): - @u++ schedint/upp.cc -DBENCH_N=5000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/schedint/upp.cc -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-cfa1$(EXEEXT): - @${CC} schedint/cfa1.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedint/cfa1.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-cfa2$(EXEEXT): - @${CC} schedint/cfa2.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedint/cfa2.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-cfa4$(EXEEXT): - @${CC} schedint/cfa4.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedint/cfa4.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} signal-java_thread$(EXEEXT): - @javac schedint/JavaThread.java + @javac $(srcdir)/schedint/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd schedint && java JavaThread" >> a.out @@ -630,14 +645,14 @@ waitfor-upp$(EXEEXT): - @u++ schedext/upp.cc -DBENCH_N=5000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/schedext/upp.cc -DBENCH_N=5000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} waitfor-cfa1$(EXEEXT): - @${CC} schedext/cfa1.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedext/cfa1.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} waitfor-cfa2$(EXEEXT): - @${CC} schedext/cfa2.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedext/cfa2.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} waitfor-cfa4$(EXEEXT): - @${CC} schedext/cfa4.c -DBENCH_N=500000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/schedext/cfa4.c -DBENCH_N=500000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation$(EXEEXT) :\ @@ -652,26 +667,26 @@ creation-cfa_coroutine$(EXEEXT): - @${CC} creation/cfa_cor.c -DBENCH_N=10000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/creation/cfa_cor.c -DBENCH_N=10000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-cfa_coroutine_eager$(EXEEXT): - @${CC} creation/cfa_cor.c -DBENCH_N=10000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER + @${CC} $(srcdir)/creation/cfa_cor.c -DBENCH_N=10000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER creation-cfa_thread$(EXEEXT): - @${CC} creation/cfa_thrd.c -DBENCH_N=10000000 -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} $(srcdir)/creation/cfa_thrd.c -DBENCH_N=10000000 -I$(srcdir) -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-upp_coroutine$(EXEEXT): - @u++ creation/upp_cor.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/creation/upp_cor.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-upp_thread$(EXEEXT): - @u++ creation/upp_thrd.cc -DBENCH_N=50000000 -I. -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @u++ $(srcdir)/creation/upp_thrd.cc -DBENCH_N=50000000 -I$(srcdir) -nodebug -lrt -quiet ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-pthread$(EXEEXT): - @@BACKEND_CC@ creation/pthreads.c -DBENCH_N=250000 -I. -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @@BACKEND_CC@ $(srcdir)/creation/pthreads.c -DBENCH_N=250000 -I$(srcdir) -lrt -pthread ${AM_CFLAGS} ${CFLAGS} ${ccflags} creation-goroutine$(EXEEXT): - @go build -o a.out creation/goroutine.go + @go build -o a.out $(srcdir)/creation/goroutine.go creation-java_thread$(EXEEXT): - @javac creation/JavaThread.java + @javac $(srcdir)/creation/JavaThread.java @echo "#!/bin/sh" > a.out @echo "cd creation && java JavaThread" >> a.out @@ -689,29 +704,29 @@ compile-array$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/array.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/array.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-attributes$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/attributes.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/attributes.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-empty$(EXEEXT): - @${CC} -quiet -fsyntax-only -w compile/empty.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(srcdir)/compile/empty.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-expression$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/expression.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/expression.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-io$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/io1.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/io1.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-monitor$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/concurrent/monitor.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/monitor.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-operators$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/operators.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/operators.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-thread$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/concurrent/thread.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/concurrent/thread.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} compile-typeof$(EXEEXT): - @${CC} -quiet -fsyntax-only -w ../tests/typeof.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} + @${CC} -quiet -fsyntax-only -w $(testdir)/typeof.c @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: src/driver/Makefile.in =================================================================== --- src/driver/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/driver/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -221,5 +221,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -306,5 +305,5 @@ .SUFFIXES: .SUFFIXES: .cc .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -330,7 +329,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): Index: src/driver/cfa.cc =================================================================== --- src/driver/cfa.cc (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/driver/cfa.cc (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -343,4 +343,8 @@ args[nargs] = "--undefined=__cfaabi_interpose_startup"; nargs += 1; + args[nargs] = "-Xlinker"; + nargs += 1; + args[nargs] = "--undefined=__cfaabi_appready_startup"; + nargs += 1; // include the cfa library in case it's needed Index: src/examples/Makefile.in =================================================================== --- src/examples/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/examples/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -231,5 +231,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -310,5 +309,5 @@ .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -334,7 +333,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/libcfa/Makefile.am (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -55,5 +55,5 @@ libobjs = ${headers:=.o} -libsrc = libcfa-prelude.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c startup.c \ +libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c exception.c virtual.c heap.c \ ${headers:=.c} @@ -64,6 +64,13 @@ # 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 - @true + 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 concurrency/libcfa_a-invoke.o : concurrency/invoke.c Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/libcfa/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -148,8 +148,8 @@ libcfa_d_a_AR = $(AR) $(ARFLAGS) libcfa_d_a_LIBADD = -am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c interpose.c \ - bits/debug.c assert.c exception.c virtual.c heap.c startup.c \ - fstream.c iostream.c iterator.c limits.c rational.c time.c \ - stdlib.c common.c containers/maybe.c containers/pair.c \ +am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c startup.c interpose.c \ + bits/debug.c assert.c exception.c virtual.c heap.c fstream.c \ + iostream.c iterator.c limits.c rational.c time.c stdlib.c \ + common.c containers/maybe.c containers/pair.c \ containers/result.c containers/vector.c \ concurrency/coroutine.c concurrency/thread.c \ @@ -177,14 +177,14 @@ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_d_a-preemption.$(OBJEXT) am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) \ - libcfa_d_a-interpose.$(OBJEXT) bits/libcfa_d_a-debug.$(OBJEXT) \ - libcfa_d_a-assert.$(OBJEXT) libcfa_d_a-exception.$(OBJEXT) \ - libcfa_d_a-virtual.$(OBJEXT) libcfa_d_a-heap.$(OBJEXT) \ - libcfa_d_a-startup.$(OBJEXT) $(am__objects_2) $(am__objects_3) + libcfa_d_a-startup.$(OBJEXT) libcfa_d_a-interpose.$(OBJEXT) \ + bits/libcfa_d_a-debug.$(OBJEXT) libcfa_d_a-assert.$(OBJEXT) \ + libcfa_d_a-exception.$(OBJEXT) libcfa_d_a-virtual.$(OBJEXT) \ + libcfa_d_a-heap.$(OBJEXT) $(am__objects_2) $(am__objects_3) am_libcfa_d_a_OBJECTS = $(am__objects_4) libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS) libcfa_a_AR = $(AR) $(ARFLAGS) libcfa_a_LIBADD = -am__libcfa_a_SOURCES_DIST = libcfa-prelude.c interpose.c bits/debug.c \ - assert.c exception.c virtual.c heap.c startup.c fstream.c \ +am__libcfa_a_SOURCES_DIST = libcfa-prelude.c startup.c interpose.c \ + bits/debug.c assert.c exception.c virtual.c heap.c fstream.c \ iostream.c iterator.c limits.c rational.c time.c stdlib.c \ common.c containers/maybe.c containers/pair.c \ @@ -212,8 +212,8 @@ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_a-preemption.$(OBJEXT) am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) \ - libcfa_a-interpose.$(OBJEXT) bits/libcfa_a-debug.$(OBJEXT) \ - libcfa_a-assert.$(OBJEXT) libcfa_a-exception.$(OBJEXT) \ - libcfa_a-virtual.$(OBJEXT) libcfa_a-heap.$(OBJEXT) \ - libcfa_a-startup.$(OBJEXT) $(am__objects_6) $(am__objects_7) + libcfa_a-startup.$(OBJEXT) libcfa_a-interpose.$(OBJEXT) \ + bits/libcfa_a-debug.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \ + libcfa_a-exception.$(OBJEXT) libcfa_a-virtual.$(OBJEXT) \ + libcfa_a-heap.$(OBJEXT) $(am__objects_6) $(am__objects_7) am_libcfa_a_OBJECTS = $(am__objects_8) libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS) @@ -347,5 +347,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -429,7 +428,6 @@ containers/vector $(am__append_3) libobjs = ${headers:=.o} -libsrc = libcfa-prelude.c interpose.c bits/debug.c assert.c \ - exception.c virtual.c heap.c startup.c ${headers:=.c} \ - $(am__append_4) +libsrc = libcfa-prelude.c startup.c interpose.c bits/debug.c assert.c \ + exception.c virtual.c heap.c ${headers:=.c} $(am__append_4) libcfa_a_SOURCES = ${libsrc} libcfa_a_CFLAGS = -nodebug -O2 @@ -456,5 +454,5 @@ .SUFFIXES: .SUFFIXES: .S .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -480,7 +478,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -709,4 +707,18 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-libcfa-prelude.obj `if test -f 'libcfa-prelude.c'; then $(CYGPATH_W) 'libcfa-prelude.c'; else $(CYGPATH_W) '$(srcdir)/libcfa-prelude.c'; fi` +libcfa_d_a-startup.o: startup.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c + +libcfa_d_a-startup.obj: startup.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` + libcfa_d_a-interpose.o: interpose.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-interpose.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-interpose.Tpo -c -o libcfa_d_a-interpose.o `test -f 'interpose.c' || echo '$(srcdir)/'`interpose.c @@ -779,18 +791,4 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi` -libcfa_d_a-startup.o: startup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c - -libcfa_d_a-startup.obj: startup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-startup.Tpo -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-startup.Tpo $(DEPDIR)/libcfa_d_a-startup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_d_a-startup.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o libcfa_d_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` - libcfa_d_a-fstream.o: fstream.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-fstream.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-fstream.Tpo -c -o libcfa_d_a-fstream.o `test -f 'fstream.c' || echo '$(srcdir)/'`fstream.c @@ -1073,4 +1071,18 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-libcfa-prelude.obj `if test -f 'libcfa-prelude.c'; then $(CYGPATH_W) 'libcfa-prelude.c'; else $(CYGPATH_W) '$(srcdir)/libcfa-prelude.c'; fi` +libcfa_a-startup.o: startup.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_a-startup.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c + +libcfa_a-startup.obj: startup.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_a-startup.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` + libcfa_a-interpose.o: interpose.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-interpose.o -MD -MP -MF $(DEPDIR)/libcfa_a-interpose.Tpo -c -o libcfa_a-interpose.o `test -f 'interpose.c' || echo '$(srcdir)/'`interpose.c @@ -1142,18 +1154,4 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-heap.obj `if test -f 'heap.c'; then $(CYGPATH_W) 'heap.c'; else $(CYGPATH_W) '$(srcdir)/heap.c'; fi` - -libcfa_a-startup.o: startup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.o -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_a-startup.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.o `test -f 'startup.c' || echo '$(srcdir)/'`startup.c - -libcfa_a-startup.obj: startup.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-startup.obj -MD -MP -MF $(DEPDIR)/libcfa_a-startup.Tpo -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-startup.Tpo $(DEPDIR)/libcfa_a-startup.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='startup.c' object='libcfa_a-startup.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o libcfa_a-startup.obj `if test -f 'startup.c'; then $(CYGPATH_W) 'startup.c'; else $(CYGPATH_W) '$(srcdir)/startup.c'; fi` libcfa_a-fstream.o: fstream.c @@ -1678,6 +1676,13 @@ # 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 - @true + 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 concurrency/libcfa_a-invoke.o : concurrency/invoke.c Index: src/libcfa/heap.c =================================================================== --- src/libcfa/heap.c (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/libcfa/heap.c (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -10,6 +10,6 @@ // Created On : Tue Dec 19 21:58:35 2017 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jul 25 16:42:02 2018 -// Update Count : 438 +// Last Modified On : Thu Jul 26 22:28:23 2018 +// Update Count : 449 // @@ -111,4 +111,32 @@ // return temp; // } // prtHeapTermOff + + +#ifdef __CFA_DEBUG__ +static unsigned int allocfree; // running total of allocations minus frees +static unsigned int appStart; // storage allocation when application starts + +static void checkUnfreed() { + unsigned int total = allocfree - appStart; + if ( total != 0 ) { + // DO NOT USE STREAMS AS THEY MAY BE UNAVAILABLE AT THIS POINT. + // char helpText[512]; + // int len = snprintf( helpText, 512, "CFA warning (UNIX pid:%ld) : program terminating with %u(0x%x) bytes of storage allocated but not freed.\n" + // "Possible cause is unfreed storage allocated by the program or system/library routines called from the program.\n", + // (long int)getpid(), total, total ); // always print the UNIX pid + // __cfaabi_dbg_bits_write( helpText, len ); + } // if +} // checkUnfreed + +extern "C" { +void heapAppStart() { // called by __cfaabi_appready_startup + appStart = allocfree; +} // heapAppStart + +void heapAppStop() { // called by __cfaabi_appready_startdown + checkUnfreed(); +} // heapAppStop +} // extern "C" +#endif // __CFA_DEBUG__ @@ -139,33 +167,4 @@ static int mmapFd = -1; // fake or actual fd for anonymous file -static unsigned int allocfree; // running total of allocations minus frees -static unsigned int appStart; // storage allocation when application starts - -static void checkUnfreed() { - #ifdef __CFA_DEBUG__ - unsigned int total = allocfree - appStart; - if ( total != 0 ) { - // DO NOT USE STREAMS AS THEY MAY BE UNAVAILABLE AT THIS POINT. - // char helpText[512]; - // int len = snprintf( helpText, 512, "CFA warning (UNIX pid:%ld) : program terminating with %u(0x%x) bytes of storage allocated but not freed.\n" - // "Possible cause is unfreed storage allocated by the program or system/library routines called from the program.\n", - // (long int)getpid(), total, total ); // always print the UNIX pid - // __cfaabi_dbg_bits_write( helpText, len ); - } // if - #endif // __CFA_DEBUG__ -} // checkUnfreed - -#ifdef __CFA_DEBUG__ -extern "C" { -void heapAppStart() { // called by __cfaabi_appready_startup - appStart = allocfree; -} // heapAppStart - -void heapAppStop() { // called by __cfaabi_appready_startdown - checkUnfreed(); -} // heapAppStop -} // extern "C" -#endif // __CFA_DEBUG__ - struct HeapManager { @@ -178,7 +177,7 @@ union { struct { // 32-bit word => 64-bit header, 64-bit word => 128-bit header - #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __U_WORDSIZE__ == 32 + #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __SIZEOF_POINTER__ == 4 uint32_t padding; // unused, force home/blocksize to overlay alignment in fake header - #endif // __U_WORDSIZE__ == 32 && __U_WORDSIZE__ == 32 + #endif // __ORDER_BIG_ENDIAN__ && __U_WORDSIZE__ == 32 union { @@ -191,7 +190,7 @@ }; - #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ && __U_WORDSIZE__ == 32 + #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ && __SIZEOF_POINTER__ == 4 uint32_t padding; // unused, force home/blocksize to overlay alignment in fake header - #endif // __U_WORDSIZE__ == 32 && __U_WORDSIZE__ == 32 + #endif // __ORDER_LITTLE_ENDIAN__ && __U_WORDSIZE__ == 32 }; @@ -204,5 +203,5 @@ #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ uint32_t alignment; // low-order bits of home/blockSize used for tricks - #endif // __BYTE_ORDER__ + #endif // __ORDER_LITTLE_ENDIAN__ uint32_t offset; @@ -210,5 +209,5 @@ #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ uint32_t alignment; // low-order bits of home/blockSize used for tricks - #endif // __BYTE_ORDER__ + #endif // __ORDER_BIG_ENDIAN__ } fake; } kind; @@ -305,4 +304,5 @@ #endif // __CFA_DEBUG__ + assert( heapManager.heapBegin == 0 ); heapManager{}; } // memory_startup @@ -672,5 +672,5 @@ static inline void * malloc2( size_t size ) { // necessary for malloc statistics - assert( heapManager.heapBegin != 0 ) ; // heap started + assert( heapManager.heapBegin != 0 ); void * area = doMalloc( size ); if ( unlikely( area == 0 ) ) errno = ENOMEM; // POSIX Index: src/libcfa/startup.c =================================================================== --- src/libcfa/startup.c (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/libcfa/startup.c (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -1,10 +1,10 @@ -// +// // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo // // The contents of this file are covered under the licence agreement in the // file "LICENCE" distributed with Cforall. -// -// startup.c -- -// +// +// startup.c -- +// // Author : Peter A. Buhr // Created On : Tue Jul 24 16:21:57 2018 @@ -12,5 +12,5 @@ // Last Modified On : Wed Jul 25 16:42:01 2018 // Update Count : 11 -// +// #include "startup.h" @@ -39,4 +39,7 @@ } // extern "C" +struct __spinlock_t; +void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {} + // Local Variables: // // mode: c // Index: src/libcfa/stdlib =================================================================== --- src/libcfa/stdlib (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/libcfa/stdlib (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -10,6 +10,6 @@ // Created On : Thu Jan 28 17:12:35 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Mon Jul 23 07:44:47 2018 -// Update Count : 341 +// Last Modified On : Fri Jul 27 07:21:36 2018 +// Update Count : 345 // @@ -19,5 +19,5 @@ extern "C" { void * memalign( size_t align, size_t size ); // malloc.h - void * memset( void * dest, int c, size_t size ); // string.h + void * memset( void * dest, int fill, size_t size ); // string.h void * memcpy( void * dest, const void * src, size_t size ); // string.h void * cmemalign( size_t alignment, size_t noOfElems, size_t elemSize ); // CFA @@ -127,6 +127,6 @@ // data, non-array types - T * memset( T * dest, char c ) { - return (T *)memset( dest, c, sizeof(T) ); + T * memset( T * dest, char fill ) { + return (T *)memset( dest, fill, sizeof(T) ); } // memset @@ -139,11 +139,11 @@ // data, array types - T * memset( T dest[], size_t dim, char c ) { - return (T *)(void *)memset( dest, c, dim * sizeof(T) ); // C memset - } // memset - - T * memcpy( T dest[], const T src[], size_t dim ) { + T * amemset( T dest[], char fill, size_t dim ) { + return (T *)(void *)memset( dest, fill, dim * sizeof(T) ); // C memset + } // amemset + + T * amemcpy( T dest[], const T src[], size_t dim ) { return (T *)(void *)memcpy( dest, src, dim * sizeof(T) ); // C memcpy - } // memcpy + } // amemcpy } // distribution @@ -203,6 +203,4 @@ E * bsearchu( E key, const E * vals, size_t dim ); size_t bsearchu( E key, const E * vals, size_t dim ); - - void qsort( E * vals, size_t dim ); } // distribution @@ -214,4 +212,8 @@ E * bsearchu( K key, const E * vals, size_t dim ); size_t bsearchu( K key, const E * vals, size_t dim ); +} // distribution + +forall( otype E | { int ? $(test), ) \ + -XCFA \ + -t \ + -B${abs_top_builddir}/src/driver \ + -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_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. if !BUILD_DEBUG -BUILD_FLAGS += -nodebug +AM_CFLAGS += -nodebug else if !BUILD_RELEASE -BUILD_FLAGS += -debug +AM_CFLAGS += -debug else -BUILD_FLAGS += ${DEBUG_FLAGS} +AM_CFLAGS += ${DEBUG_FLAGS} endif endif -TEST_FLAGS = $(if $(test), 2> $(test), ) -AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS} -CC = ${abs_top_builddir}/src/driver/cfa -DIN_DIR="${srcdir}/.in/" +CC = ${abs_top_builddir}/src/driver/cfa .PHONY : list @@ -50,8 +61,6 @@ fstream_test_SOURCES = fstream_test.c -fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} 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 -avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} all-local : @@ -70,67 +79,81 @@ @+${TEST_PY} --debug=${debug} -Iconcurrent -% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@ +# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated +# however, here it is more complicated because it must match the dependencies based on how +# they are generated by gcc +headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*") +headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers)) +headers_deps = $(addprefix %/, $(headers_real)) +$(headers_deps) : + echo "Dummy rule, should never be called" + +# %/stdlib: +# echo "Dummy rule, should never be called" + +# implicit rule so not all test require a rule +% : %.c $(CC) + echo $(headers_deps) $(COMPILE) $(abspath ${<}) -o ${@} -declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@ +declarationSpecifier: declarationSpecifier.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@ +gccExtensions : gccExtensions.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -extension : extension.c @CFA_BINDIR@/@CFA_NAME@ +extension : extension.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@ +attributes : attributes.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -functions: functions.c @CFA_BINDIR@/@CFA_NAME@ +functions: functions.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@ +KRfunctions : KRfunctions.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@ +sched-ext-parse : sched-ext-parse.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@ +gmp : gmp.c $(CC) $(COMPILE) -lgmp $(abspath ${<}) -o ${@} -completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@ +completeTypeError : completeTypeError.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@ +typedefRedef-ERR1: typedefRedef.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@ +alloc-ERROR: alloc.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@ +fallthrough-ERROR: fallthrough.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@ +nested-types-ERR1: nested-types.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@ +nested-types-ERR2: nested-types.c $(CC) $(COMPILE) -DERR2 $(abspath ${<}) -o ${@} # Constructor/destructor tests -raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@ +raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@ +raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC) $(COMPILE) -DERR2 $(abspath ${<}) -o ${@} -raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@ +raii/memberCtors-ERR1: raii/memberCtors.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@ +raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} # Warnings -warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@ +warnings/self-assignment: warnings/self-assignment.c $(CC) $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only #builtins -builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@ +builtins/sync: builtins/sync.c $(CC) $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only Index: src/tests/Makefile.in =================================================================== --- src/tests/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/tests/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -104,22 +104,15 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = config.py -CONFIG_CLEAN_VPATH_FILES = +CONFIG_CLEAN_VPATH_FILES = test.py am__dirstamp = $(am__leading_dot)dirstamp -am_avl_test_OBJECTS = avltree/avl_test-avl_test.$(OBJEXT) \ - avltree/avl_test-avl0.$(OBJEXT) \ - avltree/avl_test-avl1.$(OBJEXT) \ - avltree/avl_test-avl2.$(OBJEXT) \ - avltree/avl_test-avl3.$(OBJEXT) \ - avltree/avl_test-avl4.$(OBJEXT) \ - avltree/avl_test-avl-private.$(OBJEXT) +am_avl_test_OBJECTS = avltree/avl_test.$(OBJEXT) \ + avltree/avl0.$(OBJEXT) avltree/avl1.$(OBJEXT) \ + avltree/avl2.$(OBJEXT) avltree/avl3.$(OBJEXT) \ + avltree/avl4.$(OBJEXT) avltree/avl-private.$(OBJEXT) avl_test_OBJECTS = $(am_avl_test_OBJECTS) avl_test_LDADD = $(LDADD) -avl_test_LINK = $(CCLD) $(avl_test_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -am_fstream_test_OBJECTS = fstream_test-fstream_test.$(OBJEXT) +am_fstream_test_OBJECTS = fstream_test.$(OBJEXT) fstream_test_OBJECTS = $(am_fstream_test_OBJECTS) fstream_test_LDADD = $(LDADD) -fstream_test_LINK = $(CCLD) $(fstream_test_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -138,8 +131,4 @@ am__depfiles_maybe = depfiles am__mv = mv -f -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -181,5 +170,5 @@ CTAGS = ctags am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.py.in \ - $(top_srcdir)/automake/depcomp + $(srcdir)/test.py $(top_srcdir)/automake/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -192,5 +181,5 @@ AWK = @AWK@ BACKEND_CC = @BACKEND_CC@ -CC = ${abs_top_builddir}/src/driver/cfa -DIN_DIR="${srcdir}/.in/" +CC = ${abs_top_builddir}/src/driver/cfa CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -232,5 +221,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -310,18 +298,27 @@ # applies to both programs -DEBUG_FLAGS = -BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -I. \ - $(am__append_1) $(am__append_2) $(am__append_3) -TEST_FLAGS = $(if $(test), 2> $(test), ) -AM_CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS} +AM_CFLAGS = $(if $(test), 2> $(test), ) -XCFA -t \ + -B${abs_top_builddir}/src/driver -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) fstream_test_SOURCES = fstream_test.c -fstream_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} 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 -avl_test_CFLAGS = $(if $(test), 2>> $(test), ) ${BUILD_FLAGS} + +# SKULLDUGGERY like libcfa/Makefile.am prevent extensionless headers from being generated +# however, here it is more complicated because it must match the dependencies based on how +# they are generated by gcc +headers = $(shell find $(top_srcdir)/src/libcfa -type f ! -name "*.*") +headers_real = $(shell realpath --relative-to=$(top_srcdir)/src/libcfa $(headers)) +headers_deps = $(addprefix %/, $(headers_real)) all: all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -347,7 +344,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): @@ -360,26 +357,26 @@ @$(MKDIR_P) avltree/$(DEPDIR) @: > avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl_test.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl_test.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl0.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl0.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl1.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl1.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl2.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl2.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl3.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl3.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl4.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl4.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) -avltree/avl_test-avl-private.$(OBJEXT): avltree/$(am__dirstamp) \ +avltree/avl-private.$(OBJEXT): avltree/$(am__dirstamp) \ avltree/$(DEPDIR)/$(am__dirstamp) avl_test$(EXEEXT): $(avl_test_OBJECTS) $(avl_test_DEPENDENCIES) $(EXTRA_avl_test_DEPENDENCIES) @rm -f avl_test$(EXEEXT) - $(AM_V_CCLD)$(avl_test_LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(avl_test_OBJECTS) $(avl_test_LDADD) $(LIBS) fstream_test$(EXEEXT): $(fstream_test_OBJECTS) $(fstream_test_DEPENDENCIES) $(EXTRA_fstream_test_DEPENDENCIES) @rm -f fstream_test$(EXEEXT) - $(AM_V_CCLD)$(fstream_test_LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(fstream_test_OBJECTS) $(fstream_test_LDADD) $(LIBS) mostlyclean-compile: @@ -390,12 +387,12 @@ -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test-fstream_test.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl-private.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl0.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl4.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test-avl_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstream_test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl-private.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl3.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl4.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@avltree/$(DEPDIR)/avl_test.Po@am__quote@ .c.o: @@ -414,116 +411,4 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -avltree/avl_test-avl_test.o: avltree/avl_test.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl_test.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl_test.Tpo -c -o avltree/avl_test-avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl_test.Tpo avltree/$(DEPDIR)/avl_test-avl_test.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl_test.c' object='avltree/avl_test-avl_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl_test.o `test -f 'avltree/avl_test.c' || echo '$(srcdir)/'`avltree/avl_test.c - -avltree/avl_test-avl_test.obj: avltree/avl_test.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl_test.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl_test.Tpo -c -o avltree/avl_test-avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl_test.Tpo avltree/$(DEPDIR)/avl_test-avl_test.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl_test.c' object='avltree/avl_test-avl_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl_test.obj `if test -f 'avltree/avl_test.c'; then $(CYGPATH_W) 'avltree/avl_test.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl_test.c'; fi` - -avltree/avl_test-avl0.o: avltree/avl0.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl0.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl0.Tpo -c -o avltree/avl_test-avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl0.Tpo avltree/$(DEPDIR)/avl_test-avl0.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl0.c' object='avltree/avl_test-avl0.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl0.o `test -f 'avltree/avl0.c' || echo '$(srcdir)/'`avltree/avl0.c - -avltree/avl_test-avl0.obj: avltree/avl0.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl0.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl0.Tpo -c -o avltree/avl_test-avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl0.Tpo avltree/$(DEPDIR)/avl_test-avl0.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl0.c' object='avltree/avl_test-avl0.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl0.obj `if test -f 'avltree/avl0.c'; then $(CYGPATH_W) 'avltree/avl0.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl0.c'; fi` - -avltree/avl_test-avl1.o: avltree/avl1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl1.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl1.Tpo -c -o avltree/avl_test-avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl1.Tpo avltree/$(DEPDIR)/avl_test-avl1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl1.c' object='avltree/avl_test-avl1.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl1.o `test -f 'avltree/avl1.c' || echo '$(srcdir)/'`avltree/avl1.c - -avltree/avl_test-avl1.obj: avltree/avl1.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl1.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl1.Tpo -c -o avltree/avl_test-avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl1.Tpo avltree/$(DEPDIR)/avl_test-avl1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl1.c' object='avltree/avl_test-avl1.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl1.obj `if test -f 'avltree/avl1.c'; then $(CYGPATH_W) 'avltree/avl1.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl1.c'; fi` - -avltree/avl_test-avl2.o: avltree/avl2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl2.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl2.Tpo -c -o avltree/avl_test-avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl2.Tpo avltree/$(DEPDIR)/avl_test-avl2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl2.c' object='avltree/avl_test-avl2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl2.o `test -f 'avltree/avl2.c' || echo '$(srcdir)/'`avltree/avl2.c - -avltree/avl_test-avl2.obj: avltree/avl2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl2.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl2.Tpo -c -o avltree/avl_test-avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl2.Tpo avltree/$(DEPDIR)/avl_test-avl2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl2.c' object='avltree/avl_test-avl2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl2.obj `if test -f 'avltree/avl2.c'; then $(CYGPATH_W) 'avltree/avl2.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl2.c'; fi` - -avltree/avl_test-avl3.o: avltree/avl3.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl3.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl3.Tpo -c -o avltree/avl_test-avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl3.Tpo avltree/$(DEPDIR)/avl_test-avl3.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl3.c' object='avltree/avl_test-avl3.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl3.o `test -f 'avltree/avl3.c' || echo '$(srcdir)/'`avltree/avl3.c - -avltree/avl_test-avl3.obj: avltree/avl3.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl3.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl3.Tpo -c -o avltree/avl_test-avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl3.Tpo avltree/$(DEPDIR)/avl_test-avl3.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl3.c' object='avltree/avl_test-avl3.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl3.obj `if test -f 'avltree/avl3.c'; then $(CYGPATH_W) 'avltree/avl3.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl3.c'; fi` - -avltree/avl_test-avl4.o: avltree/avl4.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl4.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl4.Tpo -c -o avltree/avl_test-avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl4.Tpo avltree/$(DEPDIR)/avl_test-avl4.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl4.c' object='avltree/avl_test-avl4.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl4.o `test -f 'avltree/avl4.c' || echo '$(srcdir)/'`avltree/avl4.c - -avltree/avl_test-avl4.obj: avltree/avl4.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl4.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl4.Tpo -c -o avltree/avl_test-avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl4.Tpo avltree/$(DEPDIR)/avl_test-avl4.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl4.c' object='avltree/avl_test-avl4.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl4.obj `if test -f 'avltree/avl4.c'; then $(CYGPATH_W) 'avltree/avl4.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl4.c'; fi` - -avltree/avl_test-avl-private.o: avltree/avl-private.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl-private.o -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl-private.Tpo -c -o avltree/avl_test-avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl-private.Tpo avltree/$(DEPDIR)/avl_test-avl-private.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl-private.c' object='avltree/avl_test-avl-private.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl-private.o `test -f 'avltree/avl-private.c' || echo '$(srcdir)/'`avltree/avl-private.c - -avltree/avl_test-avl-private.obj: avltree/avl-private.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -MT avltree/avl_test-avl-private.obj -MD -MP -MF avltree/$(DEPDIR)/avl_test-avl-private.Tpo -c -o avltree/avl_test-avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) avltree/$(DEPDIR)/avl_test-avl-private.Tpo avltree/$(DEPDIR)/avl_test-avl-private.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avltree/avl-private.c' object='avltree/avl_test-avl-private.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(avl_test_CFLAGS) $(CFLAGS) -c -o avltree/avl_test-avl-private.obj `if test -f 'avltree/avl-private.c'; then $(CYGPATH_W) 'avltree/avl-private.c'; else $(CYGPATH_W) '$(srcdir)/avltree/avl-private.c'; fi` - -fstream_test-fstream_test.o: fstream_test.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -MT fstream_test-fstream_test.o -MD -MP -MF $(DEPDIR)/fstream_test-fstream_test.Tpo -c -o fstream_test-fstream_test.o `test -f 'fstream_test.c' || echo '$(srcdir)/'`fstream_test.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fstream_test-fstream_test.Tpo $(DEPDIR)/fstream_test-fstream_test.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fstream_test.c' object='fstream_test-fstream_test.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.o `test -f 'fstream_test.c' || echo '$(srcdir)/'`fstream_test.c - -fstream_test-fstream_test.obj: fstream_test.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -MT fstream_test-fstream_test.obj -MD -MP -MF $(DEPDIR)/fstream_test-fstream_test.Tpo -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/fstream_test-fstream_test.Tpo $(DEPDIR)/fstream_test-fstream_test.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fstream_test.c' object='fstream_test-fstream_test.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(fstream_test_CFLAGS) $(CFLAGS) -c -o fstream_test-fstream_test.obj `if test -f 'fstream_test.c'; then $(CYGPATH_W) 'fstream_test.c'; else $(CYGPATH_W) '$(srcdir)/fstream_test.c'; fi` ID: $(am__tagged_files) @@ -748,69 +633,76 @@ concurrency : @+${TEST_PY} --debug=${debug} -Iconcurrent - -% : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@ +$(headers_deps) : + echo "Dummy rule, should never be called" + +# %/stdlib: +# echo "Dummy rule, should never be called" + +# implicit rule so not all test require a rule +% : %.c $(CC) + echo $(headers_deps) $(COMPILE) $(abspath ${<}) -o ${@} -declarationSpecifier: declarationSpecifier.c @CFA_BINDIR@/@CFA_NAME@ +declarationSpecifier: declarationSpecifier.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -gccExtensions : gccExtensions.c @CFA_BINDIR@/@CFA_NAME@ +gccExtensions : gccExtensions.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -extension : extension.c @CFA_BINDIR@/@CFA_NAME@ +extension : extension.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -attributes : attributes.c @CFA_BINDIR@/@CFA_NAME@ +attributes : attributes.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -functions: functions.c @CFA_BINDIR@/@CFA_NAME@ +functions: functions.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -KRfunctions : KRfunctions.c @CFA_BINDIR@/@CFA_NAME@ +KRfunctions : KRfunctions.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@ +sched-ext-parse : sched-ext-parse.c $(CC) $(COMPILE) -CFA -XCFA -p $(abspath ${<}) -o ${@} -gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@ +gmp : gmp.c $(CC) $(COMPILE) -lgmp $(abspath ${<}) -o ${@} -completeTypeError : completeTypeError.c @CFA_BINDIR@/@CFA_NAME@ +completeTypeError : completeTypeError.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -typedefRedef-ERR1: typedefRedef.c @CFA_BINDIR@/@CFA_NAME@ +typedefRedef-ERR1: typedefRedef.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -alloc-ERROR: alloc.c @CFA_BINDIR@/@CFA_NAME@ +alloc-ERROR: alloc.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -fallthrough-ERROR: fallthrough.c @CFA_BINDIR@/@CFA_NAME@ +fallthrough-ERROR: fallthrough.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -nested-types-ERR1: nested-types.c @CFA_BINDIR@/@CFA_NAME@ +nested-types-ERR1: nested-types.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -nested-types-ERR2: nested-types.c @CFA_BINDIR@/@CFA_NAME@ +nested-types-ERR2: nested-types.c $(CC) $(COMPILE) -DERR2 $(abspath ${<}) -o ${@} # Constructor/destructor tests -raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@ +raii/dtor-early-exit-ERR1: raii/dtor-early-exit.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c @CFA_BINDIR@/@CFA_NAME@ +raii/dtor-early-exit-ERR2: raii/dtor-early-exit.c $(CC) $(COMPILE) -DERR2 $(abspath ${<}) -o ${@} -raii/memberCtors-ERR1: raii/memberCtors.c @CFA_BINDIR@/@CFA_NAME@ +raii/memberCtors-ERR1: raii/memberCtors.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} -raii/ctor-autogen-ERR1: raii/ctor-autogen.c @CFA_BINDIR@/@CFA_NAME@ +raii/ctor-autogen-ERR1: raii/ctor-autogen.c $(CC) $(COMPILE) -DERR1 $(abspath ${<}) -o ${@} # Warnings -warnings/self-assignment: warnings/self-assignment.c @CFA_BINDIR@/@CFA_NAME@ +warnings/self-assignment: warnings/self-assignment.c $(CC) $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only #builtins -builtins/sync: builtins/sync.c @CFA_BINDIR@/@CFA_NAME@ +builtins/sync: builtins/sync.c $(CC) $(COMPILE) $(abspath ${<}) 2> ${@} -fsyntax-only Index: src/tests/alloc.c =================================================================== --- src/tests/alloc.c (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/tests/alloc.c (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -10,6 +10,6 @@ // Created On : Wed Feb 3 07:56:22 2016 // Last Modified By : Peter A. Buhr -// Last Modified On : Wed Jul 25 09:09:43 2018 -// Update Count : 331 +// Last Modified On : Thu Jul 26 20:58:05 2018 +// Update Count : 334 // @@ -219,11 +219,11 @@ printf( "\n" ); - memset( sta, dim, fill ); // CFA array memset, type safe + amemset( sta, fill, dim ); // CFA array memset, type safe printf( "CFA array memset\n" ); for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", sta[i].x, sta[i].y ); } printf( "\n" ); - memcpy( sta1, sta, dim ); // CFA array memcpy, type safe - printf( "CFA memcpy\n" ); + amemcpy( sta1, sta, dim ); // CFA array memcpy, type safe + printf( "CFA array memcpy\n" ); for ( int i = 0; i < dim; i += 1 ) { printf( "%#x %a, ", sta1[i].x, sta1[i].y ); } printf( "\n" ); Index: src/tests/preempt_longrun/Makefile.am =================================================================== --- src/tests/preempt_longrun/Makefile.am (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/tests/preempt_longrun/Makefile.am (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -32,5 +32,5 @@ BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt} -I.. -I. -DTEST_$(shell cat .type | tr a-z A-Z) CFLAGS = ${BUILD_FLAGS} -CC = @CFA_BINDIR@/@CFA_NAME@ +CC = ${top_builddir}/src/driver/cfa TESTS = block coroutine create disjoint enter enter3 processor stack wait yield Index: src/tests/preempt_longrun/Makefile.in =================================================================== --- src/tests/preempt_longrun/Makefile.in (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/tests/preempt_longrun/Makefile.in (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -337,5 +337,5 @@ AWK = @AWK@ BACKEND_CC = @BACKEND_CC@ -CC = @CFA_BINDIR@/@CFA_NAME@ +CC = ${top_builddir}/src/driver/cfa CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -377,5 +377,4 @@ LTLIBOBJS = @LTLIBOBJS@ MACHINE_TYPE = @MACHINE_TYPE@ -MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ @@ -466,5 +465,5 @@ .SUFFIXES: .SUFFIXES: .log .test .test$(EXEEXT) .trs -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -490,7 +489,7 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +$(top_srcdir)/configure: $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): Index: src/tests/pybin/tools.py =================================================================== --- src/tests/pybin/tools.py (revision ba4a1d8c09106fcb307f09f287e5b399769b864c) +++ src/tests/pybin/tools.py (revision 04e367c3642ecfb66bd6da179b6b0b0db1ac9787) @@ -171,6 +171,5 @@ # Start the walk - abspath = os.path.abspath(__main__.__file__) - dname = os.path.dirname(abspath) + dname = settings.SRCDIR os.path.walk(dname, step, '')