diff options
author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-14 07:10:12 +0000 |
---|---|---|
committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-12-14 07:10:12 +0000 |
commit | 15b8a2bf46f6d073f105aa6c7d81ad2aff39b464 (patch) | |
tree | 7aacb02a9548a70182dcfdbc5a0b91dd284f3a31 /TAO/tests/MProfile | |
parent | cbfcacfe8e7553aa2b5b0e37af4b72b541576161 (diff) | |
download | ATCD-15b8a2bf46f6d073f105aa6c7d81ad2aff39b464.tar.gz |
ChangeLogTag: Thu Dec 14 07:01:51 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/MProfile')
-rw-r--r-- | TAO/tests/MProfile/MProfile.mpc | 22 | ||||
-rw-r--r-- | TAO/tests/MProfile/Makefile.am | 51 |
2 files changed, 35 insertions, 38 deletions
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc index e48d767fd5c..4800defda95 100644 --- a/TAO/tests/MProfile/MProfile.mpc +++ b/TAO/tests/MProfile/MProfile.mpc @@ -1,17 +1,37 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + test.idl + } + custom_only = 1 +} + project(*Server): taoserver, iormanip { + after += *idl Source_Files { test_i.cpp server.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } project(*Client): taoclient, iormanip { + after += *idl after += *Server Source_Files { - testC.cpp client.cpp } + Source_Files { + testC.cpp + testS.cpp + } + IDL_Files { + } } diff --git a/TAO/tests/MProfile/Makefile.am b/TAO/tests/MProfile/Makefile.am index dea8d89fff2..8c70614e1cf 100644 --- a/TAO/tests/MProfile/Makefile.am +++ b/TAO/tests/MProfile/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.MProfile_Server.am - -if BUILD_EXCEPTIONS +## Makefile.MProfile_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.MProfile_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 = \ @@ -79,27 +79,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 = \ @@ -111,10 +90,8 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.h \ - testS.inl + testS.cpp \ + test_i.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \ |