summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2011-12-09 13:25:05 +0000
committermsmit <msmit@remedy.nl>2011-12-09 13:25:05 +0000
commit7b9189673b4d08d9fd05b0cb917d116071de3777 (patch)
tree219cfad05d8dfc2c6522eef548820585e8b714cb
parentc713cab53689de079c157d7bb22a5bd1ee100fe7 (diff)
downloadATCD-7b9189673b4d08d9fd05b0cb917d116071de3777.tar.gz
Fri Dec 9 13:24:31 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc: * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc: * tests/Bug_3834_Regression/CompA.mpc: * tests/Bug_3834_Regression/CompB.mpc: Removed the -Glfa option since it is obsolete.
-rw-r--r--CIAO/ChangeLog.BRANCH8
-rw-r--r--CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc2
-rw-r--r--CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc3
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompA.mpc15
-rw-r--r--CIAO/tests/Bug_3834_Regression/CompB.mpc15
5 files changed, 24 insertions, 19 deletions
diff --git a/CIAO/ChangeLog.BRANCH b/CIAO/ChangeLog.BRANCH
index 9b5418a7418..d57a3fb9355 100644
--- a/CIAO/ChangeLog.BRANCH
+++ b/CIAO/ChangeLog.BRANCH
@@ -1,3 +1,11 @@
+Fri Dec 9 13:24:31 UTC 2011 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc:
+ * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
+ * tests/Bug_3834_Regression/CompA.mpc:
+ * tests/Bug_3834_Regression/CompB.mpc:
+ Removed the -Glfa option since it is obsolete.
+
Fri Dec 9 11:48:53 UTC 2011 Marcel Smit <msmit@remedy.nl>
* connectors/tests/AMIDDS/Base/AmiDds_Base.mpc:
diff --git a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
index f528d21d52b..11f2041a397 100644
--- a/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Large_Deployment/Single_Service/Single_Service.mpc
@@ -9,7 +9,7 @@ project(Single_Service_idl_gen) : componentidldefaults {
-Wb,skel_export_include=Single_Service_svnt_export.h \
-Wb,exec_export_macro=SINGLE_SERVICE_EXEC_Export \
-Wb,exec_export_include=Single_Service_exec_export.h \
- -Gxhex -Gxhsk -Gxhst -I.. -Glfa -Gex
+ -Gxhex -Gxhsk -Gxhst -I.. -Gex
IDL_Files {
Single_Service.idl
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
index 77645d9db2b..0745726bd2f 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
@@ -7,8 +7,7 @@ project(TSEC_CheckPoint_idl_gen) : componentidldefaults {
-Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export \
-Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h \
-Wb,exec_export_macro=TSEC_CHECKPOINT_EXEC_Export \
- -Wb,exec_export_include=TSEC_CheckPoint_exec_export.h \
- -Glfa
+ -Wb,exec_export_include=TSEC_CheckPoint_exec_export.h
requires += dummy_label
IDL_Files {
diff --git a/CIAO/tests/Bug_3834_Regression/CompA.mpc b/CIAO/tests/Bug_3834_Regression/CompA.mpc
index 206c9232a9d..415cab8baa3 100644
--- a/CIAO/tests/Bug_3834_Regression/CompA.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompA.mpc
@@ -3,7 +3,6 @@
project(Moo_CompA_idl_gen) : componentidldefaults {
custom_only = 1
- idlflags += -Glfa
idlflags += -Wb,stub_export_macro=COMPA_STUB_Export \
-Wb,stub_export_include=CompA_stub_export.h \
-Wb,skel_export_macro=COMPA_SVNT_Export \
@@ -34,8 +33,8 @@ project(Moo_CompA_lem_gen) : ciaoidldefaults {
project(Moo_CompA_stub) : ccm_stub {
after += Moo_CompA_idl_gen Moo_stub
libs += Moo_stub
-
-
+
+
sharedname = CompA_stub
dynamicflags += COMPA_STUB_BUILD_DLL
@@ -60,8 +59,8 @@ project(Moo_CompA_exec) : ciao_executor {
after += Moo_CompA_lem_gen Moo_CompA_stub
sharedname = CompA_exec
libs += CompA_stub Moo_stub
-
-
+
+
dynamicflags += COMPA_EXEC_BUILD_DLL
IDL_Files {
@@ -91,10 +90,10 @@ project(Moo_CompA_svnt) : ciao_servant {
CompA_stub \
Moo_skel \
Moo_stub
-
-
+
+
dynamicflags += COMPA_SVNT_BUILD_DLL
-
+
IDL_Files {
}
diff --git a/CIAO/tests/Bug_3834_Regression/CompB.mpc b/CIAO/tests/Bug_3834_Regression/CompB.mpc
index ac8cf43f85e..0077cb5ef34 100644
--- a/CIAO/tests/Bug_3834_Regression/CompB.mpc
+++ b/CIAO/tests/Bug_3834_Regression/CompB.mpc
@@ -3,7 +3,6 @@
project(Moo_CompB_idl_gen) : componentidldefaults {
custom_only = 1
- idlflags += -Glfa
idlflags += -Wb,stub_export_macro=COMPB_STUB_Export \
-Wb,stub_export_include=CompB_stub_export.h \
-Wb,skel_export_macro=COMPB_SVNT_Export \
@@ -34,8 +33,8 @@ project(Moo_CompB_lem_gen) : ciaoidldefaults {
project(Moo_CompB_stub) : ccm_stub {
after += Moo_CompB_idl_gen Moo_stub
libs += Moo_stub
-
-
+
+
sharedname = CompB_stub
dynamicflags += COMPB_STUB_BUILD_DLL
@@ -60,8 +59,8 @@ project(Moo_CompB_exec) : ciao_executor {
after += Moo_CompB_lem_gen Moo_CompB_stub
sharedname = CompB_exec
libs += CompB_stub Moo_stub
-
-
+
+
dynamicflags += COMPB_EXEC_BUILD_DLL
IDL_Files {
@@ -91,10 +90,10 @@ project(Moo_CompB_svnt) : ciao_servant {
CompB_stub \
Moo_skel \
Moo_stub
-
-
+
+
dynamicflags += COMPB_SVNT_BUILD_DLL
-
+
IDL_Files {
}