You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/01/14 20:21:16 UTC
[lucy-commits] [30/50] git commit: Convenience function to create new CFlags object
Convenience function to create new CFlags object
Project: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/commit/cc1ded39
Tree: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/tree/cc1ded39
Diff: http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/diff/cc1ded39
Branch: refs/heads/master
Commit: cc1ded3950928d2dafe4542f90d44acdae0f7f37
Parents: 57bec55
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Tue May 14 20:19:34 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed May 15 19:13:53 2013 +0200
----------------------------------------------------------------------
src/Charmonizer/Core/Compiler.c | 10 +++++-----
src/Charmonizer/Core/Compiler.h | 10 +++++-----
src/Charmonizer/Core/Make.c | 9 +++------
3 files changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/cc1ded39/src/Charmonizer/Core/Compiler.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Compiler.c b/src/Charmonizer/Core/Compiler.c
index 9dd4841..2ad4be8 100644
--- a/src/Charmonizer/Core/Compiler.c
+++ b/src/Charmonizer/Core/Compiler.c
@@ -319,11 +319,6 @@ chaz_CC_get_cflags(void) {
return chaz_CC.cflags;
}
-int
-chaz_CC_get_cflags_style(void) {
- return chaz_CC.cflags_style;
-}
-
chaz_CFlags*
chaz_CC_get_extra_cflags(void) {
return chaz_CC.extra_cflags;
@@ -334,6 +329,11 @@ chaz_CC_get_temp_cflags(void) {
return chaz_CC.temp_cflags;
}
+chaz_CFlags*
+chaz_CC_new_cflags(void) {
+ return chaz_CFlags_new(chaz_CC.cflags_style);
+}
+
const char*
chaz_CC_obj_ext(void) {
return chaz_CC.obj_ext;
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/cc1ded39/src/Charmonizer/Core/Compiler.h
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Compiler.h b/src/Charmonizer/Core/Compiler.h
index 820f84c..51ec01b 100644
--- a/src/Charmonizer/Core/Compiler.h
+++ b/src/Charmonizer/Core/Compiler.h
@@ -76,11 +76,6 @@ chaz_CC_get_cc(void);
const char*
chaz_CC_get_cflags(void);
-/* Accessor for `cflags_style`.
- */
-int
-chaz_CC_get_cflags_style(void);
-
/* Accessor for `extra_cflags`.
*/
chaz_CFlags*
@@ -91,6 +86,11 @@ chaz_CC_get_extra_cflags(void);
chaz_CFlags*
chaz_CC_get_temp_cflags(void);
+/* Return a new CFlags object.
+ */
+chaz_CFlags*
+chaz_CC_new_cflags(void);
+
/* Return the extension for a compiled object.
*/
const char*
http://git-wip-us.apache.org/repos/asf/lucy-charmonizer/blob/cc1ded39/src/Charmonizer/Core/Make.c
----------------------------------------------------------------------
diff --git a/src/Charmonizer/Core/Make.c b/src/Charmonizer/Core/Make.c
index 1df757a..d57034e 100644
--- a/src/Charmonizer/Core/Make.c
+++ b/src/Charmonizer/Core/Make.c
@@ -264,8 +264,7 @@ chaz_MakeFile_distclean_rule(chaz_MakeFile *makefile) {
chaz_MakeRule*
chaz_MakeFile_add_exe(chaz_MakeFile *makefile, const char *exe,
const char *sources, chaz_CFlags *link_flags) {
- int cflags_style = chaz_CC_get_cflags_style();
- chaz_CFlags *local_flags = chaz_CFlags_new(cflags_style);
+ chaz_CFlags *local_flags = chaz_CC_new_cflags();
const char *link = chaz_CC_link_command();
const char *link_flags_string = "";
const char *local_flags_string;
@@ -293,8 +292,7 @@ chaz_MakeFile_add_exe(chaz_MakeFile *makefile, const char *exe,
chaz_MakeRule*
chaz_MakeFile_add_compiled_exe(chaz_MakeFile *makefile, const char *exe,
const char *sources, chaz_CFlags *cflags) {
- int cflags_style = chaz_CC_get_cflags_style();
- chaz_CFlags *local_flags = chaz_CFlags_new(cflags_style);
+ chaz_CFlags *local_flags = chaz_CC_new_cflags();
const char *cc = chaz_CC_get_cc();
const char *cflags_string = "";
const char *local_flags_string;
@@ -323,8 +321,7 @@ chaz_MakeFile_add_compiled_exe(chaz_MakeFile *makefile, const char *exe,
chaz_MakeRule*
chaz_MakeFile_add_shared_lib(chaz_MakeFile *makefile, chaz_SharedLib *lib,
const char *sources, chaz_CFlags *link_flags) {
- int cflags_style = chaz_CC_get_cflags_style();
- chaz_CFlags *local_flags = chaz_CFlags_new(cflags_style);
+ chaz_CFlags *local_flags = chaz_CC_new_cflags();
const char *link = chaz_CC_link_command();
const char *link_flags_string = "";
const char *local_flags_string;