diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-26 17:34:28 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-01-26 17:34:28 +0000 |
| commit | e320d14b7279e0de4e519c43c54e46a1191e53fe (patch) | |
| tree | 8a17fbf72bfa502f534f90b53878585f7b70bba8 | |
| parent | fa801a70e7ccbc3e6f65822077408d844e109688 (diff) | |
| download | ATCD-e320d14b7279e0de4e519c43c54e46a1191e53fe.tar.gz | |
ChangeLogTag:Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | bin/auto_run_tests.lst | 1 | ||||
| -rw-r--r-- | include/makeinclude/rules.lib.GNU | 21 |
5 files changed, 46 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index a4ab2cd7128..86ba82eb500 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add TAO/tests/Object_Loader to the list + + * include/makeinclude/rules.lib.GNU: + Allow both .cpp and .c files in the LSRC macro. This should + let the PACE guys use the real name for their files, and + generate proper dependencies. + Fri Jan 26 02:16:42 2001 Darrell Brunsch <brunsch@uci.edu> * tests/OS_Test.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a4ab2cd7128..86ba82eb500 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add TAO/tests/Object_Loader to the list + + * include/makeinclude/rules.lib.GNU: + Allow both .cpp and .c files in the LSRC macro. This should + let the PACE guys use the real name for their files, and + generate proper dependencies. + Fri Jan 26 02:16:42 2001 Darrell Brunsch <brunsch@uci.edu> * tests/OS_Test.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a4ab2cd7128..86ba82eb500 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,13 @@ +Fri Jan 26 09:33:20 2001 Carlos O'Ryan <coryan@uci.edu> + + * bin/auto_run_tests.lst: + Add TAO/tests/Object_Loader to the list + + * include/makeinclude/rules.lib.GNU: + Allow both .cpp and .c files in the LSRC macro. This should + let the PACE guys use the real name for their files, and + generate proper dependencies. + Fri Jan 26 02:16:42 2001 Darrell Brunsch <brunsch@uci.edu> * tests/OS_Test.cpp: diff --git a/bin/auto_run_tests.lst b/bin/auto_run_tests.lst index d5556711b11..a5900681611 100644 --- a/bin/auto_run_tests.lst +++ b/bin/auto_run_tests.lst @@ -59,6 +59,7 @@ TAO/tests/Multiple/run_test.pl TAO/tests/Portable_Interceptors/Dynamic/run_test.pl: !MINIMUM TAO/tests/Portable_Interceptors/IORInterceptor/run_test.pl: !MINIMUM TAO/tests/Portable_Interceptors/ForwardRequest/run_test.pl: !MINIMUM +TAO/tests/Object_Loader/run_test.pl: !STATIC TAO/examples/POA/Adapter_Activator/run_test.pl: !MINIMUM TAO/examples/POA/DSI/run_test.pl: !MINIMUM diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU index 277e6f23bf6..5e9b2a531d1 100644 --- a/include/makeinclude/rules.lib.GNU +++ b/include/makeinclude/rules.lib.GNU @@ -15,20 +15,29 @@ ifdef SHLIBA VSHLIBA = $(SHLIBA:%.$(LIBEXT)=%$(VAR).$(LIBEXT)) endif -VLOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file)))) +VLOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VDIR)$(notdir $(file))))) LSRC += $(LSRC2) ifdef PRELIB ifdef PRELIB_USES_OBJ_ONLY - VSHOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) + VSHOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) else # ! PRELIB_USES_OBJ_ONLY - VSHOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) + VSHOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) endif # ! PRELIB_USES_OBJ_ONLY VSHOBJS1 = $(VSHOBJS) else # ! PRELIB - VSHOBJS = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) - VSHOBJS1 = \ - $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file)))) + VSHOBJS = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) + VSHOBJS1 = $(subst .c,.$(OBJEXT), \ + $(subst .cpp,.$(OBJEXT), \ + $(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))) endif # ! PRELIB # Comment out for now... |