diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-06 15:36:29 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-06 15:36:29 +0000 |
| commit | 04d4fd62f4da8e97aebf028f14d19209a7ed406c (patch) | |
| tree | 082bae2bae11836f351d94a8e28bc527d7d532c5 /TAO/tests/Big_AMI | |
| parent | 90967079902c5fbeb5e38561154d56ef3a0e71a4 (diff) | |
| download | ATCD-04d4fd62f4da8e97aebf028f14d19209a7ed406c.tar.gz | |
ChangeLogTag: Wed Dec 6 15:29:25 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/Big_AMI')
| -rw-r--r-- | TAO/tests/Big_AMI/Big_AMI.mpc | 17 | ||||
| -rw-r--r-- | TAO/tests/Big_AMI/Makefile.am | 56 |
2 files changed, 32 insertions, 41 deletions
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc index 2493ddfb825..ff4ca6035c1 100644 --- a/TAO/tests/Big_AMI/Big_AMI.mpc +++ b/TAO/tests/Big_AMI/Big_AMI.mpc @@ -1,17 +1,34 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + ami_test.idl + } + custom_only = 1 +} + project(*Server): taoserver, messaging, ami { + after += *idl Source_Files { ami_test_i.cpp + ami_testC.cpp + ami_testS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoserver, messaging, ami { exename = client + after += *idl after += *Server Source_Files { + ami_testC.cpp + ami_testS.cpp client.cpp } + IDL_Files { + } } diff --git a/TAO/tests/Big_AMI/Makefile.am b/TAO/tests/Big_AMI/Makefile.am index 1ca3dd7d595..578344fa432 100644 --- a/TAO/tests/Big_AMI/Makefile.am +++ b/TAO/tests/Big_AMI/Makefile.am @@ -17,16 +17,10 @@ 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.Big_AMI_Server.am - -if BUILD_AMI -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS +## Makefile.Big_AMI_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ ami_testC.cpp \ ami_testC.h \ ami_testC.inl \ @@ -34,7 +28,7 @@ BUILT_SOURCES += \ ami_testS.h \ ami_testS.inl -CLEANFILES += \ +CLEANFILES = \ ami_test-stamp \ ami_testC.cpp \ ami_testC.h \ @@ -46,9 +40,19 @@ CLEANFILES += \ ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/ami_test.idl @touch $@ + +noinst_HEADERS = \ + ami_test.idl + +## Makefile.Big_AMI_Server.am + +if BUILD_AMI +if BUILD_CORBA_MESSAGING +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -62,10 +66,6 @@ server_SOURCES = \ ami_testS.cpp \ ami_test_i.cpp \ server.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.h \ - ami_testS.inl \ ami_test_i.h server_LDADD = \ @@ -88,29 +88,6 @@ if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -CLEANFILES += \ - ami_test-stamp \ - ami_testC.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.cpp \ - ami_testS.h \ - ami_testS.inl - -ami_testC.cpp ami_testC.h ami_testC.inl ami_testS.cpp ami_testS.h ami_testS.inl: ami_test-stamp - -ami_test-stamp: $(srcdir)/ami_test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/ami_test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -123,10 +100,7 @@ client_SOURCES = \ ami_testC.cpp \ ami_testS.cpp \ client.cpp \ - ami_testC.h \ - ami_testC.inl \ - ami_testS.h \ - ami_testS.inl + ami_test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ |