diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-13 07:26:32 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-13 07:26:32 +0000 |
| commit | 371979f5c9ed2a3f1a8fc29fd3bc489e69ff9600 (patch) | |
| tree | 1c9b583a01cd7a4a6ccdf1e87d19ebbe6dad9d7b /TAO/tests/Single_Read | |
| parent | 7ee16a34077d3e069c7be981beb4f6cbbaddb0c4 (diff) | |
| download | ATCD-371979f5c9ed2a3f1a8fc29fd3bc489e69ff9600.tar.gz | |
ChangeLogTag: Wed Dec 13 07:19:26 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/Single_Read')
| -rw-r--r-- | TAO/tests/Single_Read/Makefile.am | 50 | ||||
| -rw-r--r-- | TAO/tests/Single_Read/Single_Read.mpc | 22 |
2 files changed, 33 insertions, 39 deletions
diff --git a/TAO/tests/Single_Read/Makefile.am b/TAO/tests/Single_Read/Makefile.am index 6b3ef113a5a..f2c34729697 100644 --- a/TAO/tests/Single_Read/Makefile.am +++ b/TAO/tests/Single_Read/Makefile.am @@ -17,14 +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.Single_Read_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Single_Read_Idl.am -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ @@ -32,7 +28,7 @@ BUILT_SOURCES += \ testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ @@ -44,9 +40,17 @@ CLEANFILES += \ 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) $(srcdir)/test.idl + $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl @touch $@ + +noinst_HEADERS = \ + test.idl + +## Makefile.Single_Read_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,10 +64,6 @@ server_SOURCES = \ testC.cpp \ testS.cpp \ test_i.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl \ test_i.h server_LDADD = \ @@ -78,27 +78,6 @@ endif BUILD_EXCEPTIONS if BUILD_EXCEPTIONS -BUILT_SOURCES += \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -CLEANFILES += \ - test-stamp \ - testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl - -testC.cpp testC.h testC.inl testS.h testS.inl: test-stamp - -test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -110,10 +89,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc index bfb96e8b536..574cb13c894 100644 --- a/TAO/tests/Single_Read/Single_Read.mpc +++ b/TAO/tests/Single_Read/Single_Read.mpc @@ -1,18 +1,36 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient, anytypecode { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + } + IDL_Files { + } } - |