diff options
Diffstat (limited to 'ace/svcconf.mpb')
-rw-r--r-- | ace/svcconf.mpb | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/ace/svcconf.mpb b/ace/svcconf.mpb index 7627592eb7c..cbdcdce227f 100644 --- a/ace/svcconf.mpb +++ b/ace/svcconf.mpb @@ -8,8 +8,10 @@ feature(ace_svcconf) { DLL.cpp DLL_Manager.cpp Dynamic_Service_Base.cpp + Dynamic_Service_Dependency.cpp Parse_Node.cpp Service_Config.cpp + Service_Gestalt.cpp Service_Manager.cpp Service_Object.cpp Service_Repository.cpp @@ -29,15 +31,15 @@ feature(ace_svcconf) { "Svc_Conf_y.cpp: Svc_Conf.y" "ifeq ($(notdir $(YACC)), bison)" " $(YACC) -l -d Svc_Conf.y" - " sed -e 's/char \\*getenv/char *ace_foo/g' \\" - " -e 's/= getenv/= ACE_OS::getenv/g' \\" - " -e 's/fprintf/ACE_OS::fprintf/g' \\" + " sed -e 's/char \\*getenv/char *ace_foo/g' \\" // Eliminates getenv prototype, use ACE's + " -e 's/= getenv/= ACE_OS::getenv/g' \\" // ... like this - qualified. + " -e 's/fprintf/ACE_OS::fprintf/g' \\" // Use ACE's fprintf, not library's " -e 's/yy/ace_yy/g' \\" - " -e 's/->ace_yyerrno/->yyerrno/g' \\" - " -e 's/->ace_yylineno/->yylineno/g' \\" + " -e 's/->ace_yyerrno/->yyerrno/g' \\" // These reverse the unwanted ace_ prefix + " -e 's/->ace_yylineno/->yylineno/g' \\" // added by the substitution, above. " -e 's/YY/ACE_YY/g' \\" " -e 's/^char /ACE_TCHAR /g' \\" - " -e 's/ char / ACE_TCHAR /g' \\" + " -e 's/\([^d]\) char /\$1 ACE_TCHAR /g' \\" " -e 's/(char/(ACE_TCHAR/g' \\" " -e 's/ NULL/ 0/g' \\" " -e 's/ace_yyerror[ ]*(\"/ace_yyerror (ACE_SVC_CONF_PARAM->yyerrno, ACE_SVC_CONF_PARAM->yylineno, \"/g' \\" @@ -46,12 +48,18 @@ feature(ace_svcconf) { " -e 's@#include <stdio\.h>@@' \\" " -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@" " cp /tmp/$@ $@" - " echo \/\/ '$$I''d$$' > Svc_Conf_Tokens.h" - " cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h" + " echo \/\/ '$$I''d:$$' >Svc_Conf_Tokens.h" + " echo '#ifndef BISON_SVC_CONF_TAB_H' >>Svc_Conf_Tokens.h" // Inclusion protection macros + " echo '# define BISON_SVC_CONF_TAB_H' >>Svc_Conf_Tokens.h" // ... same ... + " echo '# define ACE_YYSTYPE_IS_DECLARED 1' >>Svc_Conf_Tokens.h" // Don't use Svc_Conf_y.cpp's + " sed -e 's/yy/ace_yy/g' \\" + " -e 's/YY/ACE_YY/g' <Svc_Conf.tab.h >>Svc_Conf_Tokens.h" + " echo '#endif \/\* ifndef BISON_SVC_CONF_TAB_H \*\/' >>Svc_Conf_Tokens.h" " $(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig" "else" " @echo 'ERROR: You must use bison 1.35 or higher to process this file'" " @/bin/false" "endif" + } } |