diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-09 23:25:21 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-09 23:25:21 +0000 |
| commit | ea1a85584f47325b6be5b2b907497d8396b9d42b (patch) | |
| tree | ce9eb0cb42b3afae6f7bd7bf816a1a2a641bd621 /TAO/tests/Bug_1670_Regression | |
| parent | f5215d28e1c11daa938076e82a4114479beae5e7 (diff) | |
| download | ATCD-ea1a85584f47325b6be5b2b907497d8396b9d42b.tar.gz | |
ChangeLogTag: Sat Dec 9 23:18:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/Bug_1670_Regression')
| -rw-r--r-- | TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc | 13 | ||||
| -rw-r--r-- | TAO/tests/Bug_1670_Regression/Makefile.am | 59 |
2 files changed, 30 insertions, 42 deletions
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc index 5e8364ab993..5b118bd19b7 100644 --- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc +++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc @@ -1,16 +1,29 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults, amh { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, amh { + after += *idl Source_Files { server.cpp } + IDL_Files { + } } project(*Client): taoserver, amh { exename = client + after += *idl after += *Server Source_Files { client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Bug_1670_Regression/Makefile.am b/TAO/tests/Bug_1670_Regression/Makefile.am index 722bf651557..3e49be439bc 100644 --- a/TAO/tests/Bug_1670_Regression/Makefile.am +++ b/TAO/tests/Bug_1670_Regression/Makefile.am @@ -17,15 +17,13 @@ TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(T TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = -CLEANFILES = -BUILT_SOURCES = -## Makefile.Bug_1670_Regression_Server.am +## Makefile.Bug_1670_Regression_Idl.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ TestC.cpp \ TestC.h \ TestC.inl \ @@ -33,7 +31,7 @@ BUILT_SOURCES += \ TestS.h \ TestS.inl -CLEANFILES += \ +CLEANFILES = \ Test-stamp \ TestC.cpp \ TestC.h \ @@ -48,6 +46,18 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +endif BUILD_EXCEPTIONS +endif BUILD_CORBA_MESSAGING + +## Makefile.Bug_1670_Regression_Server.am + +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -57,13 +67,7 @@ server_CPPFLAGS = \ -I$(TAO_BUILDDIR) server_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - server.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + server.cpp server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ @@ -83,29 +87,6 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -CLEANFILES += \ - Test-stamp \ - TestC.cpp \ - TestC.h \ - TestC.inl \ - TestS.cpp \ - TestS.h \ - TestS.inl - -TestC.cpp TestC.h TestC.inl TestS.cpp TestS.h TestS.inl: Test-stamp - -Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -115,13 +96,7 @@ client_CPPFLAGS = \ -I$(TAO_BUILDDIR) client_SOURCES = \ - TestC.cpp \ - TestS.cpp \ - client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + client.cpp client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ |