From d965d9de0d98fad62ec57eb77cde4cc54940febe Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Granjoux?= Date: Wed, 22 Feb 2012 21:39:11 +0100 Subject: [PATCH] am-project: Rename AM_PROPERTY_COMPILATION_FLAG It is used to prefix the object file with the target name. --- plugins/am-project/am-project-private.h | 2 +- plugins/am-project/am-properties.c | 48 ++++++++++++++++----------------- plugins/am-project/amp-target.c | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/am-project/am-project-private.h b/plugins/am-project/am-project-private.h index f40357c43..c1340c63e 100644 --- a/plugins/am-project/am-project-private.h +++ b/plugins/am-project/am-project-private.h @@ -33,7 +33,7 @@ typedef enum { AM_PROPERTY_IN_MAKEFILE = 1 << 1, AM_PROPERTY_DIRECTORY = 1 << 2, /* Directory property (having dir suffix) */ AM_PROPERTY_DISABLE_FOLLOWING = 1 << 3, /* Disable following property if true */ - AM_PROPERTY_COMPILATION_FLAG = 1 << 4, /* Target compilation flags, need a specific object */ + AM_PROPERTY_PREFIX_OBJECT = 1 << 4, /* Target compilation flags, need a specific object */ AM_PROPERTY_MANDATORY_VALUE = 1 << 5, /* Value is set by default when the node is created */ } AmpPropertyFlag; diff --git a/plugins/am-project/am-properties.c b/plugins/am-project/am-properties.c index 4d75d97fe..82d0c7a6c 100644 --- a/plugins/am-project/am-properties.c +++ b/plugins/am-project/am-properties.c @@ -540,7 +540,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C preprocessor flags for this target.")}, AM_TOKEN_TARGET_CPPFLAGS, 0, "_CPPFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"CFLAGS", @@ -549,7 +549,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C compiler flags for this target.")}, AM_TOKEN_TARGET_CFLAGS, 0, "_CFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"CXXFLAGS", @@ -558,7 +558,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C++ compiler flags for this target.")}, AM_TOKEN_TARGET_CXXFLAGS, 0, "_CXXFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"JAVAFLAGS", @@ -567,7 +567,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Java compiler flags for this target.")}, AM_TOKEN_TARGET_JAVACFLAGS, 0, "_JAVACFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"VALAFLAGS", @@ -585,7 +585,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Fortran compiler flags for this target.")}, AM_TOKEN_TARGET_FCFLAGS, 0, "_FCFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"OBJCFLAGS", @@ -594,7 +594,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Objective C compiler flags for this target.")}, AM_TOKEN_TARGET_OBJCFLAGS, 0, "_OBJCFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"LFLAGS", @@ -603,7 +603,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Lex or Flex lexical analyser generator flags for this target.")}, AM_TOKEN_TARGET_LFLAGS, 0, "_LFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"YFLAGS", @@ -612,7 +612,7 @@ static AmpPropertyInfo AmpProgramTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Yacc or Bison parser generator flags for this target.")}, AM_TOKEN_TARGET_YFLAGS, 0, "_YFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"EXTRA_DIST", @@ -715,7 +715,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C preprocessor flags for this target.")}, AM_TOKEN_TARGET_CPPFLAGS, 0, "_CPPFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"CFLAGS", @@ -724,7 +724,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C compiler flags for this target.")}, AM_TOKEN_TARGET_CFLAGS, 0, "_CFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"CXXFLAGS", @@ -733,7 +733,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C++ compiler flags for this target.")}, AM_TOKEN_TARGET_CXXFLAGS, 0, "_CXXFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"JAVAFLAGS", @@ -742,7 +742,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Java compiler flags for this target.")}, AM_TOKEN_TARGET_JAVACFLAGS, 0, "_JAVACFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"VALAFLAGS", @@ -760,7 +760,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Fortran compiler flags for this target.")}, AM_TOKEN_TARGET_FCFLAGS, 0, "_FCFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"OBJCFLAGS", @@ -769,7 +769,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Objective C compiler flags for this target.")}, AM_TOKEN_TARGET_OBJCFLAGS, 0, "_OBJCFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"LFLAGS", @@ -778,7 +778,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Lex or Flex lexical analyser generator flags for this target.")}, AM_TOKEN_TARGET_LFLAGS, 0, "_LFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"YFLAGS", @@ -787,7 +787,7 @@ static AmpPropertyInfo AmpLibraryTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Yacc or Bison parser generator flags for this target.")}, AM_TOKEN_TARGET_YFLAGS, 0, "_YFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"EXTRA_DIST", @@ -891,7 +891,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C preprocessor flags for this target.")}, AM_TOKEN_TARGET_CPPFLAGS, 0, "_CPPFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"CFLAGS", @@ -900,7 +900,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C compiler flags for this target.")}, AM_TOKEN_TARGET_CFLAGS, 0, "_CFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"CXXFLAGS", @@ -909,7 +909,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional C++ compiler flags for this target.")}, AM_TOKEN_TARGET_CXXFLAGS, 0, "_CXXFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"JAVAFLAGS", @@ -918,7 +918,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Java compiler flags for this target.")}, AM_TOKEN_TARGET_JAVACFLAGS, 0, "_JAVACFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"VALAFLAGS", @@ -936,7 +936,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Fortran compiler flags for this target.")}, AM_TOKEN_TARGET_FCFLAGS, 0, "_FCFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"OBJCFLAGS", @@ -945,7 +945,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Objective C compiler flags for this target.")}, AM_TOKEN_TARGET_OBJCFLAGS, 0, "_OBJCFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"LFLAGS", @@ -954,7 +954,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Lex or Flex lexical analyser generator flags for this target.")}, AM_TOKEN_TARGET_LFLAGS, 0, "_LFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"YFLAGS", @@ -963,7 +963,7 @@ static AmpPropertyInfo AmpModuleTargetProperties[] = { ANJUTA_PROJECT_PROPERTY_READ_WRITE | ANJUTA_PROJECT_PROPERTY_STATIC, N_("Additional Yacc or Bison parser generator flags for this target.")}, AM_TOKEN_TARGET_YFLAGS, 0, "_YFLAGS", - AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_COMPILATION_FLAG + AM_PROPERTY_IN_MAKEFILE | AM_PROPERTY_PREFIX_OBJECT }, { {"EXTRA_DIST", diff --git a/plugins/am-project/amp-target.c b/plugins/am-project/amp-target.c index cc362aa18..252dc2fde 100644 --- a/plugins/am-project/amp-target.c +++ b/plugins/am-project/amp-target.c @@ -254,7 +254,7 @@ amp_target_changed (AmpTargetNode *node) { AmpProperty *prop = (AmpProperty *)item->data; - custom = ((AmpPropertyInfo *)prop->base.info)->flags & AM_PROPERTY_COMPILATION_FLAG; + custom = ((AmpPropertyInfo *)prop->base.info)->flags & AM_PROPERTY_PREFIX_OBJECT; if (custom) break; } -- 2.11.4.GIT