Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision 561f7308676f4263e3d2c5d41e9c1cf1d336fd5f) +++ src/libcfa/Makefile.am (revision a32cfc9003ca64a94d1135465f24c0a7d67ad69c) @@ -11,6 +11,6 @@ ## Created On : Sun May 31 08:54:01 2015 ## Last Modified By : Peter A. Buhr -## Last Modified On : Sat May 13 22:36:06 2017 -## Update Count : 213 +## Last Modified On : Sun May 14 21:04:21 2017 +## Update Count : 214 ############################################################################### @@ -41,5 +41,5 @@ CC = ${abs_top_srcdir}/src/driver/cfa -headers = limits stdlib math iostream fstream iterator rational gmp assert containers/pair containers/vector +headers = limits stdlib math iostream fstream iterator rational assert containers/pair containers/vector # not all platforms support concurrency, add option do disable it @@ -76,5 +76,5 @@ cfa_includedir = $(CFA_INCDIR) -nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h +nobase_cfa_include_HEADERS = ${headers} ${stdhdr} gmp concurrency/invoke.h CLEANFILES = libcfa-prelude.c Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision 561f7308676f4263e3d2c5d41e9c1cf1d336fd5f) +++ src/libcfa/Makefile.in (revision a32cfc9003ca64a94d1135465f24c0a7d67ad69c) @@ -99,6 +99,6 @@ am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c interpose.c \ libhdr/libdebug.c limits.c stdlib.c math.c iostream.c \ - fstream.c iterator.c rational.c gmp.c assert.c \ - containers/pair.c containers/vector.c concurrency/coroutine.c \ + fstream.c iterator.c rational.c assert.c containers/pair.c \ + containers/vector.c concurrency/coroutine.c \ concurrency/thread.c concurrency/kernel.c \ concurrency/monitor.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \ @@ -113,5 +113,5 @@ libcfa_d_a-iostream.$(OBJEXT) libcfa_d_a-fstream.$(OBJEXT) \ libcfa_d_a-iterator.$(OBJEXT) libcfa_d_a-rational.$(OBJEXT) \ - libcfa_d_a-gmp.$(OBJEXT) libcfa_d_a-assert.$(OBJEXT) \ + libcfa_d_a-assert.$(OBJEXT) \ containers/libcfa_d_a-pair.$(OBJEXT) \ containers/libcfa_d_a-vector.$(OBJEXT) $(am__objects_1) @@ -128,6 +128,6 @@ am__libcfa_a_SOURCES_DIST = libcfa-prelude.c interpose.c \ libhdr/libdebug.c limits.c stdlib.c math.c iostream.c \ - fstream.c iterator.c rational.c gmp.c assert.c \ - containers/pair.c containers/vector.c concurrency/coroutine.c \ + fstream.c iterator.c rational.c assert.c containers/pair.c \ + containers/vector.c concurrency/coroutine.c \ concurrency/thread.c concurrency/kernel.c \ concurrency/monitor.c concurrency/CtxSwitch-@MACHINE_TYPE@.S \ @@ -140,6 +140,6 @@ libcfa_a-math.$(OBJEXT) libcfa_a-iostream.$(OBJEXT) \ libcfa_a-fstream.$(OBJEXT) libcfa_a-iterator.$(OBJEXT) \ - libcfa_a-rational.$(OBJEXT) libcfa_a-gmp.$(OBJEXT) \ - libcfa_a-assert.$(OBJEXT) containers/libcfa_a-pair.$(OBJEXT) \ + libcfa_a-rational.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \ + containers/libcfa_a-pair.$(OBJEXT) \ containers/libcfa_a-vector.$(OBJEXT) $(am__objects_5) @BUILD_CONCURRENCY_TRUE@am__objects_7 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \ @@ -180,8 +180,8 @@ $(am__libcfa_a_SOURCES_DIST) am__nobase_cfa_include_HEADERS_DIST = limits stdlib math iostream \ - fstream iterator rational gmp assert containers/pair \ + fstream iterator rational assert containers/pair \ containers/vector concurrency/coroutine concurrency/thread \ concurrency/kernel concurrency/monitor ${shell echo stdhdr/*} \ - concurrency/invoke.h + gmp concurrency/invoke.h HEADERS = $(nobase_cfa_include_HEADERS) ETAGS = etags @@ -313,6 +313,6 @@ EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@ AM_CCASFLAGS = @CFA_FLAGS@ -headers = limits stdlib math iostream fstream iterator rational gmp \ - assert containers/pair containers/vector $(am__append_3) +headers = limits stdlib math iostream fstream iterator rational assert \ + containers/pair containers/vector $(am__append_3) libobjs = ${headers:=.o} libsrc = libcfa-prelude.c interpose.c libhdr/libdebug.c ${headers:=.c} \ @@ -324,5 +324,5 @@ stdhdr = ${shell echo stdhdr/*} cfa_includedir = $(CFA_INCDIR) -nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h +nobase_cfa_include_HEADERS = ${headers} ${stdhdr} gmp concurrency/invoke.h CLEANFILES = libcfa-prelude.c all: all-am @@ -478,5 +478,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-assert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-fstream.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-gmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-interpose.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_a-iostream.Po@am__quote@ @@ -489,5 +488,4 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-assert.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-fstream.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-gmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-interpose.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcfa_d_a-iostream.Po@am__quote@ @@ -681,18 +679,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-rational.obj `if test -f 'rational.c'; then $(CYGPATH_W) 'rational.c'; else $(CYGPATH_W) '$(srcdir)/rational.c'; fi` -libcfa_d_a-gmp.o: gmp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-gmp.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-gmp.Tpo -c -o libcfa_d_a-gmp.o `test -f 'gmp.c' || echo '$(srcdir)/'`gmp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-gmp.Tpo $(DEPDIR)/libcfa_d_a-gmp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmp.c' object='libcfa_d_a-gmp.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-gmp.o `test -f 'gmp.c' || echo '$(srcdir)/'`gmp.c - -libcfa_d_a-gmp.obj: gmp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-gmp.obj -MD -MP -MF $(DEPDIR)/libcfa_d_a-gmp.Tpo -c -o libcfa_d_a-gmp.obj `if test -f 'gmp.c'; then $(CYGPATH_W) 'gmp.c'; else $(CYGPATH_W) '$(srcdir)/gmp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_d_a-gmp.Tpo $(DEPDIR)/libcfa_d_a-gmp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmp.c' object='libcfa_d_a-gmp.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-gmp.obj `if test -f 'gmp.c'; then $(CYGPATH_W) 'gmp.c'; else $(CYGPATH_W) '$(srcdir)/gmp.c'; fi` - libcfa_d_a-assert.o: assert.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT libcfa_d_a-assert.o -MD -MP -MF $(DEPDIR)/libcfa_d_a-assert.Tpo -c -o libcfa_d_a-assert.o `test -f 'assert.c' || echo '$(srcdir)/'`assert.c @@ -932,18 +916,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-rational.obj `if test -f 'rational.c'; then $(CYGPATH_W) 'rational.c'; else $(CYGPATH_W) '$(srcdir)/rational.c'; fi` - -libcfa_a-gmp.o: gmp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-gmp.o -MD -MP -MF $(DEPDIR)/libcfa_a-gmp.Tpo -c -o libcfa_a-gmp.o `test -f 'gmp.c' || echo '$(srcdir)/'`gmp.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-gmp.Tpo $(DEPDIR)/libcfa_a-gmp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmp.c' object='libcfa_a-gmp.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-gmp.o `test -f 'gmp.c' || echo '$(srcdir)/'`gmp.c - -libcfa_a-gmp.obj: gmp.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT libcfa_a-gmp.obj -MD -MP -MF $(DEPDIR)/libcfa_a-gmp.Tpo -c -o libcfa_a-gmp.obj `if test -f 'gmp.c'; then $(CYGPATH_W) 'gmp.c'; else $(CYGPATH_W) '$(srcdir)/gmp.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcfa_a-gmp.Tpo $(DEPDIR)/libcfa_a-gmp.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gmp.c' object='libcfa_a-gmp.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-gmp.obj `if test -f 'gmp.c'; then $(CYGPATH_W) 'gmp.c'; else $(CYGPATH_W) '$(srcdir)/gmp.c'; fi` libcfa_a-assert.o: assert.c