version.c become permanent, compile flag moved to *config*.h

julius-speech · Dec 21, 2016 · 357f2cd · 357f2cd
1 parent 1a0895c
commit 357f2cd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 273 deletions.
diff --git a/libjulius/configure b/libjulius/configure
@@ -4152,6 +4152,11 @@ cat >>confdefs.h <<_ACEOF
 #define JULIUS_HOSTINFO "$host"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define JULIUS_BUILD_INFO "$CC $CFLAGS"
+_ACEOF
+
+
 
 
 
@@ -4160,7 +4165,7 @@ _ACEOF
 
 ac_config_commands="$ac_config_commands default-1"
 
-ac_config_files="$ac_config_files Makefile libjulius-config libjulius-config-dist julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in src/version.c doxygen.conf.ver"
+ac_config_files="$ac_config_files Makefile libjulius-config libjulius-config-dist julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in doxygen.conf.ver"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4867,7 +4872,6 @@ do
     "libjulius-config") CONFIG_FILES="$CONFIG_FILES libjulius-config" ;;
     "libjulius-config-dist") CONFIG_FILES="$CONFIG_FILES libjulius-config-dist" ;;
     "julius-$JULIUS_MAJOR_VERSION.pc") CONFIG_FILES="$CONFIG_FILES julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in" ;;
-    "src/version.c") CONFIG_FILES="$CONFIG_FILES src/version.c" ;;
     "doxygen.conf.ver") CONFIG_FILES="$CONFIG_FILES doxygen.conf.ver" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

diff --git a/libjulius/configure.in b/libjulius/configure.in
@@ -386,6 +386,8 @@ AC_DEFINE_UNQUOTED(JULIUS_PRODUCTNAME, "$JULIUS_PRODUCTNAME")
 AC_DEFINE_UNQUOTED(JULIUS_VERSION, "$JULIUS_VERSION")
 AC_DEFINE_UNQUOTED(JULIUS_SETUP, "$easy_setup")
 AC_DEFINE_UNQUOTED(JULIUS_HOSTINFO, "$host")
+AC_DEFINE_UNQUOTED(JULIUS_BUILD_INFO, "$CC $CFLAGS")
+
 AC_SUBST(JULIUS_PRODUCTNAME)
 AC_SUBST(JULIUS_MAJOR_VERSION)
 AC_SUBST(JULIUS_MINOR_VERSION)
@@ -395,4 +397,4 @@ AC_SUBST(easy_setup)
 AC_OUTPUT_COMMANDS(
 [chmod +x libjulius-config libjulius-config-dist
 ])
-AC_OUTPUT(Makefile libjulius-config libjulius-config-dist julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in src/version.c doxygen.conf.ver)
+AC_OUTPUT(Makefile libjulius-config libjulius-config-dist julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in doxygen.conf.ver)
diff --git a/libjulius/include/julius/config-android-libjulius.h b/libjulius/include/julius/config-android-libjulius.h
@@ -2,6 +2,7 @@
 #define JULIUS_VERSION "4.4.2.1"
 #define JULIUS_SETUP "fast"
 #define JULIUS_HOSTINFO ""
+#define JULIUS_BUILD_INFO ""
 #define RETSIGTYPE void
 #define STDC_HEADERS 1
 #define UNIGRAM_FACTORING 1

diff --git a/libjulius/include/julius/config-ios-libjulius.h b/libjulius/include/julius/config-ios-libjulius.h
@@ -2,6 +2,7 @@
 #define JULIUS_VERSION "4.4.2.1"
 #define JULIUS_SETUP "fast"
 #define JULIUS_HOSTINFO ""
+#define JULIUS_BUILD_INFO ""
 #define RETSIGTYPE void
 #define HAVE_PTHREAD 1
 #define UNIGRAM_FACTORING 1

diff --git a/libjulius/include/julius/config-msvc-libjulius.h b/libjulius/include/julius/config-msvc-libjulius.h
@@ -45,6 +45,8 @@
 /// Compilation host information 
 #define JULIUS_HOSTINFO "i686-pc-msvc"
 
+/// Build information
+#define JULIUS_BUILD_INFO "msvc"
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */

diff --git a/libjulius/include/julius/config.h.in b/libjulius/include/julius/config.h.in
@@ -44,6 +44,8 @@
 /// Compilation host information 
 #undef JULIUS_HOSTINFO
 
+/// Build information
+#undef JULIUS_BUILD_INFO
 
 /* Define to empty if the keyword does not work.  */
 #undef const

diff --git a/libjulius/src/version.c b/libjulius/src/version.c
@@ -18,19 +18,14 @@
  * 
  */
 /*
- * Copyright (c) 1991-2013 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2016 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2013 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2016 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
-/* src/version.c.  Generated from version.c.in by configure. */
-
 #include <julius/julius.h>
 
-#define CC "gcc" ///< Used compiler
-#define CFLAGS "-O6 -fomit-frame-pointer" ///< Used flags for compilation
-
 /** 
  * <JA>
  * ヘッダを出力する. 
@@ -236,7 +231,7 @@ j_put_compile_defs(FILE *strm){
 #endif
 
   fprintf(strm, "\n");
-  fprintf(strm," -  Compiled by  : %s %s\n", CC, CFLAGS);
+  fprintf(strm," -  Compiled by  : %s\n", JULIUS_BUILD_INFO);
 }
 
 /** 

diff --git a/libjulius/src/version.c.in b/libjulius/src/version.c.in