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/Abstract_Interface | |
| 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/Abstract_Interface')
| -rw-r--r-- | TAO/tests/Abstract_Interface/Abstract_Interface.mpc | 13 | ||||
| -rw-r--r-- | TAO/tests/Abstract_Interface/Makefile.am | 53 |
2 files changed, 30 insertions, 36 deletions
diff --git a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc index d6846a4b229..38681100160 100644 --- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc +++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc @@ -1,11 +1,20 @@ // -*- MPC -*- // $Id$ -project(*client) : taoclient, valuetype { +project(*idl): taoidldefaults, valuetype { IDL_Files { test.idl } + custom_only = 1 +} + +project(*client) : taoclient, valuetype { + after += *idl + + IDL_Files { + } + Source_Files { client.cpp testC.cpp @@ -18,9 +27,9 @@ project(*client) : taoclient, valuetype { project(*server) : taoserver, valuetype { after += *client + after += *idl IDL_Files { - test.idl } Source_Files { diff --git a/TAO/tests/Abstract_Interface/Makefile.am b/TAO/tests/Abstract_Interface/Makefile.am index 40ebbc36f61..d80c576d1ee 100644 --- a/TAO/tests/Abstract_Interface/Makefile.am +++ b/TAO/tests/Abstract_Interface/Makefile.am @@ -17,32 +17,44 @@ 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.Abstract_Interface_Client.am +## Makefile.Abstract_Interface_Idl.am if BUILD_EXCEPTIONS -BUILT_SOURCES += \ +BUILT_SOURCES = \ testC.cpp \ testC.h \ testC.inl \ + testS.cpp \ + testS.h \ testS.inl -CLEANFILES += \ +CLEANFILES = \ test-stamp \ testC.cpp \ testC.h \ testC.inl \ + testS.cpp \ + testS.h \ testS.inl -testC.cpp testC.h testC.inl testS.inl: test-stamp +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 @touch $@ + +noinst_HEADERS = \ + test.idl + +endif BUILD_EXCEPTIONS + +## Makefile.Abstract_Interface_Client.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -54,9 +66,7 @@ client_CPPFLAGS = \ client_SOURCES = \ client.cpp \ testC.cpp \ - testC.h \ - testC.inl \ - testS.inl + testC.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ @@ -70,29 +80,6 @@ endif BUILD_EXCEPTIONS 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) $(srcdir)/test.idl - @touch $@ - noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -107,9 +94,7 @@ server_SOURCES = \ testS.cpp \ test_i.cpp \ testC.h \ - testC.inl \ testS.h \ - testS.inl \ test_i.h server_LDADD = \ |