diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-08-05 22:00:04 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-08-05 22:00:04 +0000 |
| commit | def1a8231b8287e615a8136746eb0b1db1b860b2 (patch) | |
| tree | 41176bbf9b641efa6aca39e55ae64de1e36d3941 | |
| parent | 808c35d6b6bbeb9b960011da57cabf96115b9e7c (diff) | |
| download | ATCD-def1a8231b8287e615a8136746eb0b1db1b860b2.tar.gz | |
ChangeLogTag: Sun Aug 5 16:58:39 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Makefile | 14 |
2 files changed, 9 insertions, 10 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index a7fb6b05a19..e343b806e00 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Sun Aug 5 16:58:39 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/DLL_ORB/Makefile: Thanks to Ossama for helping to fix the + the warnings in the daily builds. + Sun Aug 5 16:00:28 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tests/Oneway_Buffering/Test.idl: Changed the oneway in the diff --git a/TAO/tests/DLL_ORB/Makefile b/TAO/tests/DLL_ORB/Makefile index eef2f033f39..cde8e07dc76 100644 --- a/TAO/tests/DLL_ORB/Makefile +++ b/TAO/tests/DLL_ORB/Makefile @@ -8,13 +8,6 @@ # Local macros #---------------------------------------------------------------------------- -# Force non-parallel build of this test since the IDL file rules in -# both `Makefile.Test_Client_Module' and `Makefile.Test_Server_Module' -#cause corruption of the generated stubs and skeletons when these -# Makefiles are run in parallel. Fixes build problems in some of our -# parallel build enabled nightly builds. -MAKEFLAGS += -j 1 - CLIENT_SRC = client.cpp SERVER_SRC = server.cpp @@ -58,12 +51,13 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(SHLIB) $(CLIENT_MODULE_LIB): $(MAKE) -f Makefile.Test_Client_Module -$(SERVER_MODULE_LIB): +$(SERVER_MODULE_LIB): $(CLIENT_MODULE_LIB) $(MAKE) -f Makefile.Test_Server_Module idl_stubs realclean depend: - $(MAKE) -f Makefile.Test_Client_Module $@ - $(MAKE) -f Makefile.Test_Server_Module $@ + @for m in Makefile.Test_Client_Module Makefile.Test_Server_Module; do \ + $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \ + done #---------------------------------------------------------------------------- # Dependencies |