diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-08-13 17:51:57 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-08-13 17:51:57 +0000 |
| commit | 4e33366fe1f3311bc1946f7e1451f8033809ee8a (patch) | |
| tree | ec64abf2baa49ae0e85d6f545376121e37e31a86 | |
| parent | 5b05637945dc0500efd595ff1a8e9a1b3e2d2e54 (diff) | |
| download | ATCD-4e33366fe1f3311bc1946f7e1451f8033809ee8a.tar.gz | |
ChangeLogTag:Tue Aug 13 10:25:36 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Makefile | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 9631af90f92..242fbc9a3d0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -2,10 +2,12 @@ Tue Aug 13 10:25:36 2002 Ossama Othman <ossama@uci.edu> * tests/DLL_ORB/Makefile (CLIENT_MODULE_LIB, SERVER_MODULE_LIB): - Added dependencies on the corresponding sources to these - targets. Without them, changes to the source files would not - cause a top-level "make" to rebuild the libraries built by these - targets. + Added these targets to the ".PHONY" target. This forces the + top-level Makefile to invoke these targets regardless of whether + or not the actual libraries they build have been built or not. + This fixes a problem where the libraries were not rebuilt after + invoking the top-level Makefile despite the fact that the + library sources were modified. Tue Aug 13 09:16:44 2002 Ossama Othman <ossama@uci.edu> diff --git a/TAO/tests/DLL_ORB/Makefile b/TAO/tests/DLL_ORB/Makefile index 2568f68d663..33af637d900 100644 --- a/TAO/tests/DLL_ORB/Makefile +++ b/TAO/tests/DLL_ORB/Makefile @@ -48,10 +48,10 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS)) server: $(addprefix $(VDIR),$(SERVER_OBJS)) $(SHLIB) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK) -$(CLIENT_MODULE_LIB): Test_Client_Module.h Test_Client_Module.cpp +$(CLIENT_MODULE_LIB): $(MAKE) -f Makefile.Test_Client_Module -$(SERVER_MODULE_LIB): $(CLIENT_MODULE_LIB) Test_Server_Module.h Test_Server_Module.cpp +$(SERVER_MODULE_LIB): $(CLIENT_MODULE_LIB) $(MAKE) -f Makefile.Test_Server_Module idl_stubs realclean depend: @@ -59,6 +59,8 @@ idl_stubs realclean depend: $(MAKE) -f $$m MAKEFILE=$$m $(@:.nested=); \ done +.PHONY: $(CLIENT_MODULE_LIB) $(SERVER_MODULE_LIB) + #---------------------------------------------------------------------------- # Dependencies #---------------------------------------------------------------------------- |