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 | c9d0f59689f9d3c36334cbddb1bc671f3bb2a671 (patch) | |
| tree | ce9eb0cb42b3afae6f7bd7bf816a1a2a641bd621 /TAO/tests/Bug_2328_Regression | |
| parent | 09bb349b594761b0861517d8da1fe29fbfbf26ba (diff) | |
| download | ATCD-c9d0f59689f9d3c36334cbddb1bc671f3bb2a671.tar.gz | |
ChangeLogTag: Sat Dec 9 23:18:53 UTC 2006 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/tests/Bug_2328_Regression')
| -rw-r--r-- | TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc | 17 | ||||
| -rw-r--r-- | TAO/tests/Bug_2328_Regression/Makefile.am | 50 |
2 files changed, 28 insertions, 39 deletions
diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc index 5fce9b69306..9fdbd894b7d 100644 --- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc +++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc @@ -1,19 +1,32 @@ // -*- MPC -*- // $Id$ +project(*idl): taoidldefaults { + IDL_Files { + Test.idl + } + custom_only = 1 +} + project(*Server): taoserver, codeset { - idlflags += -Sa -St + after += *idl Source_Files { Hello.cpp + TestC.cpp + TestS.cpp server.cpp } + IDL_Files { + } } project(*Client): taoclient { + after += *idl after += *Server Source_Files { TestC.cpp client.cpp } + IDL_Files { + } } - diff --git a/TAO/tests/Bug_2328_Regression/Makefile.am b/TAO/tests/Bug_2328_Regression/Makefile.am index c12544c5887..750ba2181eb 100644 --- a/TAO/tests/Bug_2328_Regression/Makefile.am +++ b/TAO/tests/Bug_2328_Regression/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.Bug_2328_Regression_Server.am - -if BUILD_EXCEPTIONS +## Makefile.Bug_2328_Regression_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 \ @@ -47,6 +43,14 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Test.idl @touch $@ + +noinst_HEADERS = \ + Test.idl + +## Makefile.Bug_2328_Regression_Server.am + +if BUILD_EXCEPTIONS + noinst_PROGRAMS += server server_CPPFLAGS = \ @@ -60,11 +64,7 @@ server_SOURCES = \ TestC.cpp \ TestS.cpp \ server.cpp \ - Hello.h \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO_Codeset.la \ @@ -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) -Sa -St $(srcdir)/Test.idl - @touch $@ - noinst_PROGRAMS += client client_CPPFLAGS = \ @@ -111,10 +90,7 @@ client_CPPFLAGS = \ client_SOURCES = \ TestC.cpp \ client.cpp \ - TestC.h \ - TestC.inl \ - TestS.h \ - TestS.inl + Hello.h client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ |