Changes in / [d93d980:25f49f4]

Files:

• Makefile.in (modified) (1 diff)
• config.h.in (modified) (2 diffs)
• configure (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (2 diffs)
• src/driver/Makefile.am (modified) (2 diffs)
• src/driver/Makefile.in (modified) (2 diffs)
• src/driver/cfa.cc (modified) (2 diffs)
• src/examples/Makefile.in (modified) (1 diff)
• src/libcfa/Makefile.in (modified) (1 diff)
• src/tests/Makefile.in (modified) (1 diff)
• version (deleted)

Makefile.in

@@ -132 +132 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

config.h.in

@@ -19 +19 @@
 #undef CFA_PREFIX
 
-/* Major.Minor */
-#undef CFA_VERSION
-
-/* Build version number. */
-#undef CFA_VERSION_BUILD
-
-/* Major.Minor.Patch.Build */
-#undef CFA_VERSION_FULL
-
-/* Major.Minor.Patch */
-#undef CFA_VERSION_LONG
-
 /* Major version number. */
 #undef CFA_VERSION_MAJOR
@@ -39 +27 @@
 /* Patch version number. */
 #undef CFA_VERSION_PATCH
-
-/* Major */
-#undef CFA_VERSION_SHORT
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP

configure

@@ -646 +646 @@
 CFA_BACKEND_CC
 BACKEND_CC
-CONFIG_STATUS_DEPENDENCIES
 MAINT
 MAINTAINER_MODE_FALSE
@@ -2965 +2964 @@
                         # may require auto* software to be installed
 
-ver_major=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\1/'`
-ver_minor=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\2/'`
-ver_patch=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\3/'`
-ver_build=`cat version | sed -r 's/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/\4/'`
-ver_short="\"${ver_major}\""
-ver__long="\"${ver_major}.${ver_minor}\""
-ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
-ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
-
-CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version'
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_MAJOR ${ver_major}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_MINOR ${ver_minor}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_PATCH ${ver_patch}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_BUILD ${ver_build}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_SHORT ${ver_short}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION ${ver__long}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_LONG ${ver__norm}
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define CFA_VERSION_FULL ${ver__full}
-_ACEOF
+
+$as_echo "#define CFA_VERSION_MAJOR \"1\"" >>confdefs.h
+
+
+$as_echo "#define CFA_VERSION_MINOR \"0\"" >>confdefs.h
+
+
+$as_echo "#define CFA_VERSION_PATCH \"0\"" >>confdefs.h
 
 

configure.ac

@@ -18 +18 @@
 AM_MAINTAINER_MODE(enable)                      # may require auto* software to be installed
 
-ver_major=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\1/'`
-ver_minor=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\2/'`
-ver_patch=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\3/'`
-ver_build=`cat version | sed -r 's/([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)\.([[0-9]]+)/\4/'`
-ver_short="\"${ver_major}\""
-ver__long="\"${ver_major}.${ver_minor}\""
-ver__norm="\"${ver_major}.${ver_minor}.${ver_patch}\""
-ver__full="\"${ver_major}.${ver_minor}.${ver_patch}.${ver_build}\""
-
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/version'])
-AC_DEFINE_UNQUOTED(CFA_VERSION_MAJOR, ${ver_major}, [Major version number.])
-AC_DEFINE_UNQUOTED(CFA_VERSION_MINOR, ${ver_minor}, [Minor version number.])
-AC_DEFINE_UNQUOTED(CFA_VERSION_PATCH, ${ver_patch}, [Patch version number.])
-AC_DEFINE_UNQUOTED(CFA_VERSION_BUILD, ${ver_build}, [Build version number.])
-AC_DEFINE_UNQUOTED(CFA_VERSION_SHORT, ${ver_short}, [Major])
-AC_DEFINE_UNQUOTED(CFA_VERSION, ${ver__long}, [Major.Minor])
-AC_DEFINE_UNQUOTED(CFA_VERSION_LONG, ${ver__norm}, [Major.Minor.Patch])
-AC_DEFINE_UNQUOTED(CFA_VERSION_FULL, ${ver__full}, [Major.Minor.Patch.Build])
+AC_DEFINE(CFA_VERSION_MAJOR, "1", [Major version number.])
+AC_DEFINE(CFA_VERSION_MINOR, "0", [Minor version number.])
+AC_DEFINE(CFA_VERSION_PATCH, "0", [Patch version number.])
 
 # Installation paths

src/Makefile.am

@@ -41 +41 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -Xlinker -export-dynamic -I${abs_top_srcdir}/src/include
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
 
 MAINTAINERCLEANFILES += ${libdir}/${notdir ${cfa_cpplib_PROGRAMS}}

src/Makefile.in

@@ -266 +266 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -418 +417 @@
 driver_cfa_cpp_SOURCES = ${SRC}
 driver_cfa_cpp_LDADD = ${LEXLIB} -ldl                   # yywrap
-driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -Xlinker -export-dynamic -I${abs_top_srcdir}/src/include
+driver_cfa_cpp_CXXFLAGS = -Wno-deprecated -Wall -DDEBUG_ALL -rdynamic -I${abs_top_srcdir}/src/include
 all: $(BUILT_SOURCES)
         $(MAKE) $(AM_MAKEFLAGS) all-am

src/driver/Makefile.am

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## Makefile.am --
+## Makefile.am -- 
 ##
 ## Author           : Peter A. Buhr
@@ -26 +26 @@
 cc1_SOURCES = cc1.cc
 
-cfa.cc : ${abs_top_srcdir}/version
-        @true
-
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

src/driver/Makefile.in

@@ -100 +100 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -543 +542 @@
 
 
-cfa.cc : ${abs_top_srcdir}/version
-        @true
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/driver/cfa.cc

@@ -25 +25 @@
 using std::endl;
 using std::string;
-using std::to_string;
 
 
@@ -51 +50 @@
 
 int main( int argc, char *argv[] ) {
-        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
-        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
+        string Version( VERSION );                                                      // current version number from CONFIG
+        string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
 
         string installincdir( CFA_INCDIR );                                     // fixed location of include files

src/examples/Makefile.in

@@ -111 +111 @@
 # applies to both programs
 CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

src/libcfa/Makefile.in

@@ -137 +137 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = -quiet -no-include-stdhdr -g -Wall -Wno-unused-function @CFA_FLAGS@ -B${abs_top_srcdir}/src/driver -XCFA -t # TEMPORARY: does not build with -O2
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

src/tests/Makefile.in

@@ -121 +121 @@
 # applies to both programs
 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
-CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@